r14153 - in /desktop/unstable/glib2.0/debian: changelog control control.in patches/67_gcc43-inline.patch rules

[slomo at users.alioth.debian.org]

Author: slomo
Date: Sat Jan 12 06:11:10 2008
New Revision: 14153

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=14153
Log:
* New upstream bugfix release:
  + debian/patches/67_gcc43-inline.patch:
    - Dropped, merged upstream.
* debian/control.in,
  debian/rules:
  + Build depend on pcre >= 7.4-1 and use the system pcre for the udeb too
    now that there is a pcre udeb.

Removed:
    desktop/unstable/glib2.0/debian/patches/67_gcc43-inline.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/rules

Modified: desktop/unstable/glib2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/changelog?rev=14153&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/changelog (original)
+++ desktop/unstable/glib2.0/debian/changelog Sat Jan 12 06:11:10 2008
@@ -1,10 +1,13 @@
-glib2.0 (2.14.4-3) UNRELEASED; urgency=low
+glib2.0 (2.14.5-1) UNRELEASED; urgency=low
 
   [ Loic Minier ]
   * Build-dep on gtk-doc-tools to prevent a spurious warning from
     gtk-doc.make: "/bin/sh: line 11: test: !=: unary operator expected".
 
   [ Sebastian Dröge ]
+  * New upstream bugfix release:
+    + debian/patches/67_gcc43-inline.patch:
+      - Dropped, merged upstream.
   * debian/rules,
     debian/libglib2.0-0.symbols,
     debian/control.in:
@@ -14,8 +17,12 @@
       Require dpkg-dev (>= 1.14.8) for this.
   * debian/control.in:
     + Update Standards-Version to 3.7.3, no additional changes needed.
-
- -- Sebastian Dröge <slomo at debian.org>  Sat, 05 Jan 2008 13:18:15 +0100
+  * debian/control.in,
+    debian/rules:
+    + Build depend on pcre >= 7.4-1 and use the system pcre for the udeb too
+      now that there is a pcre udeb.
+
+ -- Sebastian Dröge <slomo at debian.org>  Sat, 12 Jan 2008 07:05:14 +0100
 
 glib2.0 (2.14.4-2) unstable; urgency=low
 

Modified: desktop/unstable/glib2.0/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/control?rev=14153&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/control (original)
+++ desktop/unstable/glib2.0/debian/control Sat Jan 12 06:11:10 2008
@@ -10,7 +10,7 @@
                gnome-pkg-tools (>= 0.11),
                quilt,
                dpkg-dev (>= 1.13.19),
-               libpcre3-dev (>= 7.2),
+               libpcre3-dev (>= 7.4-1),
                gtk-doc-tools,
                dpkg-dev (>= 1.14.8)
 Standards-Version: 3.7.3

Modified: desktop/unstable/glib2.0/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/control.in?rev=14153&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/control.in (original)
+++ desktop/unstable/glib2.0/debian/control.in Sat Jan 12 06:11:10 2008
@@ -10,7 +10,7 @@
                gnome-pkg-tools (>= 0.11),
                quilt,
                dpkg-dev (>= 1.13.19),
-               libpcre3-dev (>= 7.2),
+               libpcre3-dev (>= 7.4-1),
                gtk-doc-tools,
                dpkg-dev (>= 1.14.8)
 Standards-Version: 3.7.3

Modified: desktop/unstable/glib2.0/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/rules?rev=14153&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/rules (original)
+++ desktop/unstable/glib2.0/debian/rules Sat Jan 12 06:11:10 2008
@@ -79,15 +79,15 @@
 			--prefix=/usr \
 			--mandir=\$${prefix}/share/man \
 			--infodir=\$${prefix}/share/info \
-			--with-html-dir=\$${prefix}/share/doc/$(DOC_PKG)
+			--with-html-dir=\$${prefix}/share/doc/$(DOC_PKG) \
+			--with-pcre=system
 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
+			--enable-static
 udeb_configure_flags := $(common_configure_flags)
 
 $(STAMP_DIR)/patch-stamp: