--- glib2.0-2.14.4.orig/debian/patches/60_wait-longer-for-threads-to-die.patch +++ glib2.0-2.14.4/debian/patches/60_wait-longer-for-threads-to-die.patch @@ -0,0 +1,28 @@ +Index: glib2.0-2.13.7/tests/threadpool-test.c +=================================================================== +--- glib2.0-2.13.7.orig/tests/threadpool-test.c 2007-07-12 21:33:49.000000000 +0200 ++++ glib2.0-2.13.7/tests/threadpool-test.c 2007-07-12 21:33:30.000000000 +0200 +@@ -5,8 +5,8 @@ + + #include + +-#define DEBUG_MSG(x) +-/* #define DEBUG_MSG(args) g_printerr args ; g_printerr ("\n"); */ ++/* #define DEBUG_MSG(x) */ ++#define DEBUG_MSG(args) g_printerr args ; g_printerr ("\n"); + + #define WAIT 5 /* seconds */ + #define MAX_THREADS 10 +@@ -124,10 +124,10 @@ + DEBUG_MSG (("[unused] stopping unused threads")); + g_thread_pool_stop_unused_threads (); + +- DEBUG_MSG (("[unused] waiting ONE second for threads to die")); ++ DEBUG_MSG (("[unused] waiting FIVE second for threads to die")); + + /* Some time for threads to die. */ +- g_usleep (G_USEC_PER_SEC); ++ g_usleep (5 * G_USEC_PER_SEC); + + DEBUG_MSG (("[unused] stopped idle threads, %d remain, %d threads still exist", + g_thread_pool_get_num_unused_threads (), --- glib2.0-2.14.4.orig/debian/patches/01_gettext-desktopfiles.patch +++ glib2.0-2.14.4/debian/patches/01_gettext-desktopfiles.patch @@ -0,0 +1,97 @@ +diff -Nur glib-2.10.2/glib/gkeyfile.c glib-2.10.2.new/glib/gkeyfile.c +--- glib-2.10.2/glib/gkeyfile.c 2006-01-18 04:51:28.000000000 +0100 ++++ glib-2.10.2.new/glib/gkeyfile.c 2006-05-22 17:46:12.000000000 +0200 +@@ -21,6 +21,9 @@ + * Boston, MA 02111-1307, USA. + */ + ++#define X_GETTEXT_DOMAIN "X-Ubuntu-Gettext-Domain" ++#define X_DESKTOP_ENTRY "Desktop Entry" ++ + #include "config.h" + + #include "gkeyfile.h" +@@ -80,6 +83,7 @@ + gchar list_separator; + + GKeyFileFlags flags; ++ char *gettext_domain; + }; + + typedef struct _GKeyFileKeyValuePair GKeyFileKeyValuePair; +@@ -203,6 +207,7 @@ + key_file->approximate_size = 0; + key_file->list_separator = ';'; + key_file->flags = 0; ++ key_file->gettext_domain = NULL; + } + + static void +@@ -212,6 +217,7 @@ + + if (key_file->parse_buffer) + g_string_free (key_file->parse_buffer, TRUE); ++ g_free(key_file->gettext_domain); + + tmp = key_file->groups; + while (tmp != NULL) +@@ -429,6 +435,8 @@ + return FALSE; + } + ++ key_file->gettext_domain = g_key_file_get_string (key_file, X_DESKTOP_ENTRY, X_GETTEXT_DOMAIN, NULL); ++ + return TRUE; + } + +@@ -533,6 +541,8 @@ + g_propagate_error (error, key_file_error); + return FALSE; + } ++ ++ key_file->gettext_domain = g_key_file_get_string (key_file, X_DESKTOP_ENTRY, X_GETTEXT_DOMAIN, NULL); + + return TRUE; + } +@@ -1581,6 +1591,32 @@ + languages = (gchar **) g_get_language_names (); + free_languages = FALSE; + } ++ ++ if (key_file->gettext_domain) ++ { ++ char *orig_value = g_key_file_get_string (key_file, group_name, key, NULL); ++ if (orig_value) ++ { ++ gboolean has_gettext; ++ ++ /* fprintf (stderr, "Resolved: '%s'='%s'\n", key, orig_value); */ ++ translated_value = dgettext (key_file->gettext_domain, orig_value); ++ has_gettext = translated_value != orig_value; ++ g_free (orig_value); ++ ++ if (has_gettext) ++ { ++ if (bind_textdomain_codeset (key_file->gettext_domain, NULL)) ++ translated_value = g_strdup (translated_value); ++ else ++ translated_value = g_locale_to_utf8 (translated_value, -1, NULL, NULL, NULL); ++ /* fprintf (stderr, "Translated: '%s' -(via %s)- '%s'\n", orig_value, key_file->gettext_domain, translated_value); */ ++ goto done; ++ } ++ else ++ translated_value = NULL; ++ } ++ } + + for (i = 0; languages[i]; i++) + { +@@ -1609,6 +1645,8 @@ + g_propagate_error (error, key_file_error); + } + ++done: ++ + if (free_languages) + g_strfreev (languages); + --- glib2.0-2.14.4.orig/debian/patches/series +++ glib2.0-2.14.4/debian/patches/series @@ -0,0 +1,3 @@ +01_gettext-desktopfiles.patch +60_wait-longer-for-threads-to-die.patch +67_gcc43-inline.patch --- glib2.0-2.14.4.orig/debian/patches/67_gcc43-inline.patch +++ glib2.0-2.14.4/debian/patches/67_gcc43-inline.patch @@ -0,0 +1,25 @@ +GNOME #315437; Debian #416863; Gentoo #156475; fixes building of packages +using glib against GCC 4.2 and 4.3 + +Index: glib2.0-2.13.4/glib/gutils.h +=================================================================== +--- glib2.0-2.13.4.orig/glib/gutils.h 2007-06-16 18:27:37.000000000 +0200 ++++ glib2.0-2.13.4/glib/gutils.h 2007-06-16 18:30:08.000000000 +0200 +@@ -96,9 +96,14 @@ + #ifdef G_IMPLEMENT_INLINES + # define G_INLINE_FUNC + # undef G_CAN_INLINE +-#elif defined (__GNUC__) +-# define G_INLINE_FUNC extern inline +-#elif defined (G_CAN_INLINE) ++#elif defined (__GNUC__) ++# if __GNUC_PREREQ (4,2) && defined (__STDC_VERSION__) \ ++ && __STDC_VERSION__ >= 199901L ++# define G_INLINE_FUNC extern __inline __attribute__ ((__gnu_inline__)) ++# else ++# define G_INLINE_FUNC extern __inline ++# endif ++#elif defined (G_CAN_INLINE) + # define G_INLINE_FUNC static inline + #else /* can't inline */ + # define G_INLINE_FUNC --- glib2.0-2.14.4.orig/debian/libglib2.0-doc.doc-base.gobject +++ glib2.0-2.14.4/debian/libglib2.0-doc.doc-base.gobject @@ -0,0 +1,15 @@ +Document: gobject +Title: GObject (GLib) Reference Manual +Author: Damon Chaplin et al. +Abstract: Most modern programming languages come with their own native object + systems and additional fundamental algorithmic language constructs. + Just as GLib serves as an implementation of such fundamental + types and algorithms (linked lists, hash tables and so forth), the + GLib Object System provides the required implementations of a + flexible extensible and intentionally easy to map (into other + languages) object oriented framework for C. +Section: Apps/Programming + +Format: HTML +Index: /usr/share/doc/libglib2.0-doc/gobject/index.html +Files: /usr/share/doc/libglib2.0-doc/gobject/*.html --- glib2.0-2.14.4.orig/debian/libglib2.0-data.install +++ glib2.0-2.14.4/debian/libglib2.0-data.install @@ -0,0 +1 @@ +debian/install/deb/usr/share/locale usr/share --- glib2.0-2.14.4.orig/debian/docs +++ glib2.0-2.14.4/debian/docs @@ -0,0 +1,6 @@ +NEWS +NEWS.pre-1-3 +README +ChangeLog.pre-1-2 +ChangeLog.pre-2-0 +ChangeLog.pre-2-2 --- glib2.0-2.14.4.orig/debian/libglib2.0-dev.install +++ glib2.0-2.14.4/debian/libglib2.0-dev.install @@ -0,0 +1,11 @@ +debian/install/deb/usr/include/* usr/include +debian/install/deb/usr/lib/lib*.{so,la,a} usr/lib +debian/install/deb/usr/lib/glib-2.0 usr/lib +debian/install/deb/usr/lib/pkgconfig usr/lib +debian/install/deb/usr/share/aclocal usr/share +debian/install/deb/usr/share/glib-2.0 usr/share +debian/install/deb/usr/share/man/man1/glib-genmarshal.1* usr/share/man/man1 +debian/install/deb/usr/share/man/man1/glib-mkenums.1* usr/share/man/man1 +debian/install/deb/usr/share/man/man1/gobject-query.1* usr/share/man/man1 +debian/install/deb/usr/share/man/man1/glib-gettextize.1* usr/share/man/man1 +debian/install/deb/usr/bin usr --- glib2.0-2.14.4.orig/debian/watch +++ glib2.0-2.14.4/debian/watch @@ -0,0 +1,4 @@ +version=2 +http://download.gnome.org/sources/glib/([\d\.]+)[02468]/ \ + glib-(.*)\.tar\.gz \ + debian uupdate --- glib2.0-2.14.4.orig/debian/shlibs.local +++ glib2.0-2.14.4/debian/shlibs.local @@ -0,0 +1,2 @@ +libpcre 3 libpcre3 (>= 7.2) +libpcreposix 3 libpcre3 (>= 7.2) --- glib2.0-2.14.4.orig/debian/changelog +++ glib2.0-2.14.4/debian/changelog @@ -0,0 +1,942 @@ +glib2.0 (2.14.4-1ubuntu1) hardy; urgency=low + + * Sync with Debian; remaining Ubuntu changes: + - Set Maintainer to Ubuntu Desktop Team. + - Enable the 01_gettext_desktopfiles patch in the series. + + -- Loic Minier Tue, 27 Nov 2007 18:48:00 +0100 + +glib2.0 (2.14.4-1) unstable; urgency=low + + [ Loic Minier ] + * Fix disabled patch name 01_gettext-desktopfiles in series. + + [ Josselin Mouette ] + * Conflict against nautilus < 2.20 according to + http://bugzilla.gnome.org/show_bug.cgi?id=440988#c182 + + [ Sebastian Dröge ] + * New upstream bugfix release. + + -- Sebastian Dröge Sun, 25 Nov 2007 14:37:34 +0100 + +glib2.0 (2.14.3-1) unstable; urgency=high + + [ Sebastian Dröge ] + * debian/shlibs.local: + + Override libpcre3's shlibs to require at least pcre 7.2 (See: #449289). + + [ Loic Minier ] + * New upstream stable release; bug fixes and security update. + - SECURITY: Update the internal copy of PCRE to 7.4, fixes CVE-2007-4767; + the internal copy is used for the udeb. + - Drop relibtoolizing patch, 70_relibtoolize, as upstream prepared this + tarball with libtool 1.5.24. + + -- Loic Minier Sat, 10 Nov 2007 19:59:04 +0100 + +glib2.0 (2.14.2-1) unstable; urgency=low + + * Add GNOME bug id to 70_relibtoolize. + * New upstream stable release; no API change. + * Add lpia to the list of arches on which testsuite failures are fatal. + + -- Loic Minier Wed, 17 Oct 2007 17:19:16 +0200 + +glib2.0 (2.14.1-5) unstable; urgency=low + + * Add a relibtoolizing patch, 70_relibtoolize, to get some hurd-i386 fixes + in libtool; see Debian #445001. + + -- Loic Minier Sun, 07 Oct 2007 16:52:44 +0200 + +glib2.0 (2.14.1-4) unstable; urgency=low + + * Document that testsuite failure aren't fatal on m68k due to GNOME #481575. + * Disable testsuite on arm, mips, powerpc; see GNOME #481573; mipsel was + already disabled because its testsuite results were unknown in + experimental. + * Document that testsuite failure is disabled on hppa, hurd, kfreebsd-amd64, + kfreebsd-i386 due to Debian #428674. + + -- Loic Minier Sat, 29 Sep 2007 13:56:18 +0200 + +glib2.0 (2.14.1-3) unstable; urgency=medium + + * Only build the standards debs against the system PCRE, i.e. build the udeb + against the builtin PCRE until pcre3 provides an udeb. + + -- Loic Minier Tue, 18 Sep 2007 21:35:30 +0200 + +glib2.0 (2.14.1-2) unstable; urgency=low + + * debian/control.in, + debian/rules: + + Build against the system PCRE instead of the supplied one. + + -- Sebastian Dröge Mon, 17 Sep 2007 09:41:48 +0200 + +glib2.0 (2.14.1-1) unstable; urgency=low + + [ Loic Minier ] + * Mention I added 90_fix-abi-check-with-debug in 2.14.0-1 + + [ Sebastian Dröge ] + * New upstream major stable release, without API changes. + * debian/patches/90_fix-abi-check-with-debug.patch: + + Dropped, merged upstream. + + -- Sebastian Dröge Mon, 17 Sep 2007 06:35:29 +0200 + +glib2.0 (2.14.0-2) unstable; urgency=low + + * Upload to unstable; drop check-dist include. + + -- Loic Minier Tue, 21 Aug 2007 09:05:30 +0200 + +glib2.0 (2.14.0-1) experimental; urgency=low + + * Fix double --host/--build flags to configure. + * Update patch 67_gcc43-inline to also fix the headers for GCC 4.2. + * New upstream major stable release; API additions. + - Bump up shlibs to >= 2.14.0. + - Drop patch 90_from_svn_fix_missing_pointer_casting, merged upstream. + - New patch, 90_fix-abi-check-with-debug, fixes build of testsuite in + debug mode; from SVN. + + -- Loic Minier Mon, 20 Aug 2007 21:54:07 +0200 + +glib2.0 (2.13.7-3) experimental; urgency=low + + * debian/patches/90_from_svn_fix_missing_pointer_casting.patch: + - patch from SVN, "fixed missing pointer casts when using atomic ops." + (Closes: #434853) + + -- Sebastien Bacher Fri, 27 Jul 2007 16:14:13 +0200 + +glib2.0 (2.13.7-2) experimental; urgency=low + + * Bump shlibs to 2.13.7. + + -- Loic Minier Wed, 25 Jul 2007 16:09:27 +0200 + +glib2.0 (2.13.7-1) experimental; urgency=low + + * Drop "libtool_is_fool" snippet patching hardcode_libdir_flag_spec and + archive_cmds which is probably dangerous with newer libtools. + * Fix flavor name in a comment of debian/rules. + * Use -s instead of -a in arch-specific dh_* calls. + * New upstream development release; some API additions. + - Drop patch 60_output-lines-during-tests, merged upstream. + * New patch, 60_wait-longer-for-threads-to-die, to wait 5 seconds instead of + one for threads to die in the threadpool test; hopefully fixes hppa and + kfreebsd testsuite failures; see #428674 and #431720. + * Don't make testsuite failures fatal on hppa; closes: #431720. + + -- Loic Minier Thu, 12 Jul 2007 21:37:47 +0200 + +glib2.0 (2.13.6-1) experimental; urgency=low + + * Don't pass -L to dh_shlibdeps as the shlibs.local trick is enough and this + can result in duplicate deps; closes: #317461. + * Set myself as maintainer. + * Cleanups. + * Make the testsuite failures fatal on arches which passed the testsuite + with 2.13.5 in experimental (currently: alpha amd64 arm hppa i386 ia64 + mips powerpc s390); closes: #291486. + * Don't run the testsuite when cross-compiling. + * New upstream development release; only API change is to change back the + definition of GType for C++ to be gulong. + + -- Loic Minier Mon, 02 Jul 2007 10:21:34 +0200 + +glib2.0 (2.13.5-1) experimental; urgency=low + + * New upstream release + - Bump shlibs to >= 2.13.5, as the API was changed + + -- Marc 'HE' Brockschmidt Tue, 19 Jun 2007 16:14:16 +0200 + +glib2.0 (2.13.4-2) experimental; urgency=low + + * New patch, 67_gcc43-inline, fixes FTBFS of apps using glib with GCC 4.3 + which uses C99 where the meaning of "inline" changed; patch was adapted + from patches in GNOME #315437 and Gentoo #156475; closes: #416863. + + -- Loic Minier Sat, 16 Jun 2007 18:49:57 +0200 + +glib2.0 (2.13.4-1) experimental; urgency=low + + * Also honor parallel=n in DEB_BUILD_OPTIONS. + * New upstream release series; these are development releases, the new API + may still change incompatibly. + - Target at experimental; include check-dist. + - Bump up shlibs to >= 2.13.4. + * New patch but disabled, 01_gettext-desktopfiles, permits overriding the + gettext domain when desktop files have such a field; found in the Ubuntu + package. + + -- Loic Minier Wed, 13 Jun 2007 10:52:27 +0200 + +glib2.0 (2.12.12-1) unstable; urgency=low + + * Fix description of the -dbg package. + * New upstream release. + + -- Loic Minier Thu, 03 May 2007 19:14:33 +0200 + +glib2.0 (2.12.11-3) unstable; urgency=medium + + * Initialize CFLAGS to -Wall -g; pass debian/rules' CFLAGS and LDFLAGS to + configure, doh! + * Track all stable versions in watch file. + * Wrap build-deps and deps. + * Add ${misc:Depends}. + * New patch 60_output-lines-during-tests, outputs newlines after thousand + iterations of the inner-loop of the closures test to avoid the timeout on + mips and mipsel buildds. + + -- Loic Minier Thu, 12 Apr 2007 16:13:46 +0200 + +glib2.0 (2.12.11-2) unstable; urgency=low + + * Run "make check" test suite for the deb flavor except if DEB_BUILD_OPTIONS + contains the "nocheck" keyword; ignore failures. + * Include the new uploaders.mk from gnome-pkg-tools instead of duplicating + its logic; build-dep on gnome-pkg-tools >= 0.11. + * Drop useless version computations. + * Add support for DEB_BUILD_OPTIONS_PARALLEL. + * Upload to unstable; drop check-dist include. + + -- Loic Minier Wed, 11 Apr 2007 10:35:43 +0200 + +glib2.0 (2.12.11-1) experimental; urgency=medium + + * New upstream release; no API change. + + -- Loic Minier Fri, 9 Mar 2007 22:02:25 +0100 + +glib2.0 (2.12.10-1) experimental; urgency=low + + * Include the new check-dist Makefile to prevent accidental uploads to + unstable; bump build-dep on gnome-pkg-tools to >= 0.10. + * New upstream release; no API change. + - Rewrite and cleanup the build-system completely to build a set of + flavors; drop obsolete targets; drop obsolete files; switch from + tar-in-tar and sys-build to regular source and quilt patching; + build-depend on quilt; drop DEB_USE_DBS_TARBALL_LAYOUT; create stampdir + when necessary; switch from dh_movefiles and dh_installdirs to + dh_install. + - Drop patch 000_glib-link; merged upstream. + * Bump up Debhelper compatibility level to 5. + * Only ship README.Debian in libglib2.0-dev. + * Empty dependency_libs in the *.la files of libglib2.0-dev. + * Override shlibs for the inter-shlibdeps before computing them. + * Use >= ${source:Version} and ${binary:Version} for inder-deps; build-dep + on dpkg-dev >= 1.13.19. + * Fix --dbg-package name. + * Use make vars for package names. + * Tune udeb description. + * Clean /usr/share/doc symlinks generation and move to dh_link generated + links. + * Cleanup list of invoked dh_* commands. + + -- Loic Minier Thu, 8 Mar 2007 18:51:27 +0100 + +glib2.0 (2.12.9-2) experimental; urgency=low + + * Bump shlibs to >= 2.12.9. + * Avoir overwriting the *.la files of the main build with the *.la files of + the udeb build; fixes "old_library" in *.la files; thanks Tim Dijkstra; + closes: #297741. + + -- Loic Minier Sat, 20 Jan 2007 09:13:40 +0100 + +glib2.0 (2.12.9-1) experimental; urgency=low + + * Add a get-orig-source target to retrieve the upstream tarball. + * New upstream releases; no API change. + - Fixes documentation of g_key_file_set_string_list(); closes: #405028. + - Avoids spewing warnings with gcc 2.95; closes: #303124. + - Drop patch 009_accept-space-in-key-names; merged and adapted upstream. + + -- Loic Minier Wed, 17 Jan 2007 08:55:27 +0100 + +glib2.0 (2.12.7-1) experimental; urgency=low + + * New upstream release; no API change; translation updates, bug fixes, + build fixes. + - Target at experimental for now. + - Drop patch 010_restore-old-key-file-syntax-support, merged and adapted + upstream. + + -- Loic Minier Fri, 5 Jan 2007 12:24:38 +0100 + +glib2.0 (2.12.6-2) unstable; urgency=medium + + * New patch, 010_restore-old-key-file-syntax-support, reverts strict group + names and key names checks introduced between glib 2.12.4 and 2.12.6; + instead of failing, critical warnings are output; updates the relevant + tests as well; closes: #404888. + * New patch, 009_accept-space-in-key-names, adds support for space in key + names (independently of 010_restore-old-key-file-syntax-support); updates + and add relevant tests as well; closes: #404888 as well. + + -- Loic Minier Sun, 31 Dec 2006 20:43:23 +0100 + +glib2.0 (2.12.6-1) unstable; urgency=low + + * New upstream release; no API or ABI change. + - Fixes file-type detection in nautilus; closes: #404015. + + -- Loic Minier Thu, 21 Dec 2006 09:46:30 +0100 + +glib2.0 (2.12.5-3) unstable; urgency=low + + * Upload to unstable. + + -- Loic Minier Wed, 20 Dec 2006 17:27:25 +0100 + +glib2.0 (2.12.5-2) experimental; urgency=low + + * Upload to unstable. + + -- Loic Minier Wed, 20 Dec 2006 08:50:56 +0100 + +glib2.0 (2.12.5-1) experimental; urgency=low + + * Add cross-reference in 2.12.4-2. + * New upstream release; no API or ABI change. + - Target at experimental for now. + - Drop patch 011_glib-gettext-datarootdir, merged upstream. + * Drop patch 010_glib2.0.kfreebsd-amd64, is not needed anymore and seems to + have been at the wrong level anyway. + * Review and comment on the usefulness of patch 000_glib-link. + + -- Loic Minier Tue, 19 Dec 2006 08:52:26 +0100 + +glib2.0 (2.12.4-2) unstable; urgency=low + + * New patch, 011_glib-gettext-datarootdir, to compute datarootdir + appropriately for AM_GLIB_DEFINE_LOCALEDIR; GNOME #343825; + closes: #370282. + + -- Loic Minier Thu, 16 Nov 2006 10:14:52 +0100 + +glib2.0 (2.12.4-1) unstable; urgency=low + + * New upstream release; no API changes. + + -- Loic Minier Mon, 2 Oct 2006 10:39:57 +0200 + +glib2.0 (2.12.3-2) unstable; urgency=low + + * Upload to unstable + + [ Loic Minier] + * Merge 2.10.3-3. + + -- Sebastien Bacher Wed, 13 Sep 2006 13:16:29 +0200 + +glib2.0 (2.12.3-1) experimental; urgency=low + + * New upstream release; no public API changes. + * Broaden the -data dep on the lib to permit bin NMUs. + + -- Loic Minier Wed, 30 Aug 2006 22:12:02 +0200 + +glib2.0 (2.12.2-1) experimental; urgency=low + + * New upstream release; no API changes. + + -- Loic Minier Mon, 21 Aug 2006 12:30:24 +0200 + +glib2.0 (2.12.1-1) experimental; urgency=low + + * New upstream release. + * Sync with overrides and set udeb's Priority to optional instead of extra. + * Bump up Standards-Version to 3.7.2. + + -- Loic Minier Mon, 7 Aug 2006 22:08:21 +0200 + +glib2.0 (2.12.0-1) experimental; urgency=low + + * New upstream version: + Major new features include: + * The Unicode support has been updated to Unicode 5. + * GBookmarkFile: a parser for files containing bookmarks + stored using the Desktop Bookmark specification + * Base64 encoding support + * debian/rules: + - updated shver number + * debian/watch: + - updated + + -- Sebastien Bacher Mon, 3 Jul 2006 10:46:21 +0200 + +glib2.0 (2.10.3-3) unstable; urgency=low + + * debian/patches/999_ia64_atomic_ops_broken.patch: + - dropped, it's not required with the new gcc and it was breaking the build + (Closes: #376260) + + [ Loic Minier ] + * Sync with overrides and set udeb's Priority to optional instead of extra. + + -- Sebastien Bacher Wed, 12 Jul 2006 19:09:21 +0200 + +glib2.0 (2.10.3-2) unstable; urgency=medium + + * Re-add changes from 2.10.2-2 that were lost in the wild + (closes: #361697). + + -- Josselin Mouette Mon, 26 Jun 2006 19:54:17 +0200 + +glib2.0 (2.10.3-1) unstable; urgency=low + + * New upstream version: + Bugs fixed: + - g_completion_complete_utf8 crashes when NULL is passed to it + - update-desktop-database doesn't handle duplicate entries + (Closes: #298668) + - Dereferencing NULL value in g_key_file_get_group_comment + - GKeyFile set_string_list invalid memory reads + - The GObject tutorial say g_object_(un)ref is _not_ thread-safe + - Fix a memory leak in GOption + + -- Sebastien Bacher Sat, 27 May 2006 12:54:17 +0200 + +glib2.0 (2.10.2-2) unstable; urgency=low + + * debian/control.in, debian/rules: + - patch by Frans Pop + - Add support for udeb dependency resolution in shlibs file + (Closes: #361697). + - Simplify debian/rules by making use of udeb support in debhelper. + * debian/control.in: + - clarify the description for the -data package (Closes: #362316), + change suggested Robert Bihlmeyer + + -- Sebastien Bacher Fri, 28 Apr 2006 00:03:41 +0200 + +glib2.0 (2.10.2-1) unstable; urgency=low + + * New upstream version: + - Missing check for .dylib + - Segmentation Fault when %llu is passed to vasnprintf and HAVE_SNPRINTF + is not defined + - Add support for write FDs to GIOChannel + - Memleak in goption.c::parse_short_option + - g_parse_debug_string reads beyond buffer + - g_option_context_parse() should not set program name to '' if + it is already set + - g_main_context_unref calls g_source_destroy_internal with incorrect + arguments + - Slight performance gains (GList, GAsyncQueue) + - Use of unitialised memory in g_mem_profile + - make check FAIL: threadpool-test + - g_option_context_new parameter lacks better explanation + - Some breakages with GThreadPool + - gthread/gthread-win32.c: IsDebuggerPresent needs + '#define _WIN32_WINDOWS 0x0401' + - dlerror() portability issue causes crash on (old) a.out NetBSD platform + - g_timer_elapsed docs should mention that microseconds may be NULL + - goption + error out params + - Documentation should not reference G_HAVE_GINT64, as it's deprecated. + * debian/patches/010_glib2.0.kfreebsd-amd64.patch: + - patch by Aurelien Jarno , fix build on kfreebsd-amd64 + (Closes: #355953) + * debian/rules: + - use "-g" for CFLAGS, makes -dbg package useful again + change by Fabio M. Di Nitto on the Ubuntu package: + * Make sure to pass CFLAGS to configure. + * Generalize DEB_BUILD_ARCH. + + -- Sebastien Bacher Fri, 7 Apr 2006 23:23:14 +0200 + +glib2.0 (2.10.1-2) unstable; urgency=low + + [ Sjoerd Simons ] + * Upload to unstable + * Document udeb changes that Josselin did in an earlier experimental + package. + * debian/patches/999_ia64_atomic_ops_broken.patch + + Added. Uses atomic builtins that gcc-4.0 know on ia64, instead of those + for gcc-4.1. (Patch by LaMont Jones from the ubuntu package) + * Updated debian/watch to use download.gnome.org + + [ Josselin Mouette ] + * Set the conflict with pango < 1.11, that's where the breakage lies. + * Add a XC-Package-Type header to the udeb and set the priority to extra. + [debian/control.in] + + -- Sjoerd Simons Sun, 19 Mar 2006 12:41:21 +0100 + +glib2.0 (2.10.1-1) experimental; urgency=low + + * New upstream release (bugfixes, translation updates). + * [debian/rules] Bring priority parameter for dpkg-distaddfile for the udeb + in line with control.in . + + Josselin Mouette : + * Conflict with pango < 1.10 to avoid breakage caused by the unicode + changes. + + -- J.H.M. Dassen (Ray) Sat, 11 Mar 2006 13:53:16 +0100 + +glib2.0 (2.10.0-1) experimental; urgency=low + + * New upstream release. + + -- Josselin Mouette Mon, 6 Mar 2006 00:32:27 +0100 + +glib2.0 (2.8.6-1) unstable; urgency=medium + + * New upstream release (bugfixes, translation updates). + + -- J.H.M. Dassen (Ray) Wed, 18 Jan 2006 20:30:26 +0100 + +glib2.0 (2.8.5-1) unstable; urgency=low + + * New upstream release (bugfixes, translation updates, + g_object_compat_control() added). + * [debian/rules] Bumped shver to 2.8.5 to reflect the API change. + + -- J.H.M. Dassen (Ray) Thu, 5 Jan 2006 21:22:36 +0100 + +glib2.0 (2.8.4-2) unstable; urgency=high + + * Fix shlibs deps that crept in the amd64 package, thanks Kurt Roeckx for + all the fish. (Closes: #339685) + - Cleanup and clarify upstream version calculations. + - Drop dh_makeshlibs -a call as only one package ships shlibs and already + has a separate call. + - Drop useless shlibs.local generation. + - Call dh_shlibdeps with cleaner arguments. + [debian/rules] + * Fix "fakeroot debian/rules clean" by following find calls with a .svn + filter. + [debian/scripts/lib] + * Fix quoting of unfix.source.patch:START and FAILED messages. + [debian/scripts/messages] + * Clarify Copyright versus License and update upstream URL. + [debian/copyright] + + -- Loic Minier Sun, 20 Nov 2005 10:36:26 +0100 + +glib2.0 (2.8.4-1) unstable; urgency=low + + * New upstream version. + + -- Sebastien Bacher Tue, 15 Nov 2005 16:22:08 +0100 + +glib2.0 (2.8.3-1) unstable; urgency=medium + + * New upstream release (fix an error that crept in with a change to + glib-mkenums in 2.8.2, documentation improvements, translation updates). + + -- J.H.M. Dassen (Ray) Mon, 3 Oct 2005 20:52:26 +0200 + +glib2.0 (2.8.2-1) unstable; urgency=medium + + * New upstream release (bug fixes, documentation improvements, translation + updates). + + -- J.H.M. Dassen (Ray) Sun, 2 Oct 2005 09:31:27 +0200 + +glib2.0 (2.8.1-1) unstable; urgency=medium + + * New (for Debian) upstream version (bug fixes, documentation improvements, + translation updates). + * [debian/control.in] Bumped Standards-Version. + * [debian/copyright] Updated FSF's address. + + -- J.H.M. Dassen (Ray) Sat, 24 Sep 2005 13:45:47 +0200 + +glib2.0 (2.8.1-0ubuntu1) breezy; urgency=low + + * New upstream version. + * debian/watch: + - updated. + + -- Sebastien Bacher Tue, 23 Aug 2005 12:05:20 +0200 + +glib2.0 (2.8.0-1) unstable; urgency=low + + * New upstream version. + * debian/rules: + - updated the shlibs. + + -- Sebastien Bacher Sat, 13 Aug 2005 14:14:00 +0200 + +glib2.0 (2.7.3-1) experimental; urgency=low + + * New upstream version. + + -- Sebastien Bacher Fri, 15 Jul 2005 23:42:37 +0200 + +glib2.0 (2.7.2-1) experimental; urgency=low + + * New upstream version. + + -- Sebastien Bacher Fri, 8 Jul 2005 22:07:59 +0200 + +glib2.0 (2.7.1-1) experimental; urgency=low + + * New upstream version. + * debian/rules: + - updated the shlib. + + -- Sebastien Bacher Fri, 1 Jul 2005 19:43:05 +0200 + +glib2.0 (2.7.0-1) experimental; urgency=low + + * New upstream version: + * GKeyFile: + - add unit tests. + - accept \r\n as line end. + - don't interpret leading zeros as octal numbers. + - make key and group removal work. + * GOption: + - improve formatting of --help output. + - accept -?. + - warn about duplicate main groups. + - treat '-' as non-option argument. + - report missing arguments as errors. + - add a boxed type for GDate. + * GTree: + - g_tree_remove() and g_tree_steal() return status information. + * Stdio wrappers: + - work regardless of large file support. + - add g_access(), g_chmod(), g_creat(), g_chdir. + * GObject: + - implement "toggle references" to help language bindings. + - allow to mark names, nicks and blurbs of pspecs as static. + - make pspec lookup a bit faster. + * add g_listenv() to list all set environment variables. + * add g_file_set_contents() to atomically write a file. + * add g_try_malloc(), g_try_new(), g_try_new0() and g_try_renew(). + * add g_utf8_collate_key_for_filename() to sort filenames taking + extensions and numeric suffixes into account. + * add G_GNUC_NULL_TERMINATED to mark varargs function with + NULL-terminated argument lists. + * documentation improvements. + * new and updated translations. + * debian/rules: + - updated the shlibs. + * debian/watch: + - updated. + + -- Sebastien Bacher Tue, 21 Jun 2005 12:15:47 +0200 + +glib2.0 (2.6.5-1) unstable; urgency=low + + * New upstream release again bringing a number of bugfixes, improved + documentation and updated translations, including + gthread-posix.c (g_thread_create_posix_impl): Allow setstacksize to + fail. (GNOME #304790, Michael Banck) (Closes: #312382) + * [debian/patches/000_glib-link.patch] Updated. + + -- J.H.M. Dassen (Ray) Fri, 10 Jun 2005 21:14:42 +0200 + +glib2.0 (2.6.4-1) unstable; urgency=low + + * New upstream release bringing a number of bugfixes, improved + documentation and updated translations. + + -- J.H.M. Dassen (Ray) Wed, 6 Apr 2005 22:16:44 +0200 + +glib2.0 (2.6.3-1) unstable; urgency=low + + * New upstream release. + + -- Sebastien Bacher Mon, 28 Feb 2005 09:38:38 +0100 + +glib2.0 (2.6.2-1) unstable; urgency=low + + * New upstream release. + + -- Sebastien Bacher Sat, 5 Feb 2005 19:23:59 +0100 + +glib2.0 (2.6.1-3) unstable; urgency=low + + * debian/rules: + - use "-plibglib$(apiver)-udeb", fix the libglib2.0-0-dbg package. + + -- Sebastien Bacher Sun, 23 Jan 2005 22:24:21 +0100 + +glib2.0 (2.6.1-2) unstable; urgency=low + + * Upload to unstable. + * debian/control.in: + - rename libglib2.0-dbg to libglib2.0-0-dbg. + - set myself as maintainer. + * debian/rules: + - use dh_strip to make the debug package. + + -- Sebastien Bacher Sun, 16 Jan 2005 12:59:21 +0100 + +glib2.0 (2.6.1-1) experimental; urgency=low + + * New upstream release. + + -- Sebastien Bacher Sat, 8 Jan 2005 14:44:05 +0100 + +glib2.0 (2.6.0-1) experimental; urgency=low + + * New upstream release. + * debian/rules: + - updated the shlibs. + * debian/watch: + - updated. + + -- Sebastien Bacher Mon, 27 Dec 2004 16:15:36 +0100 + +glib2.0 (2.4.8-1) unstable; urgency=medium + + * New upstream bugfix release. + + -- J.H.M. Dassen (Ray) Sat, 4 Dec 2004 18:52:44 +0100 + +glib2.0 (2.4.7-1) unstable; urgency=medium + + * New upstream bugfix release. + * [debian/patches/000_glib-link.patch] Updated. + * [debian/patches/001_translations.patch] Dropped. + + -- J.H.M. Dassen (Ray) Fri, 8 Oct 2004 22:27:49 +0200 + +glib2.0 (2.4.6-4) unstable; urgency=medium + + * [debian/patches/001_translations.patch] Updated translations from CVS and + relibtoolise to use new translations. + * [debian/rules] Fixed udeb naming on Hurd. + + -- J.H.M. Dassen (Ray) Fri, 8 Oct 2004 12:43:09 +0200 + +glib2.0 (2.4.6-3) unstable; urgency=medium + + Colin Watson : (Closes: #274053) + * [debian/rules] binary-arch depends on binary-arch-udeb. + * [debian/rules] Strip udeb! + + -- J.H.M. Dassen (Ray) Wed, 29 Sep 2004 19:39:22 +0200 + +glib2.0 (2.4.6-2) unstable; urgency=medium + + * [debian/patches/001_translations.patch] Updated translations from CVS. + * [debian/rules] Tightened "shver" to tighten shlibs, as some + incompatibilities with older versions turned up with gconf. + (Closes: #265659) + + -- J.H.M. Dassen (Ray) Tue, 24 Aug 2004 18:50:04 +0200 + +glib2.0 (2.4.6-1) unstable; urgency=medium + + * New upstream bugfix release. + + -- J.H.M. Dassen (Ray) Sun, 15 Aug 2004 18:34:27 +0200 + +glib2.0 (2.4.5-2) unstable; urgency=low + + * debian/patches/000_glib-link.patch: + - patch from Jurij Smakov to link with all the libs + (Closes: #263130). + + -- Sebastien Bacher Tue, 3 Aug 2004 18:03:53 +0200 + +glib2.0 (2.4.5-1) unstable; urgency=low + + * New upstream release. + + -- Sebastien Bacher Sun, 1 Aug 2004 17:31:43 +0200 + +glib2.0 (2.4.4-1) unstable; urgency=low + + * New upstream release. + - remove spaces before "#pragma alloca" (Closes: #250667). + + -- Sebastien Bacher Fri, 16 Jul 2004 18:44:31 +0200 + +glib2.0 (2.4.2-1) unstable; urgency=low + + * New upstream release. + + -- Sebastien Bacher Sat, 5 Jun 2004 00:51:01 +0200 + +glib2.0 (2.4.1-2) unstable; urgency=low + + * Upload in unstable. + * GNOME Team Upload. + * J.H.M. Dassen (Ray) : + + [debian/rules] Make the linker work a bit harder so dynamic loading can + be done faster; safety measure: ensure the build aborts when the library + still has references to undefined symbols. + + -- Sebastien Bacher Sat, 22 May 2004 14:18:23 +0200 + +glib2.0 (2.4.1-1) experimental; urgency=low + + * New upstream release. + * GNOME Team Upload. + * debian/rules: + - updated shlib version to 2.4.1. + + -- Sebastien Bacher Sun, 2 May 2004 12:47:25 +0200 + +glib2.0 (2.4.0-2) experimental; urgency=low + + * Akira TAGOH + - debian/rules: + - bumped shlib version to 2.4.0. + + -- Akira TAGOH Wed, 24 Mar 2004 09:12:31 +0900 + +glib2.0 (2.4.0-1) experimental; urgency=low + + * New upstream release. + * debian/rules: + - doh. don't claim the newer shlibs. + * debian/control: + - added Uploaders to maintain as team. + - added gnome-pkg-tools to Build-Depends. + * debian/docs: + - added old ChangeLog and NEWS files. + + -- Akira TAGOH Wed, 17 Mar 2004 21:18:00 +0900 + +glib2.0 (2.2.3-1) unstable; urgency=low + + * "Welcome back my laptop PC!" release. + * New upstream release. + * debian/control: + - bumped Standards-Version to 3.6.1.0. + + -- Akira TAGOH Mon, 1 Sep 2003 02:29:14 +0900 + +glib2.0 (2.2.2-1) unstable; urgency=low + + * New upstream release. + - Fix portability problems with G_MIN/MAX_INT64 (closes: Bug#195302) + * debian/control: + - bumped Standards-Version to 3.5.10.0. + - changed the sections for libglib2.0-dev and libglib2.0-dbg to libdevel. + * debian/compat: + - use it instead of DH_COMPAT. + + -- Akira TAGOH Tue, 10 Jun 2003 18:44:01 +0900 + +glib2.0 (2.2.1-3) unstable; urgency=low + + * debian/control: + - rename libglib2.0-0-udeb to libglib2.0-udeb. + - delete Recommends line from libglib2.0-udeb. (closes: Bug#183749) + - add Provides: libglib2.0-0 for libglib2.0-udeb. + * debian/libglib2.0-udeb.files: + - contain the libraries and locale data. + + -- Akira TAGOH Sat, 8 Mar 2003 02:46:19 +0900 + +glib2.0 (2.2.1-2) unstable; urgency=low + + * debian/rules: + - create the symlinks on /usr/share/gtk-doc/html. (closes: Bug#183504) + - changed DH_COMPAT to 4. + * debian/control: + - add libglib2.0-0-udeb package for debian-installer. + + -- Akira TAGOH Thu, 6 Mar 2003 01:14:44 +0900 + +glib2.0 (2.2.1-1) unstable; urgency=low + + * New upstream release. + * debian/control: + - needed pkg-config (>= 0.14.0). + - add autotools-dev to Build-Depends. + + -- Akira TAGOH Tue, 4 Feb 2003 01:02:20 +0900 + +glib2.0 (2.2.0-2) unstable; urgency=low + + * close to be fixed in the upstream release. (closes: Bug#173508) + + -- Akira TAGOH Tue, 7 Jan 2003 17:22:20 +0900 + +glib2.0 (2.2.0-1) unstable; urgency=low + + * New upstream release. + * debian/control: + bumped Standards-Version to 3.5.8. + + -- Akira TAGOH Wed, 25 Dec 2002 13:46:08 +0900 + +glib2.0 (2.0.7-1) unstable; urgency=low + + * New upstream release. + * debian/control: + - changed libc6-dev to libc6-dev | libc-dev in -dev's Depends. + - bumped Standards-Version and depends debhelper (>> 4). + - add libgtk2.0-doc to Suggests for -doc. + * debian/rules: + - add symlink to fix the missing symlink for gtk. but this release doesn't + include the hyperlink for gtk+ (closes: Bug#162845) + - support noopt option for DEB_BUILD_OPTIONS. + + -- Akira TAGOH Tue, 5 Nov 2002 17:06:50 +0900 + +glib2.0 (2.0.6-1) unstable; urgency=low + + * New upstream release. + * debian/rules: removed --enable-debug option. conform to the default value + now. (closes: Bug#151815) + * debian/patches/000_glib2.0-garray.patch: removed because it's merged by + the upstream. + + -- Akira TAGOH Sun, 4 Aug 2002 16:05:03 +0900 + +glib2.0 (2.0.4-3) unstable; urgency=low + + * debian/patches/000_glib2.0-garray.patch: + applied to fix g_ptr_array_index() macro. (closes: Bug#150521) + + -- Akira TAGOH Sat, 29 Jun 2002 19:46:51 +0900 + +glib2.0 (2.0.4-2) unstable; urgency=low + + * debian/libglib2.0-doc.doc-base.gobject: fix the dupplicated title. + (closes: Bug#150040) + + -- Akira TAGOH Sun, 16 Jun 2002 23:27:38 +0900 + +glib2.0 (2.0.4-1) unstable; urgency=low + + * New upstream release. + + -- Akira TAGOH Sun, 16 Jun 2002 03:33:22 +0900 + +glib2.0 (2.0.3-1) unstable; urgency=low + + * New upstream release. + + -- Akira TAGOH Wed, 29 May 2002 00:49:56 +0900 + +glib2.0 (2.0.1-2) unstable; urgency=low + + * debian/scripts/vars.build: fix bashism. + * debian/README.Debian: add static link issue. + * debian/rules: add --enable-static. (closes: Bug#142198) + + -- Akira TAGOH Thu, 11 Apr 2002 19:25:17 +0900 + +glib2.0 (2.0.1-1) unstable; urgency=low + + * New upstream release. + + -- Akira TAGOH Sat, 30 Mar 2002 16:23:54 +0900 + +glib2.0 (2.0.0-1) unstable; urgency=low + + * Initial Release. + + -- Akira TAGOH Tue, 12 Mar 2002 02:32:11 +0900 + --- glib2.0-2.14.4.orig/debian/rules +++ glib2.0-2.14.4/debian/rules @@ -0,0 +1,235 @@ +#!/usr/bin/make -f + +DISABLE_UPDATE_UPLOADERS := 1 +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 + +STAMP_DIR := debian/stampdir + +PATCH_DIR := debian/patches + +# rules in this debian/rules Makefile can be built concurrently as well as +# upstream rules in Makefile; all $(MAKE) invocations will inherit this flag, +# if you recurse into debian/rules ($(MAKE) +# -f debian/rules in rules), you need to pass a flag to avoid adding "-jX" when +# the childs encounters this line +DEB_BUILD_OPTIONS_PARALLEL ?= $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) +MAKEFLAGS += $(if $(DEB_BUILD_OPTIONS_PARALLEL),-j$(DEB_BUILD_OPTIONS_PARALLEL)) + +# These are used for cross-compiling and for saving the configure script +# from having to guess our platform (since we know it already) +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) + +# Debian architectures +DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH) +DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) + +CFLAGS += -Wall -g -O$(if $(findstring noopt,$(DEB_BUILD_OPTIONS)),0,2) + +# Ensure the build aborts when there are still references to undefined +# symbols +LDFLAGS += -Wl,-z,defs + +# Make the linker work a bit harder so dynamic loading can be done faster +LDFLAGS += -Wl,-O1 + +APIVER := 2.0 +SONAME := 0 +SHVER := 2.14.0 + +# package names +SHARED_PKG := libglib$(APIVER)-$(SONAME) +DATA_PKG := libglib$(APIVER)-data +DEV_PKG := libglib$(APIVER)-dev +UDEB_PKG := libglib$(APIVER)-udeb +DOC_PKG := libglib$(APIVER)-doc +DEBUG_PKG := $(SHARED_PKG)-dbg + +# list of flavors we build; each gets a builddir, a configure pass (configure +# args are defined below), a build pass, and an install pass (in two steps) +# Note: the "deb" flavor is required +FLAVORS := deb udeb + +# list of flavors to run the test suite on +CHECK_FLAVORS := $(filter deb, $(FLAVORS)) + +# list of arches on which testsuite failures are fatal +CHECK_SUPPORTED_ARCHES := alpha amd64 i386 ia64 lpia s390 sparc +# testsuite is known to fail on hppa, hurd, kfreebsd-amd64, kfreebsd-i386; see +# Debian #428674 +# testsuite is known to fail on arm, mips, mipsel, powerpc; see GNOME #481573 +# testsuite is known to fail on m68k; see GNOME #481575 + +# build dir for the current flavor; this is only expanded in flavor specific +# targets +# Note: dh_clean will rm -rf debian/tmp, hence all builds +builddir = $(buildbasedir)/$* +buildbasedir = $(CURDIR)/debian/build + +# install dir for the current flavor; this is only expanded in flavor specific +# targets +installdir = $(installbasedir)/$* +installbasedir = $(CURDIR)/debian/install + +# configure flags +common_configure_flags := \ + --prefix=/usr \ + --mandir=\$${prefix}/share/man \ + --infodir=\$${prefix}/share/info \ + --with-html-dir=\$${prefix}/share/doc/$(DOC_PKG) +ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE)) + common_configure_flags += --build=$(DEB_BUILD_GNU_TYPE) +else + common_configure_flags += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE) +endif +deb_configure_flags := $(common_configure_flags) \ + --enable-static \ + --with-pcre=system +udeb_configure_flags := $(common_configure_flags) + +$(STAMP_DIR)/patch-stamp: + dh_testdir + # backup the original files to restore them in the clean target + -test -r config.sub && cp config.sub config.sub.orig + -test -r config.guess && cp config.guess config.guess.orig + # apply patches + QUILT_PATCHES=$(PATCH_DIR) \ + quilt --quiltrc /dev/null push -a || test $$? = 2 + -test -r /usr/share/misc/config.sub && \ + cp -f /usr/share/misc/config.sub config.sub + -test -r /usr/share/misc/config.guess && \ + cp -f /usr/share/misc/config.guess config.guess + -mkdir -p $(STAMP_DIR) + touch $@ + +patch: $(STAMP_DIR)/patch-stamp + +$(STAMP_DIR)/configure-stamp-%: $(STAMP_DIR)/patch-stamp + dh_testdir + mkdir -p $(builddir) + cd $(builddir) && \ + CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \ + $(CURDIR)/configure $($*_configure_flags) + touch $@ + +configure: $(addprefix $(STAMP_DIR)/configure-stamp-, $(FLAVORS)) + +$(STAMP_DIR)/build-stamp-%: $(STAMP_DIR)/configure-stamp-% + dh_testdir + LD_LIBRARY_PATH=$(builddir)/glib/.libs:$(builddir)/gmodule/.libs:$(builddir)/gobject/.libs:$(builddir)/gthread/.libs:$(LD_LIBRARY_PATH) \ + $(MAKE) -C $(builddir) + touch $@ + +build: $(addprefix $(STAMP_DIR)/build-stamp-, $(FLAVORS)) + +maybe_ignore_check_failure = $(if $(filter ,$(CHECK_SUPPORTED_ARCHES)),-) + +$(STAMP_DIR)/check-stamp-%: $(STAMP_DIR)/build-stamp-% + dh_testdir +ifeq ($(filter $(DEB_BUILD_ARCH),$(CHECK_SUPPORTED_ARCHES)),$(DEB_BUILD_ARCH)) + # testsuite failures are fatal + LD_LIBRARY_PATH=$(builddir)/glib/.libs:$(builddir)/gmodule/.libs:$(builddir)/gobject/.libs:$(builddir)/gthread/.libs:$(LD_LIBRARY_PATH) \ + $(MAKE) -C $(builddir) check +else + # testsuite failures are ignored + -LD_LIBRARY_PATH=$(builddir)/glib/.libs:$(builddir)/gmodule/.libs:$(builddir)/gobject/.libs:$(builddir)/gthread/.libs:$(LD_LIBRARY_PATH) \ + $(MAKE) -C $(builddir) check +endif + touch $@ + +check: $(addprefix $(STAMP_DIR)/check-stamp-, $(CHECK_FLAVORS)) + +$(STAMP_DIR)/install-stamp-%: $(STAMP_DIR)/build-stamp-% + mkdir -p $(installdir) + $(MAKE) -C $(builddir) install DESTDIR=$(installdir) + touch $@ + +install: $(addprefix $(STAMP_DIR)/install-stamp-, $(FLAVORS)) + +debian/control: + dh_testdir + sed \ + -e "s#@SONAME@#$(SONAME)#g" \ + -e "s#@APIVER@#$(APIVER)#g" \ + -e "s#@VERSION@#$(VERSION)#g" \ + -e "s#@SHARED_PKG@#$(SHARED_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" \ + $@.in >$@ + +clean: debian/control + dh_testdir + dh_testroot + # remove install and build dirs + rm -rf $(installbasedir) + rm -rf $(buildbasedir) + # restore files from backup (before unpatching) + -test -r config.sub.orig && mv -f config.sub.orig config.sub + -test -r config.guess.orig && mv -f config.guess.orig config.guess + # unapply patches, if any + QUILT_PATCHES=$(PATCH_DIR) \ + quilt --quiltrc /dev/null pop -a -R || test $$? = 2 + -rm -rf .pc + -rm -rf $(STAMP_DIR) + dh_clean + +ifeq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH)) +maybe_check = $(if $(findstring nocheck,$(DEB_BUILD_OPTIONS)),,check) +else +# can't run the testsuite when cross-compiling +maybe_check = +endif + +binary-indep: build $(maybe_check) install + dh_testdir + dh_testroot + dh_install -i + dh_installchangelogs -i -N$(DATA_PKG) ChangeLog ChangeLog.* + dh_installdocs -N$(DATA_PKG) -i NEWS NEWS.* README + dh_link -i + dh_compress -i + dh_fixperms -i + dh_installdeb -i + dh_gencontrol -i + dh_md5sums -i + dh_builddeb -i + +binary-arch: build $(maybe_check) install + dh_testdir + dh_testroot + dh_install -s + # empty the dependency_libs in the *.la files + sed -i -e "/dependency_libs/ s/'.*'/''/" debian/$(DEV_PKG)/usr/lib/*.la + dh_installchangelogs -s -N$(DEV_PKG) -N$(DEBUG_PKG) \ + ChangeLog ChangeLog.* + dh_installdocs -s -N$(DEV_PKG) -N$(DEBUG_PKG) NEWS NEWS.* README + dh_link -s + dh_strip -s --dbg-package=$(DEBUG_PKG) + dh_compress -s + dh_fixperms -s + dh_makeshlibs -p$(SHARED_PKG) \ + -V "$(SHARED_PKG) (>= $(SHVER))" \ + --add-udeb="$(UDEB_PKG)" + dh_installdeb -s + # override shlibs for libraries from this source before computing + # dependencies of packages generated from this source; we already have + # inter-dependencies expressed manually in the control file, we do not + # need the shlibs to add duplicates + sed -nr -e 's/(([^ ]+: )?([^ ]+) ([^ ]+)) .*/\1/p' \ + debian/*/DEBIAN/shlibs \ + >debian/shlibs.local + dh_shlibdeps -s -ldebian/$(SHARED_PKG)/usr/lib + -rm -f debian/shlibs.local + dh_gencontrol -s + dh_md5sums -s + dh_builddeb -s + +binary: binary-indep binary-arch +.PHONY: patch configure build check install clean binary-indep binary-arch binary debian/control --- glib2.0-2.14.4.orig/debian/libglib2.0-udeb.install +++ glib2.0-2.14.4/debian/libglib2.0-udeb.install @@ -0,0 +1,2 @@ +debian/install/udeb/usr/lib/lib*.so.* usr/lib +debian/install/udeb/usr/share/locale usr/share --- glib2.0-2.14.4.orig/debian/compat +++ glib2.0-2.14.4/debian/compat @@ -0,0 +1 @@ +5 --- glib2.0-2.14.4.orig/debian/libglib2.0-0.install +++ glib2.0-2.14.4/debian/libglib2.0-0.install @@ -0,0 +1 @@ +debian/install/deb/usr/lib/lib*.so.* usr/lib --- glib2.0-2.14.4.orig/debian/libglib2.0-data.links +++ glib2.0-2.14.4/debian/libglib2.0-data.links @@ -0,0 +1 @@ +usr/share/doc/libglib2.0-0 usr/share/doc/libglib2.0-data --- glib2.0-2.14.4.orig/debian/libglib2.0-0-dbg.links +++ glib2.0-2.14.4/debian/libglib2.0-0-dbg.links @@ -0,0 +1 @@ +usr/share/doc/libglib2.0-0 usr/share/doc/libglib2.0-0-dbg --- glib2.0-2.14.4.orig/debian/control.in +++ glib2.0-2.14.4/debian/control.in @@ -0,0 +1,115 @@ +Source: glib@APIVER@ +Section: libs +Priority: optional +Maintainer: Ubuntu Desktop Team +XSBC-Original-Maintainer: Loic Minier +Uploaders: @GNOME_TEAM@ +Build-Depends: debhelper (>> 5.0.22), + pkg-config (>= 0.14.0), + gettext, + autotools-dev, + gnome-pkg-tools (>= 0.11), + quilt, + dpkg-dev (>= 1.13.19), + libpcre3-dev (>= 7.2) +Standards-Version: 3.7.2 + +Package: @SHARED_PKG@ +Section: libs +Architecture: any +Depends: ${misc:Depends}, + ${shlibs:Depends} +Recommends: @DATA_PKG@ +Conflicts: libpango1.0-0 (<< 1.11), + nautilus (<< 2.20) +Description: The 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. + . + This package contains the shared libraries. + +Package: libglib@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 + This is a udeb, or a microdeb, for the debian-installer. + . + 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 the minimal runtime library needed by the Debian + installer. + +Package: @DEV_PKG@ +Section: libdevel +Architecture: any +Depends: ${misc:Depends}, + @SHARED_PKG@ (= ${binary:Version}), + pkg-config (>= 0.14.0) +Suggests: @DOC_PKG@ +Replaces: libglib1.3-dev +Conflicts: libglib1.3-dev +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@, + as only it includes the header files and static libraries (optionally) + needed for compiling. + +Package: @DEBUG_PKG@ +Section: libdevel +Priority: extra +Architecture: any +Depends: ${misc:Depends}, + @SHARED_PKG@ (= ${binary:Version}) +Conflicts: libglib2.0-dbg +Replaces: libglib2.0-dbg +Description: The GLib libraries and debugging symbols + 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. + +Package: @DATA_PKG@ +Section: misc +Architecture: all +Depends: ${misc:Depends}, + @SHARED_PKG@ (>= ${source:Version}) +Replaces: libglib1.3, + libglib1.3-data +Conflicts: libglib1.3-data +Description: Common files for 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 for the runtime libraries to display messages in + languages other than English. + +Package: @DOC_PKG@ +Section: doc +Architecture: all +Depends: ${misc:Depends}, + lynx | www-browser +Replaces: libglib1.3-doc +Conflicts: libglib1.3-doc +Suggests: libgtk2.0-doc +Description: Documentation 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 contains the HTML documentation for the GLib library + in /usr/share/doc/@DOC_PKG@/ . + --- glib2.0-2.14.4.orig/debian/libglib2.0-doc.doc-base.glib +++ glib2.0-2.14.4/debian/libglib2.0-doc.doc-base.glib @@ -0,0 +1,12 @@ +Document: glib +Title: GLib Reference Manual +Author: Damon Chaplin et al. +Abstract: The GLib C library is used in GTK+ and Gnome + programs as a general-purpose set of functions for hash, tree, list, + and string operations, which C is oddly lacking whatsoever in any + of its standard libraries. +Section: Apps/Programming + +Format: HTML +Index: /usr/share/doc/libglib2.0-doc/glib/index.html +Files: /usr/share/doc/libglib2.0-doc/glib/*.html --- glib2.0-2.14.4.orig/debian/control +++ glib2.0-2.14.4/debian/control @@ -0,0 +1,115 @@ +Source: glib2.0 +Section: libs +Priority: optional +Maintainer: Ubuntu Desktop Team +XSBC-Original-Maintainer: Loic Minier +Uploaders: Debian GNOME Maintainers , Loic Minier , Sebastian Dröge +Build-Depends: debhelper (>> 5.0.22), + pkg-config (>= 0.14.0), + gettext, + autotools-dev, + gnome-pkg-tools (>= 0.11), + quilt, + dpkg-dev (>= 1.13.19), + libpcre3-dev (>= 7.2) +Standards-Version: 3.7.2 + +Package: libglib2.0-0 +Section: libs +Architecture: any +Depends: ${misc:Depends}, + ${shlibs:Depends} +Recommends: libglib2.0-data +Conflicts: libpango1.0-0 (<< 1.11), + nautilus (<< 2.20) +Description: The 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. + . + This package contains the shared libraries. + +Package: libglib2.0-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 + This is a udeb, or a microdeb, for the debian-installer. + . + 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 the minimal runtime library needed by the Debian + installer. + +Package: libglib2.0-dev +Section: libdevel +Architecture: any +Depends: ${misc:Depends}, + libglib2.0-0 (= ${binary:Version}), + pkg-config (>= 0.14.0) +Suggests: libglib2.0-doc +Replaces: libglib1.3-dev +Conflicts: libglib1.3-dev +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 libglib2.0-0, + as only it includes the header files and static libraries (optionally) + needed for compiling. + +Package: libglib2.0-0-dbg +Section: libdevel +Priority: extra +Architecture: any +Depends: ${misc:Depends}, + libglib2.0-0 (= ${binary:Version}) +Conflicts: libglib2.0-dbg +Replaces: libglib2.0-dbg +Description: The GLib libraries and debugging symbols + 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. + +Package: libglib2.0-data +Section: misc +Architecture: all +Depends: ${misc:Depends}, + libglib2.0-0 (>= ${source:Version}) +Replaces: libglib1.3, + libglib1.3-data +Conflicts: libglib1.3-data +Description: Common files for 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 for the runtime libraries to display messages in + languages other than English. + +Package: libglib2.0-doc +Section: doc +Architecture: all +Depends: ${misc:Depends}, + lynx | www-browser +Replaces: libglib1.3-doc +Conflicts: libglib1.3-doc +Suggests: libgtk2.0-doc +Description: Documentation 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 contains the HTML documentation for the GLib library + in /usr/share/doc/libglib2.0-doc/ . + --- glib2.0-2.14.4.orig/debian/libglib2.0-dev.links +++ glib2.0-2.14.4/debian/libglib2.0-dev.links @@ -0,0 +1 @@ +usr/share/doc/libglib2.0-0 usr/share/doc/libglib2.0-dev --- glib2.0-2.14.4.orig/debian/copyright +++ glib2.0-2.14.4/debian/copyright @@ -0,0 +1,52 @@ +This package was debianized by Akira TAGOH on +Thu, 7 Mar 2002 01:05:25 +0900. + +It was downloaded from . + +Original Authors +---------------- +Peter Mattis +Spencer Kimball +Josh MacDonald + +Please do not mail the original authors asking questions about this +version of GLib. + +GLib Team +--------- +Shawn T. Amundson +Jeff Garzik +Raja R Harinath +Tim Janik +Elliot Lee +Tor Lillqvist +Paolo Molaro +Havoc Pennington +Manish Singh +Owen Taylor +Sebastian Wilhelmi + +The random number generator "Mersenne Twister", which is used by GLib, +was developed and originally coded by: +Makoto Matsumoto +Takuji Nishimura + +License: + + This package is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +On Debian systems, the complete text of the GNU Lesser General +Public License can be found in `/usr/share/common-licenses/LGPL'. + --- glib2.0-2.14.4.orig/debian/libglib2.0-doc.install +++ glib2.0-2.14.4/debian/libglib2.0-doc.install @@ -0,0 +1 @@ +debian/install/deb/usr/share/doc/libglib2.0-doc usr/share/doc --- glib2.0-2.14.4.orig/debian/libglib2.0-dbg.install +++ glib2.0-2.14.4/debian/libglib2.0-dbg.install @@ -0,0 +1 @@ +debian/install/deb/usr/lib/debug/lib*.so* usr/lib/debug --- glib2.0-2.14.4.orig/debian/libglib2.0-dev.README.Debian +++ glib2.0-2.14.4/debian/libglib2.0-dev.README.Debian @@ -0,0 +1,15 @@ +GLib2.0 for Debian +------------------- + +Static libraries issue: +Right now glib2.0 provides some static libraries. If your application +uses g_module* functions or other libraries uses g_module* functions and +your application link it, Please don't statically link this libraries. +You may get some strange proglem between static-linked application and +dynamic-loaded modules, g_module* provides the feature for dynamically +loading some modules. +This is well-known bug, so please don't file a bug report. + + + -- Akira TAGOH , Thu, 11 Apr 2002 19:28:50 +0900 + --- glib2.0-2.14.4.orig/debian/libglib2.0-doc.links +++ glib2.0-2.14.4/debian/libglib2.0-doc.links @@ -0,0 +1,3 @@ +usr/share/doc/libgtk2.0-doc/gtk usr/share/doc/libglib2.0-doc/gtk +usr/share/doc/libglib2.0-doc/glib usr/share/gtk-doc/html/glib +usr/share/doc/libglib2.0-doc/gobject usr/share/gtk-doc/html/gobject