r52718 - in /desktop/unstable/glib2.0: ./ debian/ debian/source/
mak at users.alioth.debian.org
mak at users.alioth.debian.org
Sun Jul 30 11:08:55 UTC 2017
Author: mak
Date: Sun Jul 30 11:08:54 2017
New Revision: 52718
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=52718
Log:
Upload to unstable from experimental
Added:
desktop/unstable/glib2.0/debian/libglib2.0-dev-bin.install
- copied unchanged from r52717, desktop/experimental/glib2.0/debian/libglib2.0-dev-bin.install
desktop/unstable/glib2.0/debian/libglib2.0-tests.lintian-overrides
- copied unchanged from r52717, desktop/experimental/glib2.0/debian/libglib2.0-tests.lintian-overrides
Removed:
desktop/unstable/glib2.0/debian/dh_listmissing.pl
desktop/unstable/glib2.0/debian/libglib2.0-0-dbg.install
desktop/unstable/glib2.0/debian/source/lintian-overrides
Modified:
desktop/unstable/glib2.0/ (props changed)
desktop/unstable/glib2.0/debian/changelog
desktop/unstable/glib2.0/debian/compat
desktop/unstable/glib2.0/debian/control
desktop/unstable/glib2.0/debian/control.in
desktop/unstable/glib2.0/debian/libglib2.0-0.install
desktop/unstable/glib2.0/debian/libglib2.0-0.lintian-overrides
desktop/unstable/glib2.0/debian/libglib2.0-0.symbols
desktop/unstable/glib2.0/debian/libglib2.0-bin.install
desktop/unstable/glib2.0/debian/libglib2.0-dev.install
desktop/unstable/glib2.0/debian/rules
desktop/unstable/glib2.0/debian/watch
Propchange: desktop/unstable/glib2.0/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jul 30 11:08:54 2017
@@ -1,2 +1,2 @@
-/desktop/experimental/glib2.0:34881-37631,43901-45934,46852-47640
+/desktop/experimental/glib2.0:34881-37631,43901-45934,46852-47640,51741-52717
/desktop/unstable/glib2.0:24636,27515-27547,38796-39206,41794-42178,49089-49521
Modified: desktop/unstable/glib2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/changelog?rev=52718&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/changelog [utf-8] (original)
+++ desktop/unstable/glib2.0/debian/changelog [utf-8] Sun Jul 30 11:08:54 2017
@@ -1,3 +1,167 @@
+glib2.0 (2.53.4-2) unstable; urgency=medium
+
+ * Upload to unstable
+
+ -- Matthias Klumpp <mak at debian.org> Sun, 30 Jul 2017 12:54:22 +0200
+
+glib2.0 (2.53.4-1) experimental; urgency=medium
+
+ * New upstream release 2.53.4
+ + Unicode support has been updated to Unicode 10.0.0
+ + glib-genmarshal and glib-mkenums have been rewritten in python
+ + GLib can now be built with meson. autotools are still supported
+
+ -- Iain Lane <laney at debian.org> Wed, 19 Jul 2017 17:32:31 +0100
+
+glib2.0 (2.53.3-1) experimental; urgency=medium
+
+ * New upstream release 2.53.3.
+ * d/p/0001-gdatetime-Fix-a-potential-overflow-in-overflow-calcu.patch,
+ d/p/0002-tests-Fix-GDateTime-overflow-tests-on-32-bit-archite.patch,
+ d/p/0003-tests-Fix-overflows-in-find_maximum_supported_tv_sec.patch:
+ Cherry-picks to fix some overflow problems in GDateTime on 32 bit arches.
+
+ -- Iain Lane <laney at debian.org> Fri, 23 Jun 2017 11:09:22 +0100
+
+glib2.0 (2.53.2-1) experimental; urgency=medium
+
+ * New upstream release 2.53.2
+ + A few new number parsing functions have been added:
+ - g_ascii_string_to_signed
+ - g_ascii_string_to_unsigned
+ These have better error handling than the existing ones.
+ + glib-mkenums now supports /*< private >*/ and /*< public >*/
+ + GSettings now consider XDG_DATA_HOME in addition to XDG_DATA_DIRS.
+ * debian/libglib2.0-0.symbols: Add new symbols for 2.53.1.
+ * debian/patches/skip-broken-dbus-appinfo-test.patch: Drop - this test works
+ now.
+
+ -- Iain Lane <laney at debian.org> Mon, 12 Jun 2017 16:25:21 +0100
+
+glib2.0 (2.53.1-1) experimental; urgency=medium
+
+ * New upstream release 2.53.1
+ + The gdbus tool gained a wait command
+ + g_unix_signal_source_new support SIGWINCH now
+ + There are now g_enum_to_string and g_flags_to_string functions
+ + A new function to instantiate objects: g_objet_new_with_properties
+ + GParameter and related APIs have been deprecated
+ * debian/libglib2.0-0.symbols: Add new symbols for 2.53.1.
+
+ -- Iain Lane <laney at debian.org> Fri, 05 May 2017 18:04:15 +0100
+
+glib2.0 (2.52.0-1) experimental; urgency=medium
+
+ * New upstream release 2.52.0
+ * d/p/tests-gdatetime-Use-a-real-rather-than-invented-time.patch: Drop,
+ applied in this release.
+
+ -- Iain Lane <laney at debian.org> Mon, 20 Mar 2017 17:14:29 +0000
+
+glib2.0 (2.51.5-1) experimental; urgency=medium
+
+ * New upstream release 2.51.5
+ * Drop patches applied upstream in this release:
+ - Install-gdb-Python-helpers-as-data-not-as-executable.patch
+ - glib-mkenums-Sort-input-files-for-more-deterministic.patch
+ * debian/patches/tests-gdatetime-Use-a-real-rather-than-invented-time.patch:
+ Cherry-pick a patch from upstream to fix GDateTime tests when tzdata ≥
+ 2017a is in use.
+ * debian/libglib2.0-dev.install: Install the gdb script for libglib-2.0.so.*
+ into .../lib instead of .../usr/lib - it needs to match the installed path
+ of the library and we put libglib-2.0.so.* into /lib.
+ * debian/libglib2.0-0.symbols: Add g_content_type_is_mime_type
+
+ -- Iain Lane <laney at debian.org> Wed, 15 Mar 2017 13:55:41 +0000
+
+glib2.0 (2.51.4-1) experimental; urgency=medium
+
+ * Team upload
+ * New upstream release 2.51.4 (and 2.51.3)
+ * Build with dh instead of cdbs
+ - Move to debhelper compat level 10
+ - Use dpkg-buildflags variables to extend LDFLAGS
+ - Enable bindnow hardening
+ - Remove indirection via $(SHARED_PKG), etc. variables
+ - Let dh_gnome_clean update the Uploaders instead of reinventing it
+ - Install some missing files detected by dh_install --list-missing
+ - Fix lintian warnings about useless use of dh-exec
+ - debian/dh_listmissing.pl: Remove
+ * Improve packaging for cross-compiling (Closes: #648621, #842442)
+ - Move glib-genmarshal and related files to a new M-A:foreign package
+ libglib2.0-dev-bin. Thanks to Helmut Grohne for the patch.
+ - Additionally move gdbus-codegen and gtester-report to
+ libglib2.0-dev-bin. They are architecture-independent, so in
+ particular clearly Multi-Arch: foreign; they aren't large enough to
+ justify a separate Architecture: all package. This works around
+ dh_python3's postinst snippet failing when used in a Multi-Arch: same
+ package with more than one instance installed.
+ - Move gtester to libglib2.0-dev-bin. It is a test-runner that can
+ operate on any executable, and does not rely on a matching architecture.
+ - Move gobject-query to libglib2.0-dev-bin. It prints the same things on
+ all architectures, and it isn't clear what use it is; glib-2.0.m4
+ checks for it and AC_SUBSTs it, but according to codesearch.debian.net
+ no package actually seems to run it.
+ - Make libglib2.0-dev Multi-Arch: same
+ * Move gdb helpers from libglib2.0-0-dbg to libglib2.0-dev, move
+ detached debug symbols from libglib2.0-0-dbg to autogenerated -dbgsym
+ packages, and remove the libglib2.0-0-dbg binary package
+ * Add support for noudeb build profile
+ - Do not do the udeb build if the noudeb profile is selected,
+ for faster test-builds
+ * Fix assorted Lintian warnings
+ - Add missing build-dependency on dh-python
+ + remove obsolete Lintian override for mmissing B-D on python
+ - Add Lintian overrides for some intentionally weird scripts used in tests
+ - Do not install glib_gdb.py, gobject_gdb.py executable. They are
+ libraries to be imported by the gdb hooks, not scripts.
+ - Don't generate a ldconfig trigger for libglib2.0-tests, which does
+ not contain any public shared libraries
+ * Add patch to make glib-mkenums output more reproducible (Closes: #809152)
+ * Explicitly build-depend on automake so that the aspcud resolver used for
+ experimental does not decide automake1.11 is the best solution to
+ a dependency on automake | automaken
+
+ -- Simon McVittie <smcv at debian.org> Sat, 04 Mar 2017 17:00:47 +0000
+
+glib2.0 (2.51.2-1) experimental; urgency=medium
+
+ * New upstream release 2.51.2 (& 2.51.1).
+ + Minimal support for UUIDs has been added
+ + A new file attribute, G_FILE_ATTRIBUTE_RECENT_MODIFIED has been added to
+ improve sorting of recent files
+ + glib-compile-resources grew a --generate-phony-targets flag
+ + GLib now installs a valgrind suppressions file for GLib and GIO
+ * debian/patches/skip-brokwn-dbus-appinfo-test.patch: Refresh (and fix the
+ typo in the filename)
+ * debian/libglib2.0-0.symbols: Add g_uuid* symbols which are new in this
+ release
+
+ -- Iain Lane <laney at debian.org> Tue, 14 Feb 2017 14:16:05 +0000
+
+glib2.0 (2.51.0-2) experimental; urgency=medium
+
+ * Merge changes from 2.50.2-2:
+ + debian/rules: disable libmount on !linux (Closes: #844052)
+ + debian/patches/0001-Fix-trashing-on-overlayfs.patch: Update with new
+ version from the upstream report to hopefully fix trashing of files in
+ directories which are symlinks to different devices. (Closes: #800047)
+ (LP: #1638245)
+
+ -- Iain Lane <laney at debian.org> Wed, 23 Nov 2016 17:36:07 +0000
+
+glib2.0 (2.51.0-1) experimental; urgency=medium
+
+ * debian/control{,.in}: Branch to experimental
+ * debian/watch: Track unstable releases again.
+ * New upstream release 2.51.0
+ + glib-genmarshal and glib-mkenums have gained --output options for better
+ build system integration
+ + New API: g_utf8_make_valid
+ * Update debian/libglib2.0-0.symbols.
+
+ -- Iain Lane <laney at debian.org> Wed, 16 Nov 2016 18:23:38 +0000
+
glib2.0 (2.52.3-1) unstable; urgency=medium
* New upstream release.
@@ -27,7 +191,7 @@
* debian/rules: disable libmount on !linux (Closes: #844052)
* debian/patches/0001-Fix-trashing-on-overlayfs.patch: Update with new
- version from the upsstream report to hopefully fix trashing of files in
+ version from the upstream report to hopefully fix trashing of files in
directories which are symlinks to different devices. (Closes: #800047)
-- Iain Lane <laney at debian.org> Wed, 23 Nov 2016 16:33:21 +0000
Modified: desktop/unstable/glib2.0/debian/compat
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/compat?rev=52718&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/compat [utf-8] (original)
+++ desktop/unstable/glib2.0/debian/compat [utf-8] Sun Jul 30 11:08:54 2017
@@ -1 +1 @@
-9
+10
Modified: desktop/unstable/glib2.0/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/control?rev=52718&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/control [utf-8] (original)
+++ desktop/unstable/glib2.0/debian/control [utf-8] Sun Jul 30 11:08:54 2017
@@ -1,14 +1,18 @@
+# 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: glib2.0
Section: libs
Priority: optional
Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
-Uploaders: Andreas Henriksson <andreas at fatal.se>, Emilio Pozuelo Monfort <pochu at debian.org>, Iain Lane <laney at debian.org>, Michael Biebl <biebl at debian.org>
-Build-Depends: debhelper (>= 9.20141010),
- cdbs (>= 0.4.93),
- dh-autoreconf,
+Uploaders: Iain Lane <laney at debian.org>
+Build-Depends: debhelper (>= 10~),
dh-exec,
+ dh-python,
pkg-config (>= 0.16.0),
gettext,
+ automake,
autotools-dev,
gnome-pkg-tools (>= 0.11),
dpkg-dev (>= 1.17.14),
@@ -35,8 +39,8 @@
libffi-dev (>= 3.0.0)
Standards-Version: 3.9.8
Homepage: http://www.gtk.org/
-Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/glib2.0/
-Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/glib2.0/
+Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-gnome/desktop/experimental/glib2.0/
+Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/experimental/glib2.0/
Package: libglib2.0-0
Architecture: any
@@ -72,6 +76,7 @@
regression testsuite.
Package: libglib2.0-udeb
+Build-Profiles: <!noudeb>
Section: debian-installer
Package-Type: udeb
Architecture: any
@@ -107,14 +112,18 @@
Package: libglib2.0-dev
Section: libdevel
Architecture: any
+Multi-Arch: same
Depends: ${misc:Depends},
${shlibs:Depends},
${python3:Depends},
libglib2.0-0 (= ${binary:Version}),
libglib2.0-bin (= ${binary:Version}),
+ libglib2.0-dev-bin (= ${binary:Version}),
libpcre3-dev (>= 1:8.31),
pkg-config,
zlib1g-dev
+Breaks: libglib2.0-0-dbg (<< 2.51.4-1~)
+Replaces: libglib2.0-0-dbg (<< 2.51.4-1~)
Suggests: libglib2.0-doc
Description: Development files for the GLib library
GLib is a library containing many useful C routines for things such
@@ -125,23 +134,23 @@
as only it includes the header files and static libraries (optionally)
needed for compiling.
-Package: libglib2.0-0-dbg
-Section: debug
-Priority: extra
+Package: libglib2.0-dev-bin
+Section: libdevel
Architecture: any
-Multi-Arch: same
Depends: ${misc:Depends},
- libglib2.0-0 (= ${binary:Version})
-Breaks: libglib2.0-dev (<< 2.43.2-2~)
-Replaces: libglib2.0-dev (<< 2.43.2-2~)
-Description: Debugging symbols for the GLib libraries
+ ${python3:Depends},
+ ${shlibs:Depends},
+Breaks: libglib2.0-dev (<< 2.51.4-1~)
+Replaces: libglib2.0-dev (<< 2.51.4-1~)
+Multi-Arch: foreign
+Description: Development utilities for the GLib library
GLib is a library containing many useful C routines for things such
as trees, hashes, lists, and strings. It is a useful general-purpose
C library used by projects such as GTK+, GIMP, and GNOME.
.
- This package contains detached debugging symbols.
- .
- Most people will not need this package.
+ This package is needed to compile programs against libglib2.0-0. It contains
+ development utilities typically run during compilation and should not be
+ installed directly. Use libglib2.0-dev instead.
Package: libglib2.0-data
Architecture: all
Modified: desktop/unstable/glib2.0/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/control.in?rev=52718&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/control.in [utf-8] (original)
+++ desktop/unstable/glib2.0/debian/control.in [utf-8] Sun Jul 30 11:08:54 2017
@@ -1,14 +1,14 @@
-Source: glib at APIVER@
+Source: glib2.0
Section: libs
Priority: optional
Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
Uploaders: @GNOME_TEAM@
-Build-Depends: debhelper (>= 9.20141010),
- cdbs (>= 0.4.93),
- dh-autoreconf,
+Build-Depends: debhelper (>= 10~),
dh-exec,
+ dh-python,
pkg-config (>= 0.16.0),
gettext,
+ automake,
autotools-dev,
gnome-pkg-tools (>= 0.11),
dpkg-dev (>= 1.17.14),
@@ -35,14 +35,14 @@
libffi-dev (>= 3.0.0)
Standards-Version: 3.9.8
Homepage: http://www.gtk.org/
-Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/glib2.0/
-Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/glib2.0/
+Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-gnome/desktop/experimental/glib2.0/
+Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/experimental/glib2.0/
-Package: @SHARED_PKG@
+Package: libglib2.0-0
Architecture: any
Depends: ${misc:Depends},
${shlibs:Depends}
-Recommends: @DATA_PKG@,
+Recommends: libglib2.0-data,
shared-mime-info,
xdg-user-dirs
Breaks: glib-networking (<< 2.33.12),
@@ -57,7 +57,7 @@
.
This package contains the shared libraries.
-Package: libglib at APIVER@-tests
+Package: libglib2.0-tests
Architecture: any
Depends: ${misc:Depends},
${shlibs:Depends},
@@ -71,7 +71,8 @@
This package contains test programs, designed to be run as part of a
regression testsuite.
-Package: libglib at APIVER@-udeb
+Package: libglib2.0-udeb
+Build-Profiles: <!noudeb>
Section: debian-installer
Package-Type: udeb
Architecture: any
@@ -87,14 +88,14 @@
This package contains the minimal runtime library needed by the Debian
installer.
-Package: @BIN_PKG@
+Package: libglib2.0-bin
Section: misc
Architecture: any
Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends},
${misc:Depends},
- @SHARED_PKG@ (= ${binary:Version}),
- @DATA_PKG@
+ libglib2.0-0 (= ${binary:Version}),
+ libglib2.0-data
Multi-Arch: foreign
Description: Programs for the GLib library
GLib is a library containing many useful C routines for things such
@@ -104,46 +105,50 @@
This package contains the program files which is used for the libraries
and others.
-Package: @DEV_PKG@
+Package: libglib2.0-dev
Section: libdevel
Architecture: any
+Multi-Arch: same
Depends: ${misc:Depends},
${shlibs:Depends},
${python3:Depends},
- @SHARED_PKG@ (= ${binary:Version}),
- @BIN_PKG@ (= ${binary:Version}),
+ libglib2.0-0 (= ${binary:Version}),
+ libglib2.0-bin (= ${binary:Version}),
+ libglib2.0-dev-bin (= ${binary:Version}),
libpcre3-dev (>= 1:8.31),
pkg-config,
zlib1g-dev
-Suggests: @DOC_PKG@
+Breaks: libglib2.0-0-dbg (<< 2.51.4-1~)
+Replaces: libglib2.0-0-dbg (<< 2.51.4-1~)
+Suggests: libglib2.0-doc
Description: Development files for the GLib library
GLib is a library containing many useful C routines for things such
as trees, hashes, lists, and strings. It is a useful general-purpose
C library used by projects such as GTK+, GIMP, and GNOME.
.
- This package is needed to compile programs against @SHARED_PKG@,
+ This package is needed to compile programs against libglib2.0-0,
as only it includes the header files and static libraries (optionally)
needed for compiling.
-Package: @DEBUG_PKG@
-Section: debug
-Priority: extra
+Package: libglib2.0-dev-bin
+Section: libdevel
Architecture: any
-Multi-Arch: same
Depends: ${misc:Depends},
- @SHARED_PKG@ (= ${binary:Version})
-Breaks: libglib2.0-dev (<< 2.43.2-2~)
-Replaces: libglib2.0-dev (<< 2.43.2-2~)
-Description: Debugging symbols for the GLib libraries
+ ${python3:Depends},
+ ${shlibs:Depends},
+Breaks: libglib2.0-dev (<< 2.51.4-1~)
+Replaces: libglib2.0-dev (<< 2.51.4-1~)
+Multi-Arch: foreign
+Description: Development utilities for the GLib library
GLib is a library containing many useful C routines for things such
as trees, hashes, lists, and strings. It is a useful general-purpose
C library used by projects such as GTK+, GIMP, and GNOME.
.
- This package contains detached debugging symbols.
- .
- Most people will not need this package.
+ This package is needed to compile programs against libglib2.0-0. It contains
+ development utilities typically run during compilation and should not be
+ installed directly. Use libglib2.0-dev instead.
-Package: @DATA_PKG@
+Package: libglib2.0-data
Architecture: all
Depends: ${misc:Depends}
Multi-Arch: foreign
@@ -155,7 +160,7 @@
This package is needed for the runtime libraries to display messages in
languages other than English.
-Package: @DOC_PKG@
+Package: libglib2.0-doc
Section: doc
Architecture: all
Depends: ${misc:Depends}
@@ -167,7 +172,7 @@
C library used by projects such as GTK+, GIMP, and GNOME.
.
This package contains the HTML documentation for the GLib library
- in /usr/share/doc/@DOC_PKG@/ .
+ in /usr/share/doc/libglib2.0-doc/ .
Package: libgio-fam
Architecture: hurd-any kfreebsd-any
Modified: desktop/unstable/glib2.0/debian/libglib2.0-0.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/libglib2.0-0.install?rev=52718&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/libglib2.0-0.install [utf-8] (original)
+++ desktop/unstable/glib2.0/debian/libglib2.0-0.install [utf-8] Sun Jul 30 11:08:54 2017
@@ -1,9 +1,9 @@
#!/usr/bin/dh-exec
-usr/lib/${DEB_HOST_MULTIARCH}/libglib*.so.* lib/${DEB_HOST_MULTIARCH}
-usr/lib/${DEB_HOST_MULTIARCH}/libgobject*.so.*
-usr/lib/${DEB_HOST_MULTIARCH}/libgmodule*.so.*
-usr/lib/${DEB_HOST_MULTIARCH}/libgthread*.so.*
-usr/lib/${DEB_HOST_MULTIARCH}/libgio*.so.*
+usr/lib/*/libglib*.so.* lib/${DEB_HOST_MULTIARCH}
+usr/lib/*/libgobject*.so.*
+usr/lib/*/libgmodule*.so.*
+usr/lib/*/libgthread*.so.*
+usr/lib/*/libgio*.so.*
usr/bin/gio-querymodules usr/lib/${DEB_HOST_MULTIARCH}/glib-2.0
usr/bin/glib-compile-schemas usr/lib/${DEB_HOST_MULTIARCH}/glib-2.0
usr/bin/glib-compile-resources usr/lib/${DEB_HOST_MULTIARCH}/glib-2.0
Modified: desktop/unstable/glib2.0/debian/libglib2.0-0.lintian-overrides
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/libglib2.0-0.lintian-overrides?rev=52718&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/libglib2.0-0.lintian-overrides [utf-8] (original)
+++ desktop/unstable/glib2.0/debian/libglib2.0-0.lintian-overrides [utf-8] Sun Jul 30 11:08:54 2017
@@ -1,5 +1,5 @@
# It's a deliberate choice of bundling them together
libglib2.0-0: package-name-doesnt-match-sonames libgio-2.0-0 libglib-2.0-0 libgmodule-2.0-0 libgobject-2.0-0 libgthread-2.0-0
# These empty directories are deliberate.
-libglib2.0-0: package-contains-empty-directory usr/lib/x86_64-linux-gnu/gio/modules/
+libglib2.0-0: package-contains-empty-directory usr/lib/*/gio/modules/
libglib2.0-0: package-contains-empty-directory usr/share/glib-2.0/schemas/
Modified: desktop/unstable/glib2.0/debian/libglib2.0-0.symbols
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/libglib2.0-0.symbols?rev=52718&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/libglib2.0-0.symbols [utf-8] (original)
+++ desktop/unstable/glib2.0/debian/libglib2.0-0.symbols [utf-8] Sun Jul 30 11:08:54 2017
@@ -210,7 +210,7 @@
g_content_type_guess at Base 2.16.0
g_content_type_guess_for_tree at Base 2.18.0
g_content_type_is_a at Base 2.16.0
- g_content_type_is_mime_type at Base 2.52.3
+ g_content_type_is_mime_type at Base 2.51.5
g_content_type_is_unknown at Base 2.16.0
g_content_types_get_registered at Base 2.16.0
g_converter_convert at Base 2.24.0
@@ -1877,7 +1877,9 @@
g_unix_is_mount_path_system_internal at Base 2.16.0
g_unix_mount_at at Base 2.16.0
g_unix_mount_compare at Base 2.16.0
- g_unix_mount_for at Base 2.52.3
+ g_unix_mount_copy at Base 2.53.1
+ g_unix_mount_entry_get_type at Base 2.53.1
+ g_unix_mount_for at Base 2.51.0
g_unix_mount_free at Base 2.16.0
g_unix_mount_get_device_path at Base 2.16.0
g_unix_mount_get_fs_type at Base 2.16.0
@@ -1894,11 +1896,13 @@
g_unix_mount_monitor_new at Base 2.16.0
g_unix_mount_monitor_set_rate_limit at Base 2.18.0
g_unix_mount_point_compare at Base 2.16.0
+ g_unix_mount_point_copy at Base 2.53.1
g_unix_mount_point_free at Base 2.16.0
g_unix_mount_point_get_device_path at Base 2.16.0
g_unix_mount_point_get_fs_type at Base 2.16.0
g_unix_mount_point_get_mount_path at Base 2.16.0
g_unix_mount_point_get_options at Base 2.31.8
+ g_unix_mount_point_get_type at Base 2.53.1
g_unix_mount_point_guess_can_eject at Base 2.16.0
g_unix_mount_point_guess_icon at Base 2.16.0
g_unix_mount_point_guess_name at Base 2.16.0
@@ -1998,6 +2002,8 @@
g_ascii_formatd at Base 2.12.0
g_ascii_strcasecmp at Base 2.12.0
g_ascii_strdown at Base 2.12.0
+ g_ascii_string_to_signed at Base 2.53.2
+ g_ascii_string_to_unsigned at Base 2.53.2
g_ascii_strncasecmp at Base 2.12.0
g_ascii_strtod at Base 2.12.0
g_ascii_strtoll at Base 2.12.0
@@ -2738,6 +2744,7 @@
g_node_traverse at Base 2.12.0
g_node_unlink at Base 2.12.0
g_nullify_pointer at Base 2.12.0
+ g_number_parser_error_quark at Base 2.53.2
g_on_error_query at Base 2.12.0
g_on_error_stack_trace at Base 2.12.0
g_once_impl at Base 2.12.0
@@ -2803,6 +2810,8 @@
g_propagate_error at Base 2.12.0
g_propagate_prefixed_error at Base 2.16.0
g_ptr_array_add at Base 2.12.0
+ g_ptr_array_find at Base 2.53.2
+ g_ptr_array_find_with_equal_func at Base 2.53.2
g_ptr_array_foreach at Base 2.12.0
g_ptr_array_free at Base 2.12.0
g_ptr_array_insert at Base 2.39.4
@@ -3405,7 +3414,7 @@
g_utf8_find_prev_char at Base 2.12.0
g_utf8_get_char at Base 2.12.0
g_utf8_get_char_validated at Base 2.12.0
- g_utf8_make_valid at Base 2.52.3
+ g_utf8_make_valid at Base 2.51.0
g_utf8_normalize at Base 2.12.0
g_utf8_offset_to_pointer at Base 2.12.0
g_utf8_pointer_to_offset at Base 2.12.0
@@ -3424,8 +3433,8 @@
g_utf8_to_utf16 at Base 2.12.0
g_utf8_validate at Base 2.12.0
g_utime at Base 2.18.0
- g_uuid_string_is_valid at Base 2.52.3
- g_uuid_string_random at Base 2.52.3
+ g_uuid_string_is_valid at Base 2.51.2
+ g_uuid_string_random at Base 2.51.2
g_variant_builder_add at Base 2.24.0
g_variant_builder_add_parsed at Base 2.26.0
g_variant_builder_add_value at Base 2.24.0
@@ -3715,12 +3724,14 @@
g_enum_get_value_by_name at Base 2.12.0
g_enum_get_value_by_nick at Base 2.12.0
g_enum_register_static at Base 2.12.0
+ g_enum_to_string at Base 2.53.1
g_error_get_type at Base 2.26.0
g_flags_complete_type_info at Base 2.12.0
g_flags_get_first_value at Base 2.12.0
g_flags_get_value_by_name at Base 2.12.0
g_flags_get_value_by_nick at Base 2.12.0
g_flags_register_static at Base 2.12.0
+ g_flags_to_string at Base 2.53.1
g_gstring_get_type at Base 2.12.0
g_gtype_get_type at Base 2.12.0
g_hash_table_get_type at Base 2.12.0
@@ -3756,6 +3767,7 @@
g_object_get_qdata at Base 2.12.0
g_object_get_type at Base 2.18.0
g_object_get_valist at Base 2.12.0
+ g_object_getv at Base 2.53.1
g_object_interface_find_property at Base 2.12.0
g_object_interface_install_property at Base 2.12.0
g_object_interface_list_properties at Base 2.12.0
@@ -3763,6 +3775,7 @@
g_object_new at Base 2.12.0
g_object_new_valist at Base 2.12.0
g_object_newv at Base 2.12.0
+ g_object_new_with_properties at Base 2.53.1
g_object_notify at Base 2.12.0
g_object_notify_by_pspec at Base 2.26.0
g_object_ref at Base 2.12.0
@@ -3779,6 +3792,7 @@
g_object_set_qdata at Base 2.12.0
g_object_set_qdata_full at Base 2.12.0
g_object_set_valist at Base 2.12.0
+ g_object_setv at Base 2.53.1
g_object_steal_data at Base 2.12.0
g_object_steal_qdata at Base 2.12.0
g_object_thaw_notify at Base 2.12.0
Modified: desktop/unstable/glib2.0/debian/libglib2.0-bin.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/libglib2.0-bin.install?rev=52718&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/libglib2.0-bin.install [utf-8] (original)
+++ desktop/unstable/glib2.0/debian/libglib2.0-bin.install [utf-8] Sun Jul 30 11:08:54 2017
@@ -4,6 +4,7 @@
usr/bin/gresource
usr/bin/gsettings
usr/share/bash-completion
+usr/share/man/man1/gapplication.1*
usr/share/man/man1/gio-querymodules.1*
usr/share/man/man1/gio.1*
usr/share/man/man1/glib-compile-resources.1*
Modified: desktop/unstable/glib2.0/debian/libglib2.0-dev.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/libglib2.0-dev.install?rev=52718&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/libglib2.0-dev.install [utf-8] (original)
+++ desktop/unstable/glib2.0/debian/libglib2.0-dev.install [utf-8] Sun Jul 30 11:08:54 2017
@@ -6,21 +6,8 @@
usr/lib/*/libgio*.so
usr/lib/*/glib-2.0
usr/lib/*/pkgconfig
-usr/share/aclocal
-usr/share/glib-2.0/codegen/*.py
-usr/share/glib-2.0/gettext
+usr/share/gdb
+usr/share/gettext/its
+usr/share/glib-2.0/gdb
usr/share/glib-2.0/schemas
-usr/share/man/man1/glib-genmarshal.1*
-usr/share/man/man1/glib-mkenums.1*
-usr/share/man/man1/gobject-query.1*
-usr/share/man/man1/glib-gettextize.1*
-usr/share/man/man1/gtester.1*
-usr/share/man/man1/gtester-report.1*
-usr/share/man/man1/gdbus-codegen.1*
-usr/bin/glib-genmarshal
-usr/bin/gobject-query
-usr/bin/glib-mkenums
-usr/bin/gtester-report
-usr/bin/glib-gettextize
-usr/bin/gtester
-usr/bin/gdbus-codegen
+usr/share/glib-2.0/valgrind
Modified: desktop/unstable/glib2.0/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/rules?rev=52718&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/rules [utf-8] (original)
+++ desktop/unstable/glib2.0/debian/rules [utf-8] Sun Jul 30 11:08:54 2017
@@ -1,59 +1,62 @@
#!/usr/bin/make -f
-DEB_BUILDDIR = debian/build
-DEB_MAKE_FLAVORS = deb udeb
-DISABLE_UPDATE_UPLOADERS := 1
-
-include /usr/share/cdbs/1/rules/autoreconf.mk
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/utils.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-get-source.mk
GNOME_MODULE := glib
+binaries := $(shell dh_listpackages)
-# Enable parallel build support
-DEB_BUILD_PARALLEL = 1
+export DEB_BUILD_MAINT_OPTIONS=hardening=+bindnow
# Ensure the build aborts when there are still references to undefined symbols
-LDFLAGS += -Wl,-z,defs
+DEB_LDFLAGS_MAINT_APPEND += -Wl,-z,defs
# NB: do NOT use -Wl,--as-needed to build glib; for instance the link to
# pthread is carefully crafted to allow dlopen()ing pthread-using libs; see
# http://mid.gmane.org/1257999019.21780.15.camel@marzipan
-LDFLAGS += -Wl,--no-as-needed
+DEB_LDFLAGS_MAINT_APPEND += -Wl,--no-as-needed
# Make the linker work a bit harder so dynamic loading can be done faster
-LDFLAGS += -Wl,-O1
+DEB_LDFLAGS_MAINT_APPEND += -Wl,-O1
-APIVER := 2.0
-SONAME := 0
+include /usr/share/dpkg/default.mk
-# package names
-SHARED_PKG := libglib$(APIVER)-$(SONAME)
-DATA_PKG := libglib$(APIVER)-data
-TEST_PKG := libglib$(APIVER)-tests
-DEV_PKG := libglib$(APIVER)-dev
-BIN_PKG := libglib$(APIVER)-bin
-UDEB_PKG := libglib$(APIVER)-udeb
-DOC_PKG := libglib$(APIVER)-doc
-DEBUG_PKG := $(SHARED_PKG)-dbg
+%:
+ dh $@ --with gnome,python3
-DEB_MAKE_DESTDIRSKEL = $(CURDIR)/debian/install/@FLAVOR@
+override_dh_auto_configure:
+ dh_auto_configure \
+ --builddirectory=debian/build/deb \
+ -- \
+ $(DEB_CONFIGURE_EXTRA_FLAGS) \
+ $(DEB_CONFIGURE_FLAGS_deb) \
+ $(NULL)
+ifneq ($(filter %-udeb,$(binaries)),)
+ dh_auto_configure \
+ --builddirectory=debian/build/udeb \
+ -- \
+ $(DEB_CONFIGURE_EXTRA_FLAGS) \
+ $(DEB_CONFIGURE_FLAGS_udeb) \
+ $(NULL)
+endif
-DEB_CLEAN_EXCLUDE = org.gtk.test.gschema.xml.orig
+override_dh_clean:
+ rm -rf $(CURDIR)/debian/build \
+ $(CURDIR)/debian/install \
+ $(CURDIR)/debian/tmp-xdg-runtime-dir
+ dh_clean -Xorg.gtk.test.gschema.xml.orig
-DEB_DH_INSTALL_ARGS += --sourcedir=debian/install/deb
-DEB_DH_INSTALL_ARGS_$(TEST_PKG) += --sourcedir=debian/install/deb -X.la
-DEB_DH_INSTALL_ARGS_$(UDEB_PKG) += --sourcedir=debian/install/udeb
+override_dh_makeshlibs:
+ dh_makeshlibs -plibglib2.0-tests -n
+ dh_makeshlibs --remaining-packages -V --add-udeb=libglib2.0-udeb -- -c4
-DEB_DH_MAKESHLIBS_ARGS_$(SHARED_PKG) += -V --add-udeb=$(UDEB_PKG) -- -c4
-# Don't put the symbols in the -dbg package
-DEB_DH_STRIP_ARGS_$(UDEB_PKG) =
+override_dh_strip:
+ dh_strip --dbgsym-migration='libglib2.0-0-dbg (<< 2.51.4-1~)'
+# (Ubuntu-specific)
# Don't strip translations from the installed tests; makes them environment dependent.
-DEB_DH_TRANSLATIONS_ARGS = -Xinstalled-tests
+override_dh_translations:
+ dh_translations -Xinstalled-tests
# Do not clutter $HOME with ~/.dbus-keyrings and avoid failure on the buildds
# where creating /home/buildd/.dbus-keyrings fails
@@ -75,9 +78,11 @@
export DBUS_SESSION_BUS_ADDRESS=this-should-not-be-used-and-will-fail:
ifeq ($(DEB_HOST_ARCH_OS), linux)
- DEB_MAKE_CHECK_TARGET = $(if $(filter deb, $(cdbs_make_curflavor)), -k check -j1)
+override_dh_auto_test:
+ dh_auto_test -- --builddirectory=debian/build/deb -k check -j1
else
- DEB_MAKE_CHECK_TARGET = $(if $(filter deb, $(cdbs_make_curflavor)), -k check -j1 || true)
+override_dh_auto_test:
+ dh_auto_test -- --builddirectory=debian/build/deb -k check -j1 || true
endif
# The tests assume this directory exists and is writable
@@ -88,8 +93,8 @@
# configure flags
DEB_CONFIGURE_EXTRA_FLAGS := \
- --with-html-dir=\$${prefix}/share/doc/$(DOC_PKG) \
- --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
+ --with-html-dir=\$${prefix}/share/doc/libglib2.0-doc \
+ --libexecdir=\$${prefix}/lib/glib2.0 \
--with-python=/usr/bin/python3 \
--with-pcre=system
@@ -120,41 +125,53 @@
--disable-selinux \
--disable-libmount
-pre-build::
- mkdir -p debian/stamp-makefile-check \
- debian/tmp-xdg-runtime-dir
+override_dh_auto_build:
+ mkdir -p debian/tmp-xdg-runtime-dir
+ dh_auto_build --builddirectory=debian/build/deb
+ifneq ($(filter %-udeb,$(binaries)),)
+ dh_auto_build --builddirectory=debian/build/udeb
+endif
-binary-install/libglib2.0-0::
+override_dh_auto_install:
set -e; for script in postinst postrm triggers; do \
sed -e"s/#MULTIARCH#/$(DEB_HOST_MULTIARCH)/g" \
-e"s/#ARCH#/$(DEB_HOST_ARCH)/g" \
- debian/$(cdbs_curpkg).$$script.in \
- > debian/$(cdbs_curpkg).$$script ; \
+ debian/libglib2.0-0.$$script.in \
+ > debian/libglib2.0-0.$$script ; \
done
+ dh_auto_install -plibglib2.0-tests --sourcedir=debian/build/deb -X.la
+ifneq ($(filter %-udeb,$(binaries)),)
+ dh_auto_install -plibglib2.0-udeb --builddirectory=debian/build/udeb --destdir=debian/install/udeb
+endif
+ dh_auto_install --remaining-packages --builddirectory=debian/build/deb --destdir=debian/install/deb
-binary-install/libglib2.0-dev::
- dh_python3 -plibglib2.0-dev /usr/share/glib-2.0/codegen
+override_dh_python3:
+ dh_python3 -plibglib2.0-dev-bin /usr/share/glib-2.0/codegen
-clean::
- sed \
- -e "s#@SONAME@#$(SONAME)#g" \
- -e "s#@APIVER@#$(APIVER)#g" \
- -e "s#@VERSION@#$(DEB_UPSTREAM_VERSION)#g" \
- -e "s#@SHARED_PKG@#$(SHARED_PKG)#g" \
- -e "s#@BIN_PKG@#$(BIN_PKG)#g" \
- -e "s#@DATA_PKG@#$(DATA_PKG)#g" \
- -e "s#@DEV_PKG@#$(DEV_PKG)#g" \
- -e "s#@UDEB_PKG@#$(UDEB_PKG)#g" \
- -e "s#@DOC_PKG@#$(DOC_PKG)#g" \
- -e "s#@DEBUG_PKG@#$(DEBUG_PKG)#g" \
- -e "s#@GNOME_TEAM@#$(UPLOADERS)#g" \
- debian/control.in > debian/control
- rm -rf $(CURDIR)/debian/build \
- $(CURDIR)/debian/install \
- $(CURDIR)/debian/stamp-makefile-check \
- $(CURDIR)/debian/tmp-xdg-runtime-dir
-
-list-missing:
- # FIXME: remove this when CDBS' list-missing works with multiple flavors
- perl -w debian/dh_listmissing.pl $(foreach f,$(DEB_MAKE_FLAVORS),debian/install/$(f)) 2>&1 | \
- egrep -v '(\.la|\.pyc|\.pyo) has been installed' >&2
+override_dh_install:
+ # Unwanted bits from the .deb build
+ rm -f debian/install/deb/lib/*/*.la
+ rm -f debian/install/deb/usr/lib/*/*.la
+ rm -f debian/install/deb/usr/lib/glib2.0/installed-tests/glib/*.la
+ rm -f debian/install/deb/usr/lib/glib2.0/installed-tests/glib/modules/*.la
+ rm -fr debian/install/deb/usr/share/glib-2.0/codegen/__pycache__
+ # Re-created by .links to point into /lib
+ rm -f debian/install/deb/usr/lib/*/libglib-2.0.so
+ifneq ($(filter %-udeb,$(binaries)),)
+ # Unwanted bits from the .udeb build
+ rm -f debian/install/udeb/lib/*/*.la
+ rm -f debian/install/udeb/usr/lib/*/*.la
+ rm -f debian/install/udeb/usr/lib/*/*.so
+ rm -fr debian/install/udeb/usr/share/gdb
+ rm -fr debian/install/udeb/usr/share/gettext/its
+ rm -fr debian/install/udeb/usr/share/glib-2.0/codegen
+ rm -fr debian/install/udeb/usr/share/glib-2.0/gdb
+ rm -fr debian/install/udeb/usr/share/glib-2.0/valgrind
+ rm -fr debian/install/udeb/usr/share/man
+ dh_install -plibglib2.0-udeb --sourcedir=debian/install/udeb --list-missing
+endif
+ # Put the gdb script in .../gdb/auto-load/lib, as we install libglib*.so in there
+ mkdir -p debian/install/deb/usr/share/gdb/auto-load/lib/${DEB_HOST_MULTIARCH}/
+ mv debian/install/deb/usr/share/gdb/auto-load/usr/lib/${DEB_HOST_MULTIARCH}/libglib*so*py \
+ debian/install/deb/usr/share/gdb/auto-load/lib/${DEB_HOST_MULTIARCH}/
+ dh_install --remaining-packages --sourcedir=debian/install/deb --list-missing
Modified: desktop/unstable/glib2.0/debian/watch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/watch?rev=52718&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/watch [utf-8] (original)
+++ desktop/unstable/glib2.0/debian/watch [utf-8] Sun Jul 30 11:08:54 2017
@@ -1,3 +1,3 @@
version=4
-https://download.gnome.org/sources/glib/([\d\.]+[02468])/ \
+https://download.gnome.org/sources/glib/([\d\.]+)/ \
glib at ANY_VERSION@\.tar\.xz
More information about the pkg-gnome-commits
mailing list