r34884 - in /desktop/experimental/glib2.0/debian: changelog patches/04_homedir_env.patch patches/95_configure-Fix-typo-in-ELF-check.patch patches/96_configure-Reset-LIBS-after-ELF-check.patch patches/series

[mpitt at users.alioth.debian.org]

Author: mpitt
Date: Tue May 15 13:09:07 2012
New Revision: 34884

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=34884
Log:
* New upstream release.
* 04_homedir_env.patch: Adjust for new release.
* Drop 95_configure-Fix-typo-in-ELF-check.patch and
  96_configure-Reset-LIBS-after-ELF-check.patch: upstream now.

Removed:
    desktop/experimental/glib2.0/debian/patches/95_configure-Fix-typo-in-ELF-check.patch
    desktop/experimental/glib2.0/debian/patches/96_configure-Reset-LIBS-after-ELF-check.patch
Modified:
    desktop/experimental/glib2.0/debian/changelog
    desktop/experimental/glib2.0/debian/patches/04_homedir_env.patch
    desktop/experimental/glib2.0/debian/patches/series

Modified: desktop/experimental/glib2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/changelog?rev=34884&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/changelog [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/changelog [utf-8] Tue May 15 13:09:07 2012
@@ -1,8 +1,12 @@
-glib2.0 (2.32.2-2) UNRELEASED; urgency=low
+glib2.0 (2.33.1-1) UNRELEASED; urgency=low
 
   * debian/control.in: Update Vcs-* for experimental branch.
   * Drop 03_revert_git_single_include_error.patch. For GNOME 3.5.x we want to
     properly fix the reverse dependencies. NB this is NOT for Debian wheezy.
+  * New upstream release.
+  * 04_homedir_env.patch: Adjust for new release.
+  * Drop 95_configure-Fix-typo-in-ELF-check.patch and
+    96_configure-Reset-LIBS-after-ELF-check.patch: upstream now.
 
  -- Martin Pitt <mpitt at debian.org>  Tue, 15 May 2012 15:01:33 +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=34884&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] Tue May 15 13:09:07 2012
@@ -4,10 +4,10 @@
 Author: Josselin Mouette <joss at debian.org>
 Origin: vendor
 
-Index: glib2.0/docs/reference/glib/running.sgml
+Index: glib2.0-exp/docs/reference/glib/running.xml
 ===================================================================
---- glib2.0.orig/docs/reference/glib/running.sgml	2011-11-28 22:40:42.000000000 -0200
-+++ glib2.0/docs/reference/glib/running.sgml	2012-03-02 00:38:00.230665860 -0300
+--- glib2.0-exp.orig/docs/reference/glib/running.xml	2012-05-01 07:22:53.000000000 +0200
++++ glib2.0-exp/docs/reference/glib/running.xml	2012-05-15 15:06:13.030894814 +0200
 @@ -244,6 +244,22 @@
    </para>
  </formalpara>
@@ -31,10 +31,10 @@
  </refsect2>
  
  <refsect2 id="setlocale">
-Index: glib2.0/glib/gutils.c
+Index: glib2.0-exp/glib/gutils.c
 ===================================================================
---- glib2.0.orig/glib/gutils.c	2012-01-03 14:44:55.000000000 -0200
-+++ glib2.0/glib/gutils.c	2012-03-02 00:38:00.230665860 -0300
+--- glib2.0-exp.orig/glib/gutils.c	2012-04-13 01:39:20.000000000 +0200
++++ glib2.0-exp/glib/gutils.c	2012-05-15 15:04:24.086889541 +0200
 @@ -686,11 +686,14 @@
      }
  #endif	/* !G_OS_WIN32 */

Modified: desktop/experimental/glib2.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/series?rev=34884&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/series [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/patches/series [utf-8] Tue May 15 13:09:07 2012
@@ -5,5 +5,3 @@
 61_glib-compile-binaries-path.patch
 90_gio-modules-multiarch-compat.patch
 91_revert_schema_path_warning.patch
-95_configure-Fix-typo-in-ELF-check.patch
-96_configure-Reset-LIBS-after-ELF-check.patch