r12359 - in /desktop/unstable/glib2.0/debian: changelog patches/90_fix-abi-check-with-debug.patch patches/90_from_svn_fix_missing_pointer_casting.patch patches/series rules

Mon Aug 20 20:20:43 UTC 2007

Author: lool
Date: Mon Aug 20 20:20:43 2007
New Revision: 12359

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=12359
Log:
* 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.

Added:
    desktop/unstable/glib2.0/debian/patches/90_fix-abi-check-with-debug.patch
Removed:
    desktop/unstable/glib2.0/debian/patches/90_from_svn_fix_missing_pointer_casting.patch
Modified:
    desktop/unstable/glib2.0/debian/changelog
    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=12359&op=diff
==============================================================================

--- desktop/unstable/glib2.0/debian/changelog (original)
+++ desktop/unstable/glib2.0/debian/changelog Mon Aug 20 20:20:43 2007
@@ -1,9 +1,12 @@
-glib2.0 (2.13.7-4) UNRELEASED; urgency=low
+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.
-
- -- Loic Minier <lool at dooz.org>  Thu, 16 Aug 2007 17:10:49 +0200
+  * 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.
+
+ -- Loic Minier <lool at dooz.org>  Mon, 20 Aug 2007 21:54:07 +0200
 
 glib2.0 (2.13.7-3) experimental; urgency=low
 

Added: desktop/unstable/glib2.0/debian/patches/90_fix-abi-check-with-debug.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/patches/90_fix-abi-check-with-debug.patch?rev=12359&op=file
==============================================================================
--- desktop/unstable/glib2.0/debian/patches/90_fix-abi-check-with-debug.patch (added)
+++ desktop/unstable/glib2.0/debian/patches/90_fix-abi-check-with-debug.patch Mon Aug 20 20:20:43 2007
@@ -1,0 +1,55 @@
+From SVN r5683 and r5687; fix build
+
+2007-08-08  Matthias Clasen  <mclasen at redhat.com>
+
+	* glib/glib.symbols:
+	* glib/Makefile.am:
+	* glib/abicheck.sh: Make it work regardless of --enable-debug
+
+--- glib/Makefile.am.orig	2007-08-03 19:52:48.000000000 +0200
++++ glib/Makefile.am	2007-08-20 21:55:37.000000000 +0200
+@@ -36,6 +36,7 @@
+ 
+ if OS_LINUX
+ if HAVE_GNUC_VISIBILITY
++TESTS_ENVIRONMENT = GLIB_DEBUG_FLAGS="$(GLIB_DEBUG_FLAGS)"
+ TESTS = abicheck.sh pltcheck.sh
+ endif
+ endif
+--- glib/Makefile.in.orig	2007-08-20 21:55:45.000000000 +0200
++++ glib/Makefile.in	2007-08-20 21:55:59.000000000 +0200
+@@ -265,6 +265,7 @@
+ 	$(GLIB_DEBUG_FLAGS) -DG_DISABLE_DEPRECATED -DGLIB_COMPILATION 
+ 
+ 
++ at HAVE_GNUC_VISIBILITY_TRUE@@OS_LINUX_TRUE at TESTS_ENVIRONMENT = GLIB_DEBUG_FLAGS="$(GLIB_DEBUG_FLAGS)"
+ @HAVE_GNUC_VISIBILITY_TRUE@@OS_LINUX_TRUE at TESTS = abicheck.sh pltcheck.sh
+ 
+ BUILT_SOURCES = galias.h galiasdef.c
+--- glib/abicheck.sh.orig	2007-08-03 19:52:48.000000000 +0200
++++ glib/abicheck.sh	2007-08-20 21:55:37.000000000 +0200
+@@ -3,7 +3,7 @@
+ egrep '^#([^i]|if).*[^\]$' "${top_builddir:-..}/glibconfig.h" > glibconfig.cpp
+ 
+ INCLUDES="-include ${top_builddir:-..}/config.h"
+-INCLUDES="$INCLUDES -include glibconfig.cpp"
++INCLUDES="$INCLUDES -include glibconfig.cpp $GLIB_DEBUG_FLAGS"
+ 
+ cpp -P -DINCLUDE_INTERNAL_SYMBOLS -DINCLUDE_VARIABLES -DG_STDIO_NO_WRAP_ON_UNIX -DALL_FILES $INCLUDES "${srcdir:-.}/glib.symbols" | sed -e '/^$/d' -e 's/ G_GNUC.*$//' -e 's/ PRIVATE$//' | sort > expected-abi
+ rm -f glibconfig.cpp
+--- glib/glib.symbols.orig	2007-08-03 19:52:48.000000000 +0200
++++ glib/glib.symbols	2007-08-20 21:55:37.000000000 +0200
+@@ -691,11 +691,13 @@
+ g_slice_set_config
+ g_slice_get_config
+ g_slice_get_config_state
++#ifdef G_ENABLE_DEBUG
+ #ifdef INCLUDE_INTERNAL_SYMBOLS
+ g_slice_debug_tree_statistics
+ #endif
+ #endif
+ #endif
++#endif
+ 
+ #if IN_HEADER(__G_MESSAGES_H__)
+ #if IN_FILE(__G_MESSAGES_C__)

Modified: desktop/unstable/glib2.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/patches/series?rev=12359&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/patches/series (original)
+++ desktop/unstable/glib2.0/debian/patches/series Mon Aug 20 20:20:43 2007
@@ -1,4 +1,4 @@
 #01_gettext_desktopfiles.patch
 60_wait-longer-for-threads-to-die.patch
 67_gcc43-inline.patch
-90_from_svn_fix_missing_pointer_casting.patch
+90_fix-abi-check-with-debug.patch -p0

Modified: desktop/unstable/glib2.0/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/rules?rev=12359&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/rules (original)
+++ desktop/unstable/glib2.0/debian/rules Mon Aug 20 20:20:43 2007
@@ -39,7 +39,7 @@
 
 APIVER := 2.0
 SONAME := 0
-SHVER := 2.13.7
+SHVER := 2.14.0
 
 # package names
 SHARED_PKG := libglib$(APIVER)-$(SONAME)


