Package: libgnomeui
Version: 2.24.5-2
Severity: wishlist
User: [email protected]
Usertags: multiarch
Tags: patch

Hi,

The following patch converts libgnomeui to multiarch directories and adds
needed Multi-Arch: stanzas to control file. This package was simpler to convert
than libgnome, but this patch still hasn't been much tested.

http://wiki.debian.org/Multiarch/Implementation
https://wiki.ubuntu.com/MultiarchSpec#Dependencies_involving_Architecture:_all_packages

Riku
diff -urN orig/libgnomeui-2.24.5//debian/changelog libgnomeui-2.24.5//debian/changelog
--- orig/libgnomeui-2.24.5//debian/changelog	2011-09-05 12:23:35.000000000 +0300
+++ libgnomeui-2.24.5//debian/changelog	2011-09-22 16:44:18.511536278 +0300
@@ -1,3 +1,9 @@
+libgnomeui (2.24.5-2.1) unstable; urgency=low
+
+  * multiarch conversion
+
+ -- Riku Voipio <[email protected]>  Thu, 22 Sep 2011 16:43:52 +0300
+
 libgnomeui (2.24.5-2) unstable; urgency=low
 
   * debian/patches/01_link_libm.patch: Explicitly link against -lm.
diff -urN orig/libgnomeui-2.24.5//debian/control.in libgnomeui-2.24.5//debian/control.in
--- orig/libgnomeui-2.24.5//debian/control.in	2011-09-05 05:00:03.000000000 +0300
+++ libgnomeui-2.24.5//debian/control.in	2011-09-22 16:42:22.791536224 +0300
@@ -4,7 +4,7 @@
 Maintainer: Debian GNOME Maintainers <[email protected]>
 Uploaders: @GNOME_TEAM@
 Standards-Version: 3.9.2
-Build-Depends: debhelper (>= 8),
+Build-Depends: debhelper (>= 8.1.3),
                libgnomecanvas2-dev (>= 2.14.0-2),
                intltool (>= 0.40.0),
                gettext,
@@ -17,7 +17,7 @@
                libgconf2-dev (>= 2.6.1-2),
                libglade2-dev (>= 1:2.4.0),
                libgnome2-dev (>= 2.13.7),
-               cdbs (>= 0.4.41),
+               cdbs (>= 0.4.93),
                gnome-pkg-tools (>= 0.10),
                libgnome-keyring-dev (>= 0.4),
                libxt-dev,
@@ -38,6 +38,8 @@
          libgnomeui-common (>= ${gnome:Version}),
          libgnomeui-common (<< ${gnome:NextVersion})
 Suggests: gnome-icon-theme
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Description: GNOME user interface library - runtime files
  This package contains the shared library for the base GNOME library
  functions (User Interface functions).
@@ -73,6 +75,7 @@
          libpango1.0-dev (>= 1.1.2),
          libglib2.0-dev (>= 2.16.0)
 Suggests: libgnomeui-doc
+Multi-Arch: same
 Description: GNOME user interface library - development files
  This package contains the shared library for the base GNOME library
  functions (User Interface functions).
diff -urN orig/libgnomeui-2.24.5//debian/libgnomeui-0.install libgnomeui-2.24.5//debian/libgnomeui-0.install
--- orig/libgnomeui-2.24.5//debian/libgnomeui-0.install	2011-07-30 18:39:20.000000000 +0300
+++ libgnomeui-2.24.5//debian/libgnomeui-0.install	2011-09-22 16:42:32.081536228 +0300
@@ -1,2 +1,2 @@
-usr/lib/libgnomeui-2.so.*
-usr/lib/libglade/2.0/libgnome.so
+usr/lib/*/libgnomeui-2.so.*
+usr/lib/*/libglade/2.0/libgnome.so
diff -urN orig/libgnomeui-2.24.5//debian/libgnomeui-dev.install libgnomeui-2.24.5//debian/libgnomeui-dev.install
--- orig/libgnomeui-2.24.5//debian/libgnomeui-dev.install	2011-07-30 18:40:37.000000000 +0300
+++ libgnomeui-2.24.5//debian/libgnomeui-dev.install	2011-09-22 16:42:47.941536236 +0300
@@ -1,4 +1,4 @@
 usr/include
-usr/lib/pkgconfig
-usr/lib/libgnomeui-2.a
-usr/lib/libgnomeui-2.so
+usr/lib/*/pkgconfig
+usr/lib/*/libgnomeui-2.a
+usr/lib/*/libgnomeui-2.so
diff -urN orig/libgnomeui-2.24.5//debian/rules libgnomeui-2.24.5//debian/rules
--- orig/libgnomeui-2.24.5//debian/rules	2011-09-05 04:42:36.000000000 +0300
+++ libgnomeui-2.24.5//debian/rules	2011-09-22 16:43:36.461536258 +0300
@@ -17,5 +17,5 @@
 LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
 
 DEB_DH_STRIP_ARGS += --dbg-package=$(DEBUG_PKG)
-DEB_CONFIGURE_EXTRA_FLAGS += --libexecdir=\$${prefix}/lib/$(libgnomeuiN)
+DEB_CONFIGURE_EXTRA_FLAGS += --libexecdir=\$${prefix}/lib/$(libgnomeuiN) --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
 

Reply via email to