r45910 - in /desktop/experimental/pango1.0/debian: changelog control.in dh_pangomodules.in libpango-1.0-0.symbols libpango1.0-dev.install.in libpango1.0-udeb.install.in libpangoft2-1.0-0.symbols patches/ rules
ah at users.alioth.debian.org
ah at users.alioth.debian.org
Wed Sep 16 16:47:16 UTC 2015
Author: ah
Date: Wed Sep 16 16:47:16 2015
New Revision: 45910
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=45910
Log:
* New upstream development release.
- The module system is now deprecated.
* Drop patches obsoleted by module system deprecation:
- 10_scan-module-files-in-dirs.patch
- 11_module-files-append-module-files-d.patch
- 14_makefile_modules_ft2_link_harfbuzz.patch
* Drop lingering unused patch
- 13_configure-thai-modules.patch
* Partial import of Ubuntu gnome3 staging ppa 1.37.4-0ubuntu1~wily0
- symbols files updates
- package updates for modules deprecation
- drop debian/dh_pangomodules.in
Removed:
desktop/experimental/pango1.0/debian/dh_pangomodules.in
desktop/experimental/pango1.0/debian/patches/
Modified:
desktop/experimental/pango1.0/debian/changelog
desktop/experimental/pango1.0/debian/control.in
desktop/experimental/pango1.0/debian/libpango-1.0-0.symbols
desktop/experimental/pango1.0/debian/libpango1.0-dev.install.in
desktop/experimental/pango1.0/debian/libpango1.0-udeb.install.in
desktop/experimental/pango1.0/debian/libpangoft2-1.0-0.symbols
desktop/experimental/pango1.0/debian/rules
Modified: desktop/experimental/pango1.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/pango1.0/debian/changelog?rev=45910&op=diff
==============================================================================
--- desktop/experimental/pango1.0/debian/changelog [utf-8] (original)
+++ desktop/experimental/pango1.0/debian/changelog [utf-8] Wed Sep 16 16:47:16 2015
@@ -1,3 +1,20 @@
+pango1.0 (1.37.5-1) UNRELEASED; urgency=medium
+
+ * New upstream development release.
+ - The module system is now deprecated.
+ * Drop patches obsoleted by module system deprecation:
+ - 10_scan-module-files-in-dirs.patch
+ - 11_module-files-append-module-files-d.patch
+ - 14_makefile_modules_ft2_link_harfbuzz.patch
+ * Drop lingering unused patch
+ - 13_configure-thai-modules.patch
+ * Partial import of Ubuntu gnome3 staging ppa 1.37.4-0ubuntu1~wily0
+ - symbols files updates
+ - package updates for modules deprecation
+ - drop debian/dh_pangomodules.in
+
+ -- Andreas Henriksson <andreas at fatal.se> Wed, 16 Sep 2015 18:47:03 +0200
+
pango1.0 (1.36.8-3) unstable; urgency=medium
* debian/control{,.in}: The testsuite depends on Cantarell. Fixes DEP8 test
Modified: desktop/experimental/pango1.0/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/pango1.0/debian/control.in?rev=45910&op=diff
==============================================================================
--- desktop/experimental/pango1.0/debian/control.in [utf-8] (original)
+++ desktop/experimental/pango1.0/debian/control.in [utf-8] Wed Sep 16 16:47:16 2015
@@ -41,7 +41,6 @@
libpangoxft-1.0-0 (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends}
-Provides: @PANGO_MODVER_DEP@
Multi-Arch: same
Description: Layout and rendering of internationalized text
Pango is a library for layout and rendering of text, with an emphasis
@@ -64,7 +63,6 @@
Depends: fontconfig (>= 2.1.91), ${misc:Depends}, ${shlibs:Depends}
Replaces: libpango1.0-0 (<< 1.32.5-2)
Breaks: libpango1.0-0 (<< 1.32.5-2), plymouth (<< 0.8.3-19)
-Provides: @PANGO_MODVER_DEP@
Pre-Depends: ${misc:Pre-Depends}
Multi-Arch: same
Description: Layout and rendering of internationalized text
@@ -157,7 +155,6 @@
Section: debian-installer
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}
-Provides: @PANGO_MODVER_DEP@
Description: Layout and rendering of internationalized text - minimal runtime
This is a udeb, or a microdeb, for the debian-installer.
.
Modified: desktop/experimental/pango1.0/debian/libpango-1.0-0.symbols
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/pango1.0/debian/libpango-1.0-0.symbols?rev=45910&op=diff
==============================================================================
--- desktop/experimental/pango1.0/debian/libpango-1.0-0.symbols [utf-8] (original)
+++ desktop/experimental/pango1.0/debian/libpango-1.0-0.symbols [utf-8] Wed Sep 16 16:47:16 2015
@@ -5,6 +5,7 @@
pango_attr_fallback_new at Base 1.14.0
pango_attr_family_new at Base 1.14.0
pango_attr_font_desc_new at Base 1.14.0
+ pango_attr_font_features_new at Base 1.37.2
pango_attr_foreground_new at Base 1.14.0
pango_attr_gravity_hint_new at Base 1.18.0
pango_attr_gravity_new at Base 1.18.0
@@ -329,6 +330,7 @@
pango_matrix_copy at Base 1.14.0
pango_matrix_free at Base 1.14.0
pango_matrix_get_font_scale_factor at Base 1.14.0
+ pango_matrix_get_font_scale_factors at Base 1.37.2
pango_matrix_get_type at Base 1.14.0
pango_matrix_rotate at Base 1.14.0
pango_matrix_scale at Base 1.14.0
Modified: desktop/experimental/pango1.0/debian/libpango1.0-dev.install.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/pango1.0/debian/libpango1.0-dev.install.in?rev=45910&op=diff
==============================================================================
--- desktop/experimental/pango1.0/debian/libpango1.0-dev.install.in [utf-8] (original)
+++ desktop/experimental/pango1.0/debian/libpango1.0-dev.install.in [utf-8] Wed Sep 16 16:47:16 2015
@@ -1,7 +1,4 @@
-# from Debian
-debian/dh_pangomodules usr/bin
# from the shared flavor
-debian/install/shared/usr/bin/pango-querymodules usr/bin
debian/install/shared/usr/bin/pango-view usr/bin
debian/install/shared/usr/include usr
debian/install/shared/@LIBDIR@/*.so @LIBDIR@
Modified: desktop/experimental/pango1.0/debian/libpango1.0-udeb.install.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/pango1.0/debian/libpango1.0-udeb.install.in?rev=45910&op=diff
==============================================================================
--- desktop/experimental/pango1.0/debian/libpango1.0-udeb.install.in [utf-8] (original)
+++ desktop/experimental/pango1.0/debian/libpango1.0-udeb.install.in [utf-8] Wed Sep 16 16:47:16 2015
@@ -1,3 +1,2 @@
# from the udeb flavor
debian/install/udeb/@LIBDIR_UDEB@/*.so.* @LIBDIR_UDEB@
-debian/install/udeb/@MODULES_PATH_UDEB@/*.so @MODULES_PATH_UDEB@
Modified: desktop/experimental/pango1.0/debian/libpangoft2-1.0-0.symbols
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/pango1.0/debian/libpangoft2-1.0-0.symbols?rev=45910&op=diff
==============================================================================
--- desktop/experimental/pango1.0/debian/libpangoft2-1.0-0.symbols [utf-8] (original)
+++ desktop/experimental/pango1.0/debian/libpangoft2-1.0-0.symbols [utf-8] Wed Sep 16 16:47:16 2015
@@ -17,9 +17,12 @@
pango_fc_font_lock_face at Base 1.14.0
pango_fc_font_map_add_decoder_find_func at Base 1.14.0
pango_fc_font_map_cache_clear at Base 1.14.0
+ pango_fc_font_map_config_changed at Base 1.37.2
pango_fc_font_map_create_context at Base 1.14.0
pango_fc_font_map_find_decoder at Base 1.24.0
+ pango_fc_font_map_get_config at Base 1.37.2
pango_fc_font_map_get_type at Base 1.14.0
+ pango_fc_font_map_set_config at Base 1.37.2
pango_fc_font_map_shutdown at Base 1.14.0
pango_fc_font_unlock_face at Base 1.14.0
pango_fc_fontset_key_get_absolute_size at Base 1.24.0
Modified: desktop/experimental/pango1.0/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/pango1.0/debian/rules?rev=45910&op=diff
==============================================================================
--- desktop/experimental/pango1.0/debian/rules [utf-8] (original)
+++ desktop/experimental/pango1.0/debian/rules [utf-8] Wed Sep 16 16:47:16 2015
@@ -25,21 +25,10 @@
APIVER := 1.0
SONAME := 0
-MODVER := 1.8.0
# relative libdir
LIBDIR := usr/lib/$(DEB_HOST_MULTIARCH)
LIBDIR_UDEB := $(LIBDIR)
-
-# 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
-PANGO_MODVER_DEP := pango$(APIVER)-multiarch-modver-$(MODVER)
# package names
SHARED_PKG := libpango-$(APIVER)-$(SONAME)
@@ -53,13 +42,11 @@
DEB_CONFIGURE_FLAGS_shared = \
--libdir=/$(LIBDIR) \
- --with-included-modules \
--enable-installed-tests
DEB_CONFIGURE_FLAGS_static = \
--libdir=/$(LIBDIR) \
--disable-shared \
- --with-included-modules \
--enable-static
DEB_CONFIGURE_FLAGS_udeb = \
@@ -72,15 +59,11 @@
DEB_MAKE_CHECK_TARGET = check
DEB_DH_STRIP_ARGS_DEFAULT = --dbg-package=libpango$(APIVER)-$(SONAME)-dbg
DEB_DH_STRIP_ARGS_$(UDEB_PKG) =
-DEB_DH_MAKESHLIBS_ARGS_ALL += -X$(MODULES_PATH) \
- -V --add-udeb=$(UDEB_PKG) -- -c4
+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/dh_pangomodules.1: debian/dh_pangomodules
- cd debian && pod2man -c "Pango" -r "$(DEB_VERSION)" dh_pangomodules dh_pangomodules.1
debian/%: debian/%.in
dh_testdir
@@ -88,12 +71,8 @@
-e 's#@SONAME@#$(SONAME)#g' \
-e 's#@APIVER@#$(APIVER)#g' \
-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#@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 >$@
@@ -102,11 +81,10 @@
touch debian/control.in
# remove generated files
rm -f $(call dh_subst_files,$(DEB_ALL_PACKAGES))
- rm -f debian/dh_pangomodules debian/dh_pangomodules.1
rm -rf $(DEB_BUILDDIR) debian/install
build-indep: $(call dh_subst_files,$(DEB_INDEP_PACKAGES))
-build-arch: $(call dh_subst_files,$(DEB_ARCH_PACKAGES)) debian/dh_pangomodules.1
+build-arch: $(call dh_subst_files,$(DEB_ARCH_PACKAGES))
common-build-arch::
# hack to fix missing enumeration GTypes in GIR
@@ -116,22 +94,4 @@
# 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/$(SHARED_PKG)::
- # fix the permissions of dh_pangomodules
- chmod +x debian/dh_pangomodules
- # generate $(SHARED_PKG).modules for the shared lib
- LD_LIBRARY_PATH=$(CURDIR)/debian/$(SHARED_PKG)/$(LIBDIR):$(LD_LIBRARY_PATH) \
- PANGO_QUERYMODULES=debian/build/shared/pango/pango-querymodules \
- debian/dh_pangomodules \
- -p$(SHARED_PKG) -k
-
-binary-install/$(UDEB_PKG)::
- # Remove the thai module to avoid extraneous dependencies
- 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_UDEB):$(LD_LIBRARY_PATH) \
- PANGO_QUERYMODULES=debian/build/udeb/pango/pango-querymodules \
- debian/dh_pangomodules \
- -p$(UDEB_PKG) -k
-
binary-install/pango1.0-tests:: DEB_DH_INSTALL_ARGS = --sourcedir=debian/install/shared
More information about the pkg-gnome-commits
mailing list