r14131 - in /desktop/experimental/glib2.0/debian: changelog control control.in rules

[lool at users.alioth.debian.org]

Author: lool
Date: Fri Jan 11 20:19:38 2008
New Revision: 14131

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=14131
Log:
* Build udeb against system pcre again (now that it provides an udeb); bump
  up libpcre build-dep to >= 7.4-1.

Modified:
    desktop/experimental/glib2.0/debian/changelog
    desktop/experimental/glib2.0/debian/control
    desktop/experimental/glib2.0/debian/control.in
    desktop/experimental/glib2.0/debian/rules

Modified: desktop/experimental/glib2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/changelog?rev=14131&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/changelog (original)
+++ desktop/experimental/glib2.0/debian/changelog Fri Jan 11 20:19:38 2008
@@ -1,6 +1,6 @@
 glib2.0 (2.15.1-1) experimental; urgency=low
 
-  [Sebastian Dröge]
+  [ Sebastian Dröge ]
   * New upstream development release, the new API may still change
     incompatibly; API additions:
     + Drop patch 67_gcc43-inline.patch, merged upstream.
@@ -18,9 +18,11 @@
   * debian/control.in:
     + Recommend python on the -dev package for the gtester-report utility.
 
-  [Loic Minier]
+  [ 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".
+  * Build udeb against system pcre again (now that it provides an udeb); bump
+    up libpcre build-dep to >= 7.4-1.
 
  -- Sebastian Dröge <slomo at debian.org>  Sat, 05 Jan 2008 17:27:00 +0100
 

Modified: desktop/experimental/glib2.0/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/control?rev=14131&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/control (original)
+++ desktop/experimental/glib2.0/debian/control Fri Jan 11 20:19:38 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,
                libselinux1-dev | not+linux-gnu,
                linux-libc-dev | not+linux-gnu,

Modified: desktop/experimental/glib2.0/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/control.in?rev=14131&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/control.in (original)
+++ desktop/experimental/glib2.0/debian/control.in Fri Jan 11 20:19:38 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,
                libselinux1-dev | not+linux-gnu,
                linux-libc-dev | not+linux-gnu,

Modified: desktop/experimental/glib2.0/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/rules?rev=14131&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/rules (original)
+++ desktop/experimental/glib2.0/debian/rules Fri Jan 11 20:19:38 2008
@@ -81,15 +81,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: