Source: pango1.0 Version: 1.28.4-1 Tags: patch User: [email protected] Usertags: ubuntu-patch oneiric origin-ubuntu
Hi folks, Please find attached a patch to pango1.0 to transition it to use of the multiarch library paths as described at <http://wiki.debian.org/Multiarch/Implementation>. This patch has been applied and is being used successfully in Ubuntu 11.04, and should be safe to apply in Debian now that multiarch has been bootstrapped there. Please note that this introduces a Breaks: against old versions of plymouth which try to copy pango modules by path into an initramfs; the fix for plymouth (submitted in bug #634253) has not yet been applied in Debian, so the version number in the Breaks is tentative. No Breaks: is needed for external packages providing pango modules, because the "modver" virtual package that they depend on is sufficient to ensure the packages are upgraded in sync. 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/ [email protected] [email protected]
=== modified file 'debian/control' --- debian/control 2011-06-23 19:20:48 +0000 +++ debian/control 2011-07-18 08:29:20 +0000 @@ -3,8 +3,8 @@ Priority: optional Maintainer: Sebastien Bacher <[email protected]> Uploaders: Debian GNOME Maintainers <[email protected]>, Emilio Pozuelo Monfort <[email protected]>, Josselin Mouette <[email protected]>, Michael Biebl <[email protected]>, Sebastian Dröge <[email protected]> -Build-Depends: debhelper (>= 5.0.22), - cdbs (>= 0.4.90~), +Build-Depends: debhelper (>= 8.1.3), + cdbs (>= 0.4.93), gnome-pkg-tools (>= 0.11), autotools-dev, dh-autoreconf, @@ -40,8 +40,11 @@ ttf-arphic-bsmi00lp, ttf-arphic-gkai00mp, ttf-arphic-bkai00mp +Breaks: plymouth (<< 0.8.3-18.1) Conflicts: pango-libthai -Provides: pango1.0-modver-1.6.0 +Provides: pango1.0-multiarch-modver-1.6.0 +Pre-Depends: ${misc:Pre-Depends} +Multi-Arch: same Description: Layout and rendering of internationalized text Pango is a library for layout and rendering of text, with an emphasis on internationalization. Pango can be used anywhere that text layout is @@ -64,7 +67,7 @@ Architecture: any Depends: ${misc:Depends}, ${shlibs:Depends}, -Provides: pango1.0-modver-1.6.0 +Provides: pango1.0-multiarch-modver-1.6.0 Description: Layout and rendering of internationalized text - minimal runtime This is a udeb, or a microdeb, for the debian-installer. . @@ -125,6 +128,7 @@ Architecture: any Depends: ${misc:Depends}, libpango1.0-0 (= ${binary:Version}) +Multi-Arch: same Description: Pango library and debugging symbols Pango is a library for layout and rendering of text, with an emphasis on internationalization. Pango can be used anywhere that text layout is @@ -148,6 +152,7 @@ Depends: ${misc:Depends}, lynx | www-browser Recommends: libglib2.0-doc +Multi-Arch: foreign Description: Documentation files for the Pango Pango is a library for layout and rendering of text, with an emphasis on internationalization. Pango can be used anywhere that text layout is === modified file 'debian/control.in' --- debian/control.in 2011-06-23 19:20:48 +0000 +++ debian/control.in 2011-07-18 08:29:27 +0000 @@ -3,8 +3,8 @@ Priority: optional Maintainer: Sebastien Bacher <[email protected]> Uploaders: @GNOME_TEAM@ -Build-Depends: debhelper (>= 5.0.22), - cdbs (>= 0.4.90~), +Build-Depends: debhelper (>= 8.1.3), + cdbs (>= 0.4.93), gnome-pkg-tools (>= 0.11), autotools-dev, dh-autoreconf, @@ -40,8 +40,11 @@ ttf-arphic-bsmi00lp, ttf-arphic-gkai00mp, ttf-arphic-bkai00mp +Breaks: plymouth (<< 0.8.3-18.1) Conflicts: pango-libthai Provides: @PANGO_MODVER_DEP@ +Pre-Depends: ${misc:Pre-Depends} +Multi-Arch: same Description: Layout and rendering of internationalized text Pango is a library for layout and rendering of text, with an emphasis on internationalization. Pango can be used anywhere that text layout is @@ -125,6 +128,7 @@ Architecture: any Depends: ${misc:Depends}, libpango1.0-@SONAME@ (= ${binary:Version}) +Multi-Arch: same Description: Pango library and debugging symbols Pango is a library for layout and rendering of text, with an emphasis on internationalization. Pango can be used anywhere that text layout is @@ -148,6 +152,7 @@ Depends: ${misc:Depends}, lynx | www-browser Recommends: libglib2.0-doc +Multi-Arch: foreign Description: Documentation files for the Pango Pango is a library for layout and rendering of text, with an emphasis on internationalization. Pango can be used anywhere that text layout is === modified file 'debian/gir1.2-pango-1.0.install.in' --- debian/gir1.2-pango-1.0.install.in 2010-12-11 19:27:45 +0000 +++ debian/gir1.2-pango-1.0.install.in 2011-07-18 06:31:00 +0000 @@ -1,1 +1,1 @@ -debian/install/shared/usr/lib/girepository-1.0/ usr/lib/ +debian/install/shared/@LIBDIR@/girepository-1.0/ usr/lib/ === modified file 'debian/libpango1.0-udeb.install.in' --- debian/libpango1.0-udeb.install.in 2007-05-14 11:39:31 +0000 +++ debian/libpango1.0-udeb.install.in 2011-07-18 06:31:00 +0000 @@ -1,3 +1,3 @@ # from the udeb flavor -debian/install/udeb/@LIBDIR@/*.so.* @LIBDIR@ -debian/install/udeb/@MODULES_PATH@/*.so @MODULES_PATH@ +debian/install/udeb/@LIBDIR_UDEB@/*.so.* @LIBDIR_UDEB@ +debian/install/udeb/@MODULES_PATH_UDEB@/*.so @MODULES_PATH_UDEB@ === modified file 'debian/rules' --- debian/rules 2011-06-23 19:20:48 +0000 +++ debian/rules 2011-07-18 06:31:00 +0000 @@ -27,24 +27,18 @@ SHVERSION := 1.25.5 # relative libdir -ifneq (,$(findstring multiarch,$(DEB_BUILD_OPTIONS))) -LIBDIR := usr/lib/$(DEB_HOST_GNU_TYPE) -else -LIBDIR := usr/lib -endif +LIBDIR := usr/lib/$(DEB_HOST_MULTIARCH) +LIBDIR_UDEB := usr/lib # relative Pango Modules Path (separated by ":") MODULES_PATH := $(LIBDIR)/pango/$(MODVER)/modules +MODULES_PATH_UDEB := $(LIBDIR_UDEB)/pango/$(MODVER)/modules # relative directory to store the generated Pango Module File MODULE_FILES_D := $(LIBDIR)/pango/$(MODVER)/module-files.d # Pango Module API version virtual Provide -ifneq (,$(findstring multiarch,$(DEB_BUILD_OPTIONS))) PANGO_MODVER_DEP := pango$(APIVER)-multiarch-modver-$(MODVER) -else -PANGO_MODVER_DEP := pango$(APIVER)-modver-$(MODVER) -endif # package names SHARED_PKG := libpango$(APIVER)-$(SONAME) @@ -54,15 +48,19 @@ DOC_PKG := libpango$(APIVER)-doc DEB_CONFIGURE_EXTRA_FLAGS = \ - --libdir=/$(LIBDIR) \ --with-html-dir=\$${prefix}/share/doc/$(DOC_PKG) +DEB_CONFIGURE_FLAGS_shared = \ + --libdir=/$(LIBDIR) + DEB_CONFIGURE_FLAGS_static = \ + --libdir=/$(LIBDIR) \ --disable-shared \ --with-included-modules \ --enable-static DEB_CONFIGURE_FLAGS_udeb = \ + --libdir=/$(LIBDIR_UDEB) \ --disable-debug DEB_MAKE_CHECK_TARGET = check @@ -86,8 +84,10 @@ -e 's#@VERSION@#$(DEB_UPSTREAM_VERSION)#g' \ -e 's#@PANGO_MODVER_DEP@#$(PANGO_MODVER_DEP)#g' \ -e 's#@LIBDIR@#$(LIBDIR)#g' \ + -e 's#@LIBDIR_UDEB@#$(LIBDIR_UDEB)#g' \ -e 's#@OPTLIBDIR@#$(OPTLIBDIR)#g' \ -e 's#@MODULES_PATH@#$(MODULES_PATH)#g' \ + -e 's#@MODULES_PATH_UDEB@#$(MODULES_PATH_UDEB)#g' \ -e 's#@MODULE_FILES_D@#$(MODULE_FILES_D)#g' \ -e 's#@GNOME_TEAM@#$(UPLOADERS)#g' \ [email protected] >$@ @@ -118,9 +118,9 @@ binary-install/$(UDEB_PKG):: # Remove the thai module to avoid extraneous dependencies - rm -f debian/$(UDEB_PKG)/$(MODULES_PATH)/pango-thai-lang.so + rm -f debian/$(UDEB_PKG)/$(MODULES_PATH_UDEB)/pango-thai-lang.so # generate $(UDEB_PKG).modules for the udeb - LD_LIBRARY_PATH=$(CURDIR)/debian/$(UDEB_PKG)/$(LIBDIR):$(LD_LIBRARY_PATH) \ + LD_LIBRARY_PATH=$(CURDIR)/debian/$(UDEB_PKG)/$(LIBDIR_UDEB):$(LD_LIBRARY_PATH) \ PANGO_QUERYMODULES=debian/build/udeb/pango/pango-querymodules \ debian/dh_pangomodules \ -p$(UDEB_PKG) -k
signature.asc
Description: Digital signature
