elementaryart team mailing list archive

[Cody Garver <codygarver@xxxxxxxxx>]

Cody Garver has proposed merging lp:~codygarver/marlin/fix-ppa-build into lp:marlin.

Requested reviews:
  The elementary Project (elementaryproject)

For more details, see:
https://code.launchpad.net/~codygarver/marlin/fix-ppa-build/+merge/70987

Should fix PPA build errors. Requires cmake, remove references to autogen.sh and improve grammar.
-- 
https://code.launchpad.net/~codygarver/marlin/fix-ppa-build/+merge/70987
Your team The elementary Project is requested to review the proposed merge of lp:~codygarver/marlin/fix-ppa-build into lp:marlin.

=== modified file 'debian/control'
--- debian/control	2011-05-30 13:08:08 +0000
+++ debian/control	2011-08-10 04:49:22 +0000
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Sergey "Shnatsel" Davidoff <shnatsel@xxxxxxxxx>
 Vcs-Bzr: https://code.launchpad.net/~elementaryproject/marlin/trunk
-Build-Depends: debhelper (>= 7), valac (>= 0.11.2), libglib2.0-dev (>= 2.28.0), libpango1.0-dev (>= 1.1.2), libgtk-3-dev (>= 3.0.3), libgee-dev, libsqlite3-dev, libnotify4-dev (>= 0.7.2) | libnotify-dev (>= 0.7.2), gnome-common, libgail-3-dev, libdbus-glib-1-dev
+Build-Depends: debhelper (>= 7), cmake, valac (>= 0.11.2), libglib2.0-dev (>= 2.28.0), libpango1.0-dev (>= 1.1.2), libgtk-3-dev (>= 3.0.3), libgee-dev, libsqlite3-dev, libnotify4-dev (>= 0.7.2) | libnotify-dev (>= 0.7.2), gnome-common, libgail-3-dev, libdbus-glib-1-dev
 Homepage: http://www.elementaryos.org/
 Standards-Version: 3.8.4
 
@@ -12,5 +12,5 @@
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Recommends: tumbler
 Description: The sexiest fish in the large sea of file-browsers
- A file manager which created to be fast, and easy to use.
+ A file manager created to be fast, and easy to use.
  An elementary Team project.

=== modified file 'debian/rules'
--- debian/rules	2011-05-28 14:36:24 +0000
+++ debian/rules	2011-08-10 04:49:22 +0000
@@ -9,11 +9,5 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-override_dh_auto_configure:
-	./autogen.sh --prefix=/usr
-
-override_dh_auto_test:
-	#disabled; build servers usually don't have X server running
-
 %:
 	dh $@