r52799 - in /desktop/unstable/glib2.0/debian: changelog control control.in patches/03_disble_glib_compile_schemas_warning.patch patches/git_glib-mkenums-flags.patch patches/git_glib-mkenums-utf8.patch patches/series rules

laney at users.alioth.debian.org laney at users.alioth.debian.org
Thu Aug 10 22:58:29 UTC 2017 

Author: laney
Date: Thu Aug 10 22:58:28 2017
New Revision: 52799

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=52799
Log:
New upstream release

Removed:
    desktop/unstable/glib2.0/debian/patches/git_glib-mkenums-flags.patch
    desktop/unstable/glib2.0/debian/patches/git_glib-mkenums-utf8.patch
Modified:
    desktop/unstable/glib2.0/debian/changelog
    desktop/unstable/glib2.0/debian/control
    desktop/unstable/glib2.0/debian/control.in
    desktop/unstable/glib2.0/debian/patches/03_disble_glib_compile_schemas_warning.patch
    desktop/unstable/glib2.0/debian/patches/series
    desktop/unstable/glib2.0/debian/rules

Modified: desktop/unstable/glib2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/changelog?rev=52799&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/changelog	[utf-8] (original)
+++ desktop/unstable/glib2.0/debian/changelog	[utf-8] Thu Aug 10 22:58:28 2017
@@ -1,3 +1,16 @@
+glib2.0 (2.53.5-1) UNRELEASED; urgency=medium
+
+  * New upstream release.
+  * git_glib-mkenums-utf8.patch, git_glib-mkenums-flags.patch: Drop, now
+    applied upstream.
+  * debian/rules: Don't pass -X.la to dh_auto_install - it can easily lead to
+    unwanted removals (not claiming this is happening here)
+  * debian/rules: Fix arguments to dh_auto_test so tests are run again
+  * debian/rules, debian/control{,.in}: Use dh_missing and not dh_install
+    --list-missing. Also upgrade this check to --fail-missing.
+
+ -- Iain Lane <laney at debian.org>  Thu, 10 Aug 2017 16:44:13 +0100
+
 glib2.0 (2.53.4-3) unstable; urgency=medium
 
   [ Matthias Klumpp ]

Modified: desktop/unstable/glib2.0/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/control?rev=52799&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/control	[utf-8] (original)
+++ desktop/unstable/glib2.0/debian/control	[utf-8] Thu Aug 10 22:58:28 2017
@@ -7,7 +7,7 @@
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
 Uploaders: Iain Lane <laney at debian.org>, Matthias Klumpp <mak at debian.org>
-Build-Depends: debhelper (>= 10~),
+Build-Depends: debhelper (>= 10.3~),
                dh-exec,
                dh-python,
                pkg-config (>= 0.16.0),

Modified: desktop/unstable/glib2.0/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/control.in?rev=52799&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/control.in	[utf-8] (original)
+++ desktop/unstable/glib2.0/debian/control.in	[utf-8] Thu Aug 10 22:58:28 2017
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
 Uploaders: @GNOME_TEAM@
-Build-Depends: debhelper (>= 10~),
+Build-Depends: debhelper (>= 10.3~),
                dh-exec,
                dh-python,
                pkg-config (>= 0.16.0),

Modified: desktop/unstable/glib2.0/debian/patches/03_disble_glib_compile_schemas_warning.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/patches/03_disble_glib_compile_schemas_warning.patch?rev=52799&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/patches/03_disble_glib_compile_schemas_warning.patch	[utf-8] (original)
+++ desktop/unstable/glib2.0/debian/patches/03_disble_glib_compile_schemas_warning.patch	[utf-8] Thu Aug 10 22:58:28 2017
@@ -6,19 +6,21 @@
 ===================================================================
 --- a/gio/glib-compile-schemas.c
 +++ b/gio/glib-compile-schemas.c
-@@ -1216,11 +1216,13 @@
+@@ -1219,6 +1219,9 @@
        return;
      }
  
--  if (path && (g_str_has_prefix (path, "/apps/") ||
-+// Disable this warning: it confuses users and there is unlikely to be much
-+// progress towards fixing
-+/*  if (path && (g_str_has_prefix (path, "/apps/") ||
++  // Disable this warning: it confuses users and there is unlikely to be much
++  // progress towards fixing
++  /*
+   if (path && (g_str_has_prefix (path, "/apps/") ||
                 g_str_has_prefix (path, "/desktop/") ||
                 g_str_has_prefix (path, "/system/")))
-     g_printerr ("warning: Schema '%s' has path '%s'.  Paths starting with "
--                "'/apps/', '/desktop/' or '/system/' are deprecated.\n", id, path);
-+                "'/apps/', '/desktop/' or '/system/' are deprecated.\n", id, path);*/
+@@ -1231,6 +1234,7 @@
+       g_printerr ("%s\n", message);
+       g_free (message);
+     }
++    */
  
    state->schema_state = schema_state_new (path, gettext_domain,
                                            extends, extends_name, list_of);

Modified: desktop/unstable/glib2.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/patches/series?rev=52799&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/patches/series	[utf-8] (original)
+++ desktop/unstable/glib2.0/debian/patches/series	[utf-8] Thu Aug 10 22:58:28 2017
@@ -11,5 +11,3 @@
 0001-timer-test-use-volatile-for-locals.patch
 skip-broken-timer-test.patch
 0001-Fix-trashing-on-overlayfs.patch
-git_glib-mkenums-utf8.patch
-git_glib-mkenums-flags.patch

Modified: desktop/unstable/glib2.0/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/rules?rev=52799&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/rules	[utf-8] (original)
+++ desktop/unstable/glib2.0/debian/rules	[utf-8] Thu Aug 10 22:58:28 2017
@@ -79,10 +79,11 @@
 
 ifeq ($(DEB_HOST_ARCH_OS), linux)
 override_dh_auto_test:
-	dh_auto_test -- --builddirectory=debian/build/deb -k check -j1
+	dh_auto_test --builddirectory=debian/build/deb -- -k check -j1
+	false
 else
 override_dh_auto_test:
-	dh_auto_test -- --builddirectory=debian/build/deb -k check -j1 || true
+	dh_auto_test --builddirectory=debian/build/deb -- -k check -j1 || true
 endif
 
 # The tests assume this directory exists and is writable
@@ -139,7 +140,7 @@
 		    debian/libglib2.0-0.$$script.in \
 		    > debian/libglib2.0-0.$$script ; \
 	done
-	dh_auto_install -plibglib2.0-tests --sourcedir=debian/build/deb -X.la
+	dh_auto_install -plibglib2.0-tests --sourcedir=debian/build/deb
 ifneq ($(filter %-udeb,$(binaries)),)
 	dh_auto_install -plibglib2.0-udeb --builddirectory=debian/build/udeb --destdir=debian/install/udeb
 endif
@@ -168,10 +169,14 @@
 	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
+	dh_install -plibglib2.0-udeb --sourcedir=debian/install/udeb
 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
+	dh_install --remaining-packages --sourcedir=debian/install/deb
+
+override_dh_missing:
+	dh_missing --sourcedir=debian/install/udeb --fail-missing
+	dh_missing --sourcedir=debian/install/deb --fail-missing

More information about the pkg-gnome-commits mailing list