r40372 - in /attic/libgnomeui/debian: changelog control control.in libgnomeui-0.install libgnomeui-dev.install patches/99_ltmain_as-needed.patch patches/series rules

joss at users.alioth.debian.org joss at users.alioth.debian.org
Fri Dec 27 14:05:26 UTC 2013 

Author: joss
Date: Fri Dec 27 14:05:26 2013
New Revision: 40372

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=40372
Log:
* Switch to multiarch. Closes: #642417.
  + Update build-dependencies.
  + Require a MA-enabled libglade for the modules path.
  + Make libgnomeui-0 and -dev MA: same, make -common MA: foreign.
  + Update installation paths.
* Drop gnome:Version.
* Move to section oldlibs.
* 99_ltmain_as-needed.patch: dropped, obsolete.

Removed:
    attic/libgnomeui/debian/patches/99_ltmain_as-needed.patch
Modified:
    attic/libgnomeui/debian/changelog
    attic/libgnomeui/debian/control
    attic/libgnomeui/debian/control.in
    attic/libgnomeui/debian/libgnomeui-0.install
    attic/libgnomeui/debian/libgnomeui-dev.install
    attic/libgnomeui/debian/patches/series
    attic/libgnomeui/debian/rules

Modified: attic/libgnomeui/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/libgnomeui/debian/changelog?rev=40372&op=diff
==============================================================================
--- attic/libgnomeui/debian/changelog	[utf-8] (original)
+++ attic/libgnomeui/debian/changelog	[utf-8] Fri Dec 27 14:05:26 2013
@@ -1,3 +1,16 @@
+libgnomeui (2.24.5-3) unstable; urgency=low
+
+  * Switch to multiarch. Closes: #642417.
+    + Update build-dependencies.
+    + Require a MA-enabled libglade for the modules path.
+    + Make libgnomeui-0 and -dev MA: same, make -common MA: foreign.
+    + Update installation paths.
+  * Drop gnome:Version.
+  * Move to section oldlibs.
+  * 99_ltmain_as-needed.patch: dropped, obsolete.
+
+ -- Josselin Mouette <joss at debian.org>  Fri, 27 Dec 2013 14:57:16 +0100
+
 libgnomeui (2.24.5-2) unstable; urgency=low
 
   * debian/patches/01_link_libm.patch: Explicitly link against -lm.

Modified: attic/libgnomeui/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/libgnomeui/debian/control?rev=40372&op=diff
==============================================================================
--- attic/libgnomeui/debian/control	[utf-8] (original)
+++ attic/libgnomeui/debian/control	[utf-8] Fri Dec 27 14:05:26 2013
@@ -4,12 +4,12 @@
 # This file is regenerated automatically in the clean target.
 
 Source: libgnomeui
-Section: libs
+Section: oldlibs
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
-Uploaders: Josselin Mouette <joss at debian.org>, Loic Minier <lool at dooz.org>, Michael Biebl <biebl at debian.org>, Sebastian Dröge <slomo at debian.org>
+Uploaders: Josselin Mouette <joss at debian.org>, Michael Biebl <biebl at debian.org>, Sebastian Dröge <slomo at debian.org>
 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,
@@ -20,9 +20,9 @@
                libpopt-dev,
                libgnomevfs2-dev (>= 2.8.4-2),
                libgconf2-dev (>= 2.6.1-2),
-               libglade2-dev (>= 1:2.4.0),
+               libglade2-dev (>= 1:2.6.4-2~),
                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,
@@ -37,11 +37,12 @@
 
 Package: libgnomeui-0
 Architecture: any
-Section: libs
+Multi-Arch: same
+Section: oldlibs
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends},
          ${shlibs:Depends},
-         libgnomeui-common (>= ${gnome:Version}),
-         libgnomeui-common (<< ${gnome:NextVersion})
+         libgnomeui-common (= ${source:Version})
 Suggests: gnome-icon-theme
 Description: GNOME user interface library - runtime files
  This package contains the shared library for the base GNOME library
@@ -63,6 +64,7 @@
 
 Package: libgnomeui-dev
 Architecture: any
+Multi-Arch: same
 Section: libdevel
 Depends: ${misc:Depends},
          libgnomeui-0 (= ${binary:Version}),
@@ -84,7 +86,8 @@
 
 Package: libgnomeui-common
 Architecture: all
-Section: libs
+Multi-Arch: foreign
+Section: oldlibs
 Depends: ${misc:Depends}
 Description: GNOME user interface library - common files
  This package contains internationalization files for the base GNOME

Modified: attic/libgnomeui/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/libgnomeui/debian/control.in?rev=40372&op=diff
==============================================================================
--- attic/libgnomeui/debian/control.in	[utf-8] (original)
+++ attic/libgnomeui/debian/control.in	[utf-8] Fri Dec 27 14:05:26 2013
@@ -1,10 +1,10 @@
 Source: libgnomeui
-Section: libs
+Section: oldlibs
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
 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,
@@ -15,9 +15,9 @@
                libpopt-dev,
                libgnomevfs2-dev (>= 2.8.4-2),
                libgconf2-dev (>= 2.6.1-2),
-               libglade2-dev (>= 1:2.4.0),
+               libglade2-dev (>= 1:2.6.4-2~),
                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,
@@ -32,11 +32,12 @@
 
 Package: libgnomeui-0
 Architecture: any
-Section: libs
+Multi-Arch: same
+Section: oldlibs
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends},
          ${shlibs:Depends},
-         libgnomeui-common (>= ${gnome:Version}),
-         libgnomeui-common (<< ${gnome:NextVersion})
+         libgnomeui-common (= ${source:Version})
 Suggests: gnome-icon-theme
 Description: GNOME user interface library - runtime files
  This package contains the shared library for the base GNOME library
@@ -58,6 +59,7 @@
 
 Package: libgnomeui-dev
 Architecture: any
+Multi-Arch: same
 Section: libdevel
 Depends: ${misc:Depends},
          libgnomeui-0 (= ${binary:Version}),
@@ -79,7 +81,8 @@
 
 Package: libgnomeui-common
 Architecture: all
-Section: libs
+Multi-Arch: foreign
+Section: oldlibs
 Depends: ${misc:Depends}
 Description: GNOME user interface library - common files
  This package contains internationalization files for the base GNOME

Modified: attic/libgnomeui/debian/libgnomeui-0.install
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/libgnomeui/debian/libgnomeui-0.install?rev=40372&op=diff
==============================================================================
--- attic/libgnomeui/debian/libgnomeui-0.install	[utf-8] (original)
+++ attic/libgnomeui/debian/libgnomeui-0.install	[utf-8] Fri Dec 27 14:05:26 2013
@@ -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

Modified: attic/libgnomeui/debian/libgnomeui-dev.install
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/libgnomeui/debian/libgnomeui-dev.install?rev=40372&op=diff
==============================================================================
--- attic/libgnomeui/debian/libgnomeui-dev.install	[utf-8] (original)
+++ attic/libgnomeui/debian/libgnomeui-dev.install	[utf-8] Fri Dec 27 14:05:26 2013
@@ -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

Modified: attic/libgnomeui/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/libgnomeui/debian/patches/series?rev=40372&op=diff
==============================================================================
--- attic/libgnomeui/debian/patches/series	[utf-8] (original)
+++ attic/libgnomeui/debian/patches/series	[utf-8] Fri Dec 27 14:05:26 2013
@@ -1,2 +1 @@
 01_link_libm.patch
-99_ltmain_as-needed.patch

Modified: attic/libgnomeui/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/libgnomeui/debian/rules?rev=40372&op=diff
==============================================================================
--- attic/libgnomeui/debian/rules	[utf-8] (original)
+++ attic/libgnomeui/debian/rules	[utf-8] Fri Dec 27 14:05:26 2013
@@ -1,21 +1,15 @@
 #!/usr/bin/make -f
+
+TARBALL_EXT = tar.bz2
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/autoreconf.mk
 include /usr/share/cdbs/1/class/gnome.mk
 include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
-include /usr/share/gnome-pkg-tools/1/rules/gnome-version.mk
 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
-
-# this relies on the fact that the first package is the shared library to
-# retrieve the package name (with SONAME)
-libgnomeuiN := $(shell sed -rn 's/^Package:[[:space:]]*(libgnomeui-[[:digit:]]+)[[:space:]]*$$/\1/p' debian/control)
-# the debug package should be named libgnomeui-dbg (unversionned); please
-# change it next time the package has to go through NEW
-DEBUG_PKG := libgnomeui-0-dbg
 
 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_DH_STRIP_ARGS += --dbg-package=libgnomeui-0-dbg
+DEB_CONFIGURE_EXTRA_FLAGS += --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
+	--libexecdir=\$${libdir}/libgnomeui-0

More information about the pkg-gnome-commits mailing list