Merge lp:~noskcaj/ubuntu/trusty/gnome-system-tools/regression-fix into lp:ubuntu/trusty/gnome-system-tools

[Jackson Doak]

Fix a regression where nothing was put in the binary

[lp:~noskcaj/ubuntu/trusty/gnome-system-tools/regression-fix]

123. By Jackson Doak on 2014-01-31

Use a better fix

[Martin Pitt (pitti)]

Thanks! Applied to Vcs-Bzr: and uploaded.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2014-01-21 07:24:17 +0000
+++ debian/changelog	2014-01-31 05:03:02 +0000
@@ -1,3 +1,10 @@
+gnome-system-tools (3.0.0-3ubuntu2) trusty; urgency=medium
+
+  * Make all files install in gnome-system-tools.
+    - Regression from 3.0.0-3ubuntu1
+
+ -- Jackson Doak <[e-mail]>  Fri, 31 Jan 2014 07:58:28 +1100
+
 gnome-system-tools (3.0.0-3ubuntu1) trusty; urgency=medium
 
   * Merge from Debian, remaining changes:

=== modified file 'debian/gnome-system-tools.install'
--- debian/gnome-system-tools.install	2014-01-21 07:24:17 +0000
+++ debian/gnome-system-tools.install	2014-01-31 05:03:02 +0000
@@ -1,1 +1,1 @@
-debian/pixmaps/*.xpm usr/share/gnome-system-tools/pixmaps/
+debian/pixmaps/*.xpm usr/share/gnome-system-tools/pixmaps/
\ No newline at end of file

=== modified file 'debian/rules'
--- debian/rules	2014-01-21 07:24:17 +0000
+++ debian/rules	2014-01-31 05:03:02 +0000
@@ -1,5 +1,7 @@
 #!/usr/bin/make -f
 
+DEB_DESTDIR = $(CURDIR)/debian/gnome-system-tools
+
 include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
 include /usr/share/cdbs/1/rules/autoreconf.mk
 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk