Package: gnome-disk-utility
Version: 3.0.2-1
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu precise ubuntu-patch
Hey folks,
You know the drill... :) Patch for multiarch support attached. Has been
uploaded to Ubuntu.
This one's a little goofy in that the package integrates with nautilus,
which still only looks in /usr/lib/nautilus (AFAIK). So we have to do a
little extra work to move things around.
--
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'
--- debian/compat 2011-07-11 14:01:00 +0000
+++ debian/compat 2011-10-22 06:50:32 +0000
@@ -1 +1 @@
-8
+9
=== modified file 'debian/control'
--- debian/control 2011-08-26 09:03:41 +0000
+++ debian/control 2011-10-22 06:51:54 +0000
@@ -6,7 +6,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,
dh-autoreconf,
dh-translations,
@@ -46,6 +46,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
@@ -58,7 +60,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
@@ -70,6 +74,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
@@ -82,6 +87,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'
--- debian/gnome-disk-utility.install 2010-11-26 01:31:50 +0000
+++ debian/gnome-disk-utility.install 2011-10-22 07:09:07 +0000
@@ -5,5 +5,5 @@
usr/share/applications
usr/share/omf
etc/xdg/autostart
-usr/lib/gnome-disk-utility
+usr/lib/*/gdu-* usr/lib/gnome-disk-utility
usr/lib/nautilus/*/*.so
=== modified file 'debian/libgdu-dev.install'
--- debian/libgdu-dev.install 2010-11-26 03:25:10 +0000
+++ debian/libgdu-dev.install 2011-10-22 06:53:03 +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'
--- debian/libgdu-gtk-dev.install 2010-11-26 01:31:50 +0000
+++ debian/libgdu-gtk-dev.install 2011-10-22 06:53:03 +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'
--- debian/libgdu-gtk0.install 2010-11-26 01:31:50 +0000
+++ debian/libgdu-gtk0.install 2011-10-22 06:53:03 +0000
@@ -1 +1 @@
-usr/lib/libgdu-gtk.so.*
+usr/lib/*/libgdu-gtk.so.*
=== modified file 'debian/libgdu0.install'
--- debian/libgdu0.install 2010-11-26 01:31:50 +0000
+++ debian/libgdu0.install 2011-10-22 06:53:03 +0000
@@ -1 +1 @@
-usr/lib/libgdu.so.*
+usr/lib/*/libgdu.so.*
=== modified file 'debian/rules'
--- debian/rules 2011-08-26 09:03:41 +0000
+++ debian/rules 2011-10-22 07:12:10 +0000
@@ -8,6 +8,7 @@
--disable-scrollkeeper
override_dh_install:
+ mv debian/tmp/usr/lib/*/nautilus debian/tmp/usr/lib/nautilus
dh_install
dh_translations
# when building for Ubuntu, move menu entry from Apps → System Tools
