r27550 - in /desktop/experimental/glib2.0: ./ debian/ debian/patches/
hertzog at users.alioth.debian.org
hertzog at users.alioth.debian.org
Thu Apr 14 09:36:36 UTC 2011
Author: hertzog
Date: Thu Apr 14 09:36:29 2011
New Revision: 27550
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=27550
Log:
* Drop 20_mime_extension_point.patch and add Breaks against gvfs
and gnome-control-center to ensure they have been updated at the
same time.
* Drop Conflicts against pango, it's no longer relevant (even for
oldstable).
* Fix watch file.
* Drop leading article in descriptions as recommended by lintian.
* Add lintian overrides for package-name-doesnt-match-sonames, it's a
deliberate choice.
* Add some copyright holders to debian/copyright to appease lintian.
* Drop unneeded section/priority fields as they duplicate the default
values.
* Add some DEP-3 descriptions to patches that had no description at
all.
Added:
desktop/experimental/glib2.0/debian/libglib2.0-0.lintian-overrides
desktop/experimental/glib2.0/debian/libglib2.0-udeb.lintian-overrides
Removed:
desktop/experimental/glib2.0/debian/patches/20_mime_extension_point.patch
Modified:
desktop/experimental/glib2.0/ (props changed)
desktop/experimental/glib2.0/debian/changelog
desktop/experimental/glib2.0/debian/control
desktop/experimental/glib2.0/debian/control.in
desktop/experimental/glib2.0/debian/copyright
desktop/experimental/glib2.0/debian/patches/03_blacklist-directories.patch
desktop/experimental/glib2.0/debian/patches/04_homedir_env.patch
desktop/experimental/glib2.0/debian/patches/60_wait-longer-for-threads-to-die.patch
desktop/experimental/glib2.0/debian/patches/61_glib-compile-schemas-path.patch
desktop/experimental/glib2.0/debian/patches/series
desktop/experimental/glib2.0/debian/watch
Propchange: desktop/experimental/glib2.0/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Apr 14 09:36:29 2011
@@ -1,1 +1,1 @@
-/desktop/unstable/glib2.0:24636
+/desktop/unstable/glib2.0:24636,27515-27547
Modified: desktop/experimental/glib2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/changelog?rev=27550&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/changelog [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/changelog [utf-8] Thu Apr 14 09:36:29 2011
@@ -1,3 +1,29 @@
+glib2.0 (2.28.6-2) experimental; urgency=low
+
+ * Team upload.
+ * Drop 20_mime_extension_point.patch and add Breaks against gvfs
+ and gnome-control-center to ensure they have been updated at the
+ same time.
+ * Drop Conflicts against pango, it's no longer relevant (even for
+ oldstable).
+ * Fix watch file.
+ * Drop leading article in descriptions as recommended by lintian.
+ * Add lintian overrides for package-name-doesnt-match-sonames, it's a
+ deliberate choice.
+ * Add some copyright holders to debian/copyright to appease lintian.
+ * Drop unneeded section/priority fields as they duplicate the default
+ values.
+ * Add some DEP-3 descriptions to patches that had no description at
+ all.
+
+ -- Raphaël Hertzog <hertzog at debian.org> Thu, 14 Apr 2011 10:51:16 +0200
+
+glib2.0 (2.28.6-1) unstable; urgency=low
+
+ * New upstream bugfix release.
+
+ -- Sebastian Dröge <slomo at debian.org> Thu, 14 Apr 2011 09:18:31 +0200
+
glib2.0 (2.28.4-1) unstable; urgency=low
* debian/control.in:
Modified: desktop/experimental/glib2.0/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/control?rev=27550&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/control [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/control [utf-8] Thu Apr 14 09:36:29 2011
@@ -2,7 +2,7 @@
Section: libs
Priority: optional
Maintainer: Loic Minier <lool at dooz.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>, Sjoerd Simons <sjoerd 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>, Sebastian Dröge <slomo at debian.org>, Sjoerd Simons <sjoerd at debian.org>
Build-Depends: debhelper (>> 5.0.22),
cdbs (>= 0.4.90),
dh-autoreconf,
@@ -35,7 +35,7 @@
${shlibs:Depends}
Recommends: libglib2.0-data,
shared-mime-info
-Conflicts: libpango1.0-0 (<< 1.11)
+Breaks: gvfs (<< 1.8), gnome-control-center (<< 1:3)
Replaces: libglib2.0-dev (<< 2.23.2-2)
Description: The GLib library of C routines
GLib is a library containing many useful C routines for things such
Modified: desktop/experimental/glib2.0/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/control.in?rev=27550&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/control.in [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/control.in [utf-8] Thu Apr 14 09:36:29 2011
@@ -29,15 +29,14 @@
Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/unstable/glib2.0/
Package: @SHARED_PKG@
-Section: libs
Architecture: any
Depends: ${misc:Depends},
${shlibs:Depends}
Recommends: @DATA_PKG@,
shared-mime-info
-Conflicts: libpango1.0-0 (<< 1.11)
+Breaks: gvfs (<< 1.8), gnome-control-center (<< 1:3)
Replaces: @DEV_PKG@ (<< 2.23.2-2)
-Description: The GLib library of C routines
+Description: GLib library of C routines
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.
@@ -47,11 +46,10 @@
Package: libglib at APIVER@-udeb
Section: debian-installer
XC-Package-Type: udeb
-Priority: optional
Architecture: any
Depends: ${misc:Depends},
${shlibs:Depends}
-Description: The GLib library of C routines - minimal runtime
+Description: GLib library of C routines - minimal runtime
This is a udeb, or a microdeb, for the debian-installer.
.
GLib is a library containing many useful C routines for things such
@@ -71,7 +69,7 @@
Conflicts: @SHARED_PKG@ (<< 2.25.11-2),
Replaces: @SHARED_PKG@ (<< 2.25.11-2),
@DEV_PKG@ (<< 2.25.11-2)
-Description: The programs for the GLib library
+Description: Programs 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.
@@ -107,7 +105,7 @@
@SHARED_PKG@ (= ${binary:Version})
Conflicts: libglib2.0-dbg
Replaces: libglib2.0-dbg
-Description: The GLib libraries and debugging symbols
+Description: Debugging symbols for the GLib libraries
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.
@@ -156,7 +154,7 @@
Depends: ${misc:Depends},
${shlibs:Depends},
@SHARED_PKG@ (= ${binary:Version})
-Description: The GLib library of C routines - refdbg library
+Description: GLib library of C routines - refdbg 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.
Modified: desktop/experimental/glib2.0/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/copyright?rev=27550&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/copyright [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/copyright [utf-8] Thu Apr 14 09:36:29 2011
@@ -31,6 +31,13 @@
Makoto Matsumoto <matumoto at math.keio.ac.jp>
Takuji Nishimura <nisimura at math.keio.ac.jp>
+Major copyright holders:
+
+ Copyright © 1995-2011 Red Hat, Inc.
+ Copyright © 2008-2010 Novell, Inc.
+ Copyright © 2008-2010 Codethink Limited.
+ Copyright © 2008-2010 Collabora, Ltd.
+
License:
This package is free software; you can redistribute it and/or
Added: desktop/experimental/glib2.0/debian/libglib2.0-0.lintian-overrides
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/libglib2.0-0.lintian-overrides?rev=27550&op=file
==============================================================================
--- desktop/experimental/glib2.0/debian/libglib2.0-0.lintian-overrides (added)
+++ desktop/experimental/glib2.0/debian/libglib2.0-0.lintian-overrides [utf-8] Thu Apr 14 09:36:29 2011
@@ -1,0 +1,2 @@
+# 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
Added: desktop/experimental/glib2.0/debian/libglib2.0-udeb.lintian-overrides
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/libglib2.0-udeb.lintian-overrides?rev=27550&op=file
==============================================================================
--- desktop/experimental/glib2.0/debian/libglib2.0-udeb.lintian-overrides (added)
+++ desktop/experimental/glib2.0/debian/libglib2.0-udeb.lintian-overrides [utf-8] Thu Apr 14 09:36:29 2011
@@ -1,0 +1,2 @@
+# It's a deliberate choice of bundling them together
+libglib2.0-udeb udeb: 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
Modified: desktop/experimental/glib2.0/debian/patches/03_blacklist-directories.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/03_blacklist-directories.patch?rev=27550&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/03_blacklist-directories.patch [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/patches/03_blacklist-directories.patch [utf-8] Thu Apr 14 09:36:29 2011
@@ -1,3 +1,10 @@
+Description: Blacklist more FHS directories that are commonly found as Unix mount points
+ It includes those that are necessary for live-initramfs.
+ .
+ Ported from GnomeVFS.
+Author: Josselin Mouette <joss at debian.org>
+Origin: vendor
+
Index: glib2.0-2.27.2/gio/gunixmounts.c
===================================================================
--- glib2.0-2.27.2.orig/gio/gunixmounts.c 2010-10-17 05:31:18.000000000 +0200
Modified: desktop/experimental/glib2.0/debian/patches/04_homedir_env.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/04_homedir_env.patch?rev=27550&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/04_homedir_env.patch [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/patches/04_homedir_env.patch [utf-8] Thu Apr 14 09:36:29 2011
@@ -1,3 +1,9 @@
+Description: Handle the G_HOME environment variable to override the passwd entry
+ This will allow to fix various kinds of build failures due to restricted
+ build environments.
+Author: Josselin Mouette <joss at debian.org>
+Origin: vendor
+
--- a/docs/reference/glib/running.sgml
+++ b/docs/reference/glib/running.sgml
@@ -213,6 +213,22 @@
Modified: desktop/experimental/glib2.0/debian/patches/60_wait-longer-for-threads-to-die.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/60_wait-longer-for-threads-to-die.patch?rev=27550&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/60_wait-longer-for-threads-to-die.patch [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/patches/60_wait-longer-for-threads-to-die.patch [utf-8] Thu Apr 14 09:36:29 2011
@@ -1,3 +1,10 @@
+Description: Wait 5s instead of one for threads to die in the threadpool test
+ Hopefully fixes hppa and kfreebsd testsuite failures.
+Bug-Debian: http://bugs.debian.org/428674
+Bug-Debian: http://bugs.debian.org/431720
+Author: Loic Minier <lool at dooz.org>
+Origin: vendor
+
Index: glib2.0-2.27.2/tests/threadpool-test.c
===================================================================
--- glib2.0-2.27.2.orig/tests/threadpool-test.c 2009-04-01 01:04:21.000000000 +0200
Modified: desktop/experimental/glib2.0/debian/patches/61_glib-compile-schemas-path.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/61_glib-compile-schemas-path.patch?rev=27550&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/61_glib-compile-schemas-path.patch [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/patches/61_glib-compile-schemas-path.patch [utf-8] Thu Apr 14 09:36:29 2011
@@ -1,3 +1,9 @@
+Description: Adjust path to glib-compile-schemas in the pkg-config file
+ This is because gio-querymodules and glib-compile-schemas have been put
+ in a private, versioned directory in libglib2.0-0 to avoid a dependency loop.
+Author: Sebastian Dröge <slomo at debian.org>
+Origin: vendor
+
--- a/gio-2.0.pc.in
+++ b/gio-2.0.pc.in
@@ -4,7 +4,7 @@
Modified: desktop/experimental/glib2.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/series?rev=27550&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/series [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/patches/series [utf-8] Thu Apr 14 09:36:29 2011
@@ -3,6 +3,5 @@
02_gettext-desktopfiles-ubuntu.patch
03_blacklist-directories.patch
04_homedir_env.patch
-20_mime_extension_point.patch
60_wait-longer-for-threads-to-die.patch
61_glib-compile-schemas-path.patch
Modified: desktop/experimental/glib2.0/debian/watch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/watch?rev=27550&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/watch [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/watch [utf-8] Thu Apr 14 09:36:29 2011
@@ -1,4 +1,4 @@
version=2
-http://download.gnome.org/sources/glib/([\d\.]+)[02468]/ \
+http://download.gnome.org/sources/glib/([\d\.]+[02468])/ \
glib-(.*)\.tar\.gz \
debian uupdate
More information about the pkg-gnome-commits
mailing list