Hi all, Rico Tzschichholz and Sebastien Bacher discovered a bug in this version of the patch as it was uploaded to Ubuntu: manually moving the gdu-* helpers around on disk invalidates a path reference within /etc/xdg/autostart/gdu-notification-daemon.desktop. By passing --libexecdir directly to dh_auto_configure, we avoid this problem.
See the attached updated patch. Thanks, -- Steve Langasek Give me a lever long enough and a Free OS Debian Developer to set it on, and I can move the world. Ubuntu Developer http://www.debian.org/ slanga...@ubuntu.com vor...@debian.org
=== modified file 'debian/compat'
--- old/debian/compat 2011-10-13 18:53:23 +0000
+++ new/debian/compat 2011-12-06 22:04:36 +0000
@@ -1,1 +1,1 @@
-8
+9
=== modified file 'debian/control'
--- old/debian/control 2011-10-13 18:53:23 +0000
+++ new/debian/control 2011-12-06 22:04:36 +0000
@@ -5,7 +5,7 @@
Uploaders: Michael Biebl <bi...@debian.org>,
Martin Pitt <mp...@debian.org>,
Sjoerd Simons <sjo...@debian.org>
-Build-Depends: debhelper (>= 8),
+Build-Depends: debhelper (>= 8.1.3~),
autotools-dev,
pkg-config,
xsltproc,
@@ -42,6 +42,8 @@
Package: libgdu0
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Section: libs
Depends: ${shlibs:Depends}, ${misc:Depends}, udisks (>= 1.0.0), udisks (<< 1.1.0)
Description: GObject based Disk Utility Library
@@ -54,7 +56,9 @@
Package: libgdu-gtk0
Architecture: any
+Multi-Arch: same
Section: libs
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
Breaks: gnome-disk-utility (<< 3.0.0)
Description: GTK+ standard dialog library for libgdu
@@ -66,6 +70,7 @@
Package: libgdu-dev
Architecture: any
+Multi-Arch: same
Section: libdevel
Depends: libgdu0 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}, libglib2.0-dev (>= 2.16)
Description: GObject based Disk Utility Library - development files
@@ -78,6 +83,7 @@
Package: libgdu-gtk-dev
Architecture: any
+Multi-Arch: same
Section: libdevel
Depends: libgdu-gtk0 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}, libgdu-dev, libgtk2.0-dev
Description: GTK+ standard dialog library for libgdu - development files
=== modified file 'debian/gnome-disk-utility.install'
--- old/debian/gnome-disk-utility.install 2011-10-13 18:53:23 +0000
+++ new/debian/gnome-disk-utility.install 2011-12-06 22:08:25 +0000
@@ -5,5 +5,5 @@
usr/share/applications
usr/share/omf
etc/xdg/autostart
-usr/lib/gnome-disk-utility
+usr/lib/gnome-disk-utility/gdu-*
usr/lib/nautilus/*/*.so
=== modified file 'debian/libgdu-dev.install'
--- old/debian/libgdu-dev.install 2011-10-13 18:53:23 +0000
+++ new/debian/libgdu-dev.install 2011-12-06 22:04:36 +0000
@@ -1,3 +1,3 @@
-usr/lib/libgdu.so
-usr/lib/pkgconfig/gdu.pc
+usr/lib/*/libgdu.so
+usr/lib/*/pkgconfig/gdu.pc
usr/include/gnome-disk-utility/gdu/
=== modified file 'debian/libgdu-gtk-dev.install'
--- old/debian/libgdu-gtk-dev.install 2009-09-28 17:15:02 +0000
+++ new/debian/libgdu-gtk-dev.install 2011-12-06 22:04:36 +0000
@@ -1,3 +1,3 @@
-usr/lib/libgdu-gtk.so
-usr/lib/pkgconfig/gdu-gtk.pc
+usr/lib/*/libgdu-gtk.so
+usr/lib/*/pkgconfig/gdu-gtk.pc
usr/include/gnome-disk-utility/gdu-gtk/
=== modified file 'debian/libgdu-gtk0.install'
--- old/debian/libgdu-gtk0.install 2009-09-28 17:15:02 +0000
+++ new/debian/libgdu-gtk0.install 2011-12-06 22:04:36 +0000
@@ -1,1 +1,1 @@
-usr/lib/libgdu-gtk.so.*
+usr/lib/*/libgdu-gtk.so.*
=== modified file 'debian/libgdu0.install'
--- old/debian/libgdu0.install 2009-09-28 17:15:02 +0000
+++ new/debian/libgdu0.install 2011-12-06 22:04:36 +0000
@@ -1,1 +1,1 @@
-usr/lib/libgdu.so.*
+usr/lib/*/libgdu.so.*
=== modified file 'debian/rules'
--- old/debian/rules 2011-10-13 18:53:23 +0000
+++ new/debian/rules 2011-12-06 22:08:25 +0000
@@ -5,9 +5,10 @@
override_dh_auto_configure:
dh_auto_configure -- \
- --disable-scrollkeeper
+ --disable-scrollkeeper --libexecdir=/usr/lib/gnome-disk-utility
override_dh_install:
+ mv debian/tmp/usr/lib/*/nautilus debian/tmp/usr/lib/nautilus
dh_install
# when building for Ubuntu, move menu entry from Apps → System Tools
# (which Ubuntu tries to avoid) to System → Administration.
signature.asc
Description: Digital signature
