r51115 - /desktop/unstable/pango1.0/debian/

biebl at users.alioth.debian.org biebl at users.alioth.debian.org
Thu Sep 22 17:09:05 UTC 2016


Author: biebl
Date: Thu Sep 22 17:09:04 2016
New Revision: 51115

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=51115
Log:
Drop the multiflavor builds. Those are no longer necessary after the
modules system has been dropped.

Added:
    desktop/unstable/pango1.0/debian/gir1.2-pango-1.0.install
      - copied, changed from r51114, desktop/unstable/pango1.0/debian/gir1.2-pango-1.0.install.in
    desktop/unstable/pango1.0/debian/libpango-1.0-0.install
      - copied, changed from r51114, desktop/unstable/pango1.0/debian/libpango-1.0-0.install.in
    desktop/unstable/pango1.0/debian/libpango1.0-dev.install
      - copied, changed from r51114, desktop/unstable/pango1.0/debian/libpango1.0-dev.install.in
    desktop/unstable/pango1.0/debian/libpango1.0-doc.install
      - copied, changed from r51114, desktop/unstable/pango1.0/debian/libpango1.0-doc.install.in
    desktop/unstable/pango1.0/debian/libpango1.0-doc.links
      - copied, changed from r51114, desktop/unstable/pango1.0/debian/libpango1.0-doc.links.in
    desktop/unstable/pango1.0/debian/libpango1.0-udeb.install
      - copied, changed from r51114, desktop/unstable/pango1.0/debian/libpango1.0-udeb.install.in
    desktop/unstable/pango1.0/debian/libpangocairo-1.0-0.install
      - copied, changed from r51114, desktop/unstable/pango1.0/debian/libpangocairo-1.0-0.install.in
    desktop/unstable/pango1.0/debian/libpangoft2-1.0-0.install
      - copied, changed from r51114, desktop/unstable/pango1.0/debian/libpangoft2-1.0-0.install.in
    desktop/unstable/pango1.0/debian/libpangoxft-1.0-0.install
      - copied, changed from r51114, desktop/unstable/pango1.0/debian/libpangoxft-1.0-0.install.in
Removed:
    desktop/unstable/pango1.0/debian/gir1.2-pango-1.0.install.in
    desktop/unstable/pango1.0/debian/libpango-1.0-0.install.in
    desktop/unstable/pango1.0/debian/libpango1.0-dev.install.in
    desktop/unstable/pango1.0/debian/libpango1.0-doc.install.in
    desktop/unstable/pango1.0/debian/libpango1.0-doc.links.in
    desktop/unstable/pango1.0/debian/libpango1.0-udeb.install.in
    desktop/unstable/pango1.0/debian/libpangocairo-1.0-0.install.in
    desktop/unstable/pango1.0/debian/libpangoft2-1.0-0.install.in
    desktop/unstable/pango1.0/debian/libpangoxft-1.0-0.install.in
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/rules

Modified: desktop/unstable/pango1.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pango1.0/debian/changelog?rev=51115&op=diff
==============================================================================
--- desktop/unstable/pango1.0/debian/changelog	[utf-8] (original)
+++ desktop/unstable/pango1.0/debian/changelog	[utf-8] Thu Sep 22 17:09:04 2016
@@ -4,6 +4,8 @@
   * Drop libpango1.0-0-dbg and switch to automatic dbgsym packages.
   * Bump debhelper compat level to 9.
   * Drop debian/libpango1.0-common.README.Debian, it's horribly outdated.
+  * Drop the multiflavor builds. Those are no longer necessary after the
+    modules system has been dropped.
 
  -- Michael Biebl <biebl at debian.org>  Thu, 22 Sep 2016 17:22:03 +0200
 

Modified: desktop/unstable/pango1.0/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pango1.0/debian/control?rev=51115&op=diff
==============================================================================
--- desktop/unstable/pango1.0/debian/control	[utf-8] (original)
+++ desktop/unstable/pango1.0/debian/control	[utf-8] Thu Sep 22 17:09:04 2016
@@ -1,3 +1,7 @@
+# This file is autogenerated. DO NOT EDIT!
+# 
+# Modifications should be made to debian/control.in instead.
+# This file is regenerated automatically in the clean target.
 Source: pango1.0
 Section: libs
 Priority: optional

Modified: desktop/unstable/pango1.0/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pango1.0/debian/control.in?rev=51115&op=diff
==============================================================================
--- desktop/unstable/pango1.0/debian/control.in	[utf-8] (original)
+++ desktop/unstable/pango1.0/debian/control.in	[utf-8] Thu Sep 22 17:09:04 2016
@@ -59,7 +59,7 @@
  .
  This is a transitional package.
 
-Package: libpango-1.0- at SONAME@
+Package: libpango-1.0-0
 Architecture: any
 Depends: fontconfig (>= 2.1.91), ${misc:Depends}, ${shlibs:Depends}
 Replaces: libpango1.0-0 (<< 1.32.5-2)
@@ -82,53 +82,53 @@
  .
  This package contains the shared libraries.
 
-Package: libpangocairo-1.0- at SONAME@
-Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Breaks: libpango1.0-0 (<< 1.32.5-2)
-Replaces: libpango1.0-0 (<< 1.32.5-2)
-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
- needed. however, most of the work on Pango-1.0 was done using the GTK+
- widget toolkit as a test platform. Pango forms the core of text and
- font handling for GTK+-2.0.
- .
- Pango is designed to be modular; the core Pango layout can be used with
- four different font backends:
-  - Core X windowing system fonts
-  - Client-side fonts on X using the Xft library
-  - Direct rendering of scalable fonts using the FreeType library
-  - Native fonts on Microsoft backends
- .
- This package contains the shared libraries.
-
-Package: libpangoxft-1.0- at SONAME@
-Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Breaks: libpango1.0-0 (<< 1.32.5-2)
-Replaces: libpango1.0-0 (<< 1.32.5-2)
-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
- needed. however, most of the work on Pango-1.0 was done using the GTK+
- widget toolkit as a test platform. Pango forms the core of text and
- font handling for GTK+-2.0.
- .
- Pango is designed to be modular; the core Pango layout can be used with
- four different font backends:
-  - Core X windowing system fonts
-  - Client-side fonts on X using the Xft library
-  - Direct rendering of scalable fonts using the FreeType library
-  - Native fonts on Microsoft backends
- .
- This package contains the shared libraries.
-
-Package: libpangoft2-1.0- at SONAME@
+Package: libpangocairo-1.0-0
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Breaks: libpango1.0-0 (<< 1.32.5-2)
+Replaces: libpango1.0-0 (<< 1.32.5-2)
+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
+ needed. however, most of the work on Pango-1.0 was done using the GTK+
+ widget toolkit as a test platform. Pango forms the core of text and
+ font handling for GTK+-2.0.
+ .
+ Pango is designed to be modular; the core Pango layout can be used with
+ four different font backends:
+  - Core X windowing system fonts
+  - Client-side fonts on X using the Xft library
+  - Direct rendering of scalable fonts using the FreeType library
+  - Native fonts on Microsoft backends
+ .
+ This package contains the shared libraries.
+
+Package: libpangoxft-1.0-0
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Breaks: libpango1.0-0 (<< 1.32.5-2)
+Replaces: libpango1.0-0 (<< 1.32.5-2)
+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
+ needed. however, most of the work on Pango-1.0 was done using the GTK+
+ widget toolkit as a test platform. Pango forms the core of text and
+ font handling for GTK+-2.0.
+ .
+ Pango is designed to be modular; the core Pango layout can be used with
+ four different font backends:
+  - Core X windowing system fonts
+  - Client-side fonts on X using the Xft library
+  - Direct rendering of scalable fonts using the FreeType library
+  - Native fonts on Microsoft backends
+ .
+ This package contains the shared libraries.
+
+Package: libpangoft2-1.0-0
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Breaks: libpango1.0-0 (<< 1.32.5-2)
@@ -182,10 +182,10 @@
          libfreetype6-dev,
          libglib2.0-dev (>= 2.34.0),
          libharfbuzz-dev (>= 0.9.9),
-         libpango-1.0- at SONAME@ (= ${binary:Version}),
-         libpangocairo-1.0- at SONAME@ (= ${binary:Version}),
-         libpangoft2-1.0- at SONAME@ (= ${binary:Version}),
-         libpangoxft-1.0- at SONAME@ (= ${binary:Version}),
+         libpango-1.0-0 (= ${binary:Version}),
+         libpangocairo-1.0-0 (= ${binary:Version}),
+         libpangoft2-1.0-0 (= ${binary:Version}),
+         libpangoxft-1.0-0 (= ${binary:Version}),
          libx11-dev,
          libxft-dev,
          libxrender-dev,

Copied: desktop/unstable/pango1.0/debian/gir1.2-pango-1.0.install (from r51114, 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?rev=51115&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	[utf-8] Thu Sep 22 17:09:04 2016
@@ -1 +1 @@
-debian/install/shared/@LIBDIR@/girepository-1.0/ @LIBDIR@
+usr/lib/*/girepository-1.0/

Copied: desktop/unstable/pango1.0/debian/libpango-1.0-0.install (from r51114, desktop/unstable/pango1.0/debian/libpango-1.0-0.install.in)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pango1.0/debian/libpango-1.0-0.install?rev=51115&op=diff
==============================================================================
--- desktop/unstable/pango1.0/debian/libpango-1.0-0.install.in	[utf-8] (original)
+++ desktop/unstable/pango1.0/debian/libpango-1.0-0.install	[utf-8] Thu Sep 22 17:09:04 2016
@@ -1,2 +1 @@
-# from the shared flavor
-debian/install/shared/@LIBDIR@/libpango-*.so.* @LIBDIR@
+usr/lib/*/libpango-*.so.*

Copied: desktop/unstable/pango1.0/debian/libpango1.0-dev.install (from r51114, desktop/unstable/pango1.0/debian/libpango1.0-dev.install.in)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pango1.0/debian/libpango1.0-dev.install?rev=51115&op=diff
==============================================================================
--- desktop/unstable/pango1.0/debian/libpango1.0-dev.install.in	[utf-8] (original)
+++ desktop/unstable/pango1.0/debian/libpango1.0-dev.install	[utf-8] Thu Sep 22 17:09:04 2016
@@ -1,9 +1,7 @@
-# from the shared flavor
-debian/install/shared/usr/bin/pango-view usr/bin
-debian/install/shared/usr/include usr
-debian/install/shared/@LIBDIR@/*.so @LIBDIR@
-debian/install/shared/@LIBDIR@/pkgconfig/*.pc @LIBDIR@/pkgconfig
-debian/install/shared/usr/share/gir-1.0 usr/share
-debian/install/shared/usr/share/man usr/share
-# from the static flavor
-debian/install/static/@LIBDIR@/*.a @LIBDIR@
+usr/bin/pango-view usr/bin
+usr/include usr
+usr/lib/*/*.so
+usr/lib/*/*.a
+usr/lib/*/pkgconfig/*.pc
+usr/share/gir-1.0
+usr/share/man

Copied: desktop/unstable/pango1.0/debian/libpango1.0-doc.install (from r51114, desktop/unstable/pango1.0/debian/libpango1.0-doc.install.in)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pango1.0/debian/libpango1.0-doc.install?rev=51115&op=diff
==============================================================================
--- desktop/unstable/pango1.0/debian/libpango1.0-doc.install.in	[utf-8] (original)
+++ desktop/unstable/pango1.0/debian/libpango1.0-doc.install	[utf-8] Thu Sep 22 17:09:04 2016
@@ -1 +1 @@
-docs/html/* usr/share/doc/libpango at APIVER@-doc/pango/
+docs/html/* usr/share/doc/libpango1.0-doc/pango/

Copied: desktop/unstable/pango1.0/debian/libpango1.0-doc.links (from r51114, desktop/unstable/pango1.0/debian/libpango1.0-doc.links.in)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pango1.0/debian/libpango1.0-doc.links?rev=51115&op=diff
==============================================================================
--- desktop/unstable/pango1.0/debian/libpango1.0-doc.links.in	[utf-8] (original)
+++ desktop/unstable/pango1.0/debian/libpango1.0-doc.links	[utf-8] Thu Sep 22 17:09:04 2016
@@ -1,3 +1,3 @@
-usr/share/doc/libglib2.0-doc/glib usr/share/doc/libpango at APIVER@-doc/glib
-usr/share/doc/libglib2.0-doc/gobject usr/share/doc/libpango at APIVER@-doc/gobject
-usr/share/doc/libpango at APIVER@-doc/pango usr/share/gtk-doc/html/pango
+usr/share/doc/libglib2.0-doc/glib usr/share/doc/libpango1.0-doc/glib
+usr/share/doc/libglib2.0-doc/gobject usr/share/doc/libpango1.0-doc/gobject
+usr/share/doc/libpango1.0-doc/pango usr/share/gtk-doc/html/pango

Copied: desktop/unstable/pango1.0/debian/libpango1.0-udeb.install (from r51114, 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?rev=51115&op=diff
==============================================================================
--- desktop/unstable/pango1.0/debian/libpango1.0-udeb.install.in	[utf-8] (original)
+++ desktop/unstable/pango1.0/debian/libpango1.0-udeb.install	[utf-8] Thu Sep 22 17:09:04 2016
@@ -1,2 +1 @@
-# from the udeb flavor
-debian/install/udeb/@LIBDIR_UDEB@/*.so.* @LIBDIR_UDEB@
+usr/lib/*/*.so.*

Copied: desktop/unstable/pango1.0/debian/libpangocairo-1.0-0.install (from r51114, desktop/unstable/pango1.0/debian/libpangocairo-1.0-0.install.in)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pango1.0/debian/libpangocairo-1.0-0.install?rev=51115&op=diff
==============================================================================
--- desktop/unstable/pango1.0/debian/libpangocairo-1.0-0.install.in	[utf-8] (original)
+++ desktop/unstable/pango1.0/debian/libpangocairo-1.0-0.install	[utf-8] Thu Sep 22 17:09:04 2016
@@ -1,2 +1 @@
-# from the shared flavor
-debian/install/shared/@LIBDIR@/libpangocairo-*.so.* @LIBDIR@
+usr/lib/*/libpangocairo-*.so.*

Copied: desktop/unstable/pango1.0/debian/libpangoft2-1.0-0.install (from r51114, desktop/unstable/pango1.0/debian/libpangoft2-1.0-0.install.in)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pango1.0/debian/libpangoft2-1.0-0.install?rev=51115&op=diff
==============================================================================
--- desktop/unstable/pango1.0/debian/libpangoft2-1.0-0.install.in	[utf-8] (original)
+++ desktop/unstable/pango1.0/debian/libpangoft2-1.0-0.install	[utf-8] Thu Sep 22 17:09:04 2016
@@ -1,2 +1 @@
-# from the shared flavor
-debian/install/shared/@LIBDIR@/libpangoft2-*.so.* @LIBDIR@
+usr/lib/*/libpangoft2-*.so.*

Copied: desktop/unstable/pango1.0/debian/libpangoxft-1.0-0.install (from r51114, desktop/unstable/pango1.0/debian/libpangoxft-1.0-0.install.in)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pango1.0/debian/libpangoxft-1.0-0.install?rev=51115&op=diff
==============================================================================
--- desktop/unstable/pango1.0/debian/libpangoxft-1.0-0.install.in	[utf-8] (original)
+++ desktop/unstable/pango1.0/debian/libpangoxft-1.0-0.install	[utf-8] Thu Sep 22 17:09:04 2016
@@ -1,2 +1 @@
-# from the shared flavor
-debian/install/shared/@LIBDIR@/libpangoxft-*.so.* @LIBDIR@
+usr/lib/*/libpangoxft-*.so.*

Modified: desktop/unstable/pango1.0/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pango1.0/debian/rules?rev=51115&op=diff
==============================================================================
--- desktop/unstable/pango1.0/debian/rules	[utf-8] (original)
+++ desktop/unstable/pango1.0/debian/rules	[utf-8] Thu Sep 22 17:09:04 2016
@@ -1,9 +1,4 @@
 #!/usr/bin/make -f
-
-DEB_BUILDDIR = debian/build
-DEB_MAKE_DESTDIRSKEL = $(CURDIR)/debian/install/@FLAVOR@
-DEB_MAKE_FLAVORS = shared static udeb
-DISABLE_UPDATE_UPLOADERS = 1
 
 include /usr/share/cdbs/1/rules/autoreconf.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
@@ -24,72 +19,20 @@
 LDFLAGS += -Wl,-O1
 
 APIVER := 1.0
-SONAME := 0
-
-# relative libdir
-LIBDIR := usr/lib/$(DEB_HOST_MULTIARCH)
-LIBDIR_UDEB := $(LIBDIR)
 
 # package names
-SHARED_PKG := libpango-$(APIVER)-$(SONAME)
 UDEB_PKG := libpango$(APIVER)-udeb
 DEV_PKG := libpango$(APIVER)-dev
 DOC_PKG := libpango$(APIVER)-doc
 
 DEB_CONFIGURE_EXTRA_FLAGS = \
-		--with-html-dir=\$${prefix}/share/doc/$(DOC_PKG)
-
-DEB_CONFIGURE_FLAGS_shared = \
-		--libdir=/$(LIBDIR) \
-		--enable-installed-tests
-
-DEB_CONFIGURE_FLAGS_static = \
-		--libdir=/$(LIBDIR) \
-		--disable-shared \
+		--with-html-dir=\$${prefix}/share/doc/$(DOC_PKG) \
+		--libdir=/usr/lib/$(DEB_HOST_MULTIARCH) \
+		--enable-installed-tests \
 		--enable-static
-
-DEB_CONFIGURE_FLAGS_udeb = \
-		--libdir=/$(LIBDIR_UDEB) \
-		--disable-debug
 
 # Get failing tests' stdout/err so we have some information when a build fails
 export VERBOSE=1
 
 DEB_MAKE_CHECK_TARGET = check
-DEB_DH_STRIP_ARGS_$(UDEB_PKG) =
 DEB_DH_MAKESHLIBS_ARGS_ALL += -V --add-udeb=$(UDEB_PKG) -- -c4
-
-# macro computing the list of 'debian/<pkg>.*" files which have a corresponding
-# ".in" file; pass the list of packages in $(1)
-dh_subst_files = $(patsubst %.in,%,$(wildcard $(addprefix debian/, $(addsuffix *.in, $(1)))))
-
-debian/%: debian/%.in
-	dh_testdir
-	sed \
-		-e 's#@SONAME@#$(SONAME)#g' \
-		-e 's#@APIVER@#$(APIVER)#g' \
-		-e 's#@VERSION@#$(DEB_UPSTREAM_VERSION)#g' \
-		-e 's#@LIBDIR@#$(LIBDIR)#g' \
-		-e 's#@LIBDIR_UDEB@#$(LIBDIR_UDEB)#g' \
-		-e 's#@GNOME_TEAM@#$(UPLOADERS)#g' \
-		$@.in >$@
-
-clean:: debian/control
-	# gross kludge to force control generation with the %.in target
-	touch debian/control.in
-	# remove generated files
-	rm -f $(call dh_subst_files,$(DEB_ALL_PACKAGES))
-	rm -rf $(DEB_BUILDDIR) debian/install
-
-build-indep: $(call dh_subst_files,$(DEB_INDEP_PACKAGES))
-build-arch: $(call dh_subst_files,$(DEB_ARCH_PACKAGES))
-
-common-build-arch::
-	# hack to fix missing enumeration GTypes in GIR
-	cd debian/build/shared/pango/ && rm pango-enum-types.* *.gir *.typelib && make
-
-binary-install/$(DEV_PKG)::
-	# verify that the .gir is built correctly
-	grep -q 'glib:get-type="pango_wrap_mode_get_type"' debian/$(DEV_PKG)/usr/share/gir-1.0/Pango-1.0.gir
-
-binary-install/pango1.0-tests:: DEB_DH_INSTALL_ARGS = --sourcedir=debian/install/shared




More information about the pkg-gnome-commits mailing list