r29178 - in /desktop/unstable/pango1.0/debian: changelog control control.in gir1.2-pango-1.0.install.in libpango1.0-udeb.install.in rules
biebl at users.alioth.debian.org
biebl at users.alioth.debian.org
Thu Jul 28 17:07:28 UTC 2011
Author: biebl
Date: Thu Jul 28 17:07:28 2011
New Revision: 29178
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=29178
Log:
* Build for multiarch. Closes: #634256
* Declare a Breaks: on the pre-multiarch version of plymouth, so users
don't get initramfs generation errors on upgrade.
Modified:
desktop/unstable/pango1.0/debian/changelog
desktop/unstable/pango1.0/debian/control
desktop/unstable/pango1.0/debian/control.in
desktop/unstable/pango1.0/debian/gir1.2-pango-1.0.install.in
desktop/unstable/pango1.0/debian/libpango1.0-udeb.install.in
desktop/unstable/pango1.0/debian/rules
Modified: desktop/unstable/pango1.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pango1.0/debian/changelog?rev=29178&op=diff
==============================================================================
--- desktop/unstable/pango1.0/debian/changelog [utf-8] (original)
+++ desktop/unstable/pango1.0/debian/changelog [utf-8] Thu Jul 28 17:07:28 2011
@@ -1,3 +1,12 @@
+pango1.0 (1.28.4-2) unstable; urgency=low
+
+ [ Steve Langasek ]
+ * Build for multiarch. Closes: #634256
+ * Declare a Breaks: on the pre-multiarch version of plymouth, so users
+ don't get initramfs generation errors on upgrade.
+
+ -- Michael Biebl <biebl at debian.org> Thu, 28 Jul 2011 19:03:15 +0200
+
pango1.0 (1.28.4-1) unstable; urgency=low
* New upstream release.
Modified: desktop/unstable/pango1.0/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pango1.0/debian/control?rev=29178&op=diff
==============================================================================
--- desktop/unstable/pango1.0/debian/control [utf-8] (original)
+++ desktop/unstable/pango1.0/debian/control [utf-8] Thu Jul 28 17:07:28 2011
@@ -3,8 +3,8 @@
Priority: optional
Maintainer: Sebastien Bacher <seb128 at debian.org>
Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu at debian.org>, Josselin Mouette <joss at debian.org>, Michael Biebl <biebl at debian.org>, Sebastian Dröge <slomo at debian.org>
-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: desktop/unstable/pango1.0/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pango1.0/debian/control.in?rev=29178&op=diff
==============================================================================
--- desktop/unstable/pango1.0/debian/control.in [utf-8] (original)
+++ desktop/unstable/pango1.0/debian/control.in [utf-8] Thu Jul 28 17:07:28 2011
@@ -3,8 +3,8 @@
Priority: optional
Maintainer: Sebastien Bacher <seb128 at debian.org>
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- at 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: desktop/unstable/pango1.0/debian/gir1.2-pango-1.0.install.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pango1.0/debian/gir1.2-pango-1.0.install.in?rev=29178&op=diff
==============================================================================
--- desktop/unstable/pango1.0/debian/gir1.2-pango-1.0.install.in [utf-8] (original)
+++ desktop/unstable/pango1.0/debian/gir1.2-pango-1.0.install.in [utf-8] Thu Jul 28 17:07:28 2011
@@ -1,1 +1,1 @@
-debian/install/shared/usr/lib/girepository-1.0/ usr/lib/
+debian/install/shared/@LIBDIR@/girepository-1.0/ usr/lib/
Modified: desktop/unstable/pango1.0/debian/libpango1.0-udeb.install.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pango1.0/debian/libpango1.0-udeb.install.in?rev=29178&op=diff
==============================================================================
--- desktop/unstable/pango1.0/debian/libpango1.0-udeb.install.in [utf-8] (original)
+++ desktop/unstable/pango1.0/debian/libpango1.0-udeb.install.in [utf-8] Thu Jul 28 17:07:28 2011
@@ -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: desktop/unstable/pango1.0/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pango1.0/debian/rules?rev=29178&op=diff
==============================================================================
--- desktop/unstable/pango1.0/debian/rules [utf-8] (original)
+++ desktop/unstable/pango1.0/debian/rules [utf-8] Thu Jul 28 17:07:28 2011
@@ -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' \
$@.in >$@
@@ -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
More information about the pkg-gnome-commits
mailing list