r25689 - in /desktop/experimental/gconf/debian: changelog control control.in patches/03_error_message.patch patches/series rules

[sjoerd at users.alioth.debian.org]

Author: sjoerd
Date: Sat Nov 27 23:18:03 2010
New Revision: 25689

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=25689
Log:
Finish packaging new upstream release, target experimental

Removed:
    desktop/experimental/gconf/debian/patches/03_error_message.patch
Modified:
    desktop/experimental/gconf/debian/changelog
    desktop/experimental/gconf/debian/control
    desktop/experimental/gconf/debian/control.in
    desktop/experimental/gconf/debian/patches/series
    desktop/experimental/gconf/debian/rules

Modified: desktop/experimental/gconf/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gconf/debian/changelog?rev=25689&op=diff
==============================================================================
--- desktop/experimental/gconf/debian/changelog [utf-8] (original)
+++ desktop/experimental/gconf/debian/changelog [utf-8] Sat Nov 27 23:18:03 2010
@@ -1,5 +1,6 @@
-gconf (2.31.5-2) UNRELEASED; urgency=low
-
+gconf (2.32.1-1) experimental; urgency=low
+
+  [ Josselin Mouette ]
   * Include patch-translations.mk, bump build-depends accordingly.
   * Include 03_error_message.patch in POTFILES.in.
   * pt_BR.po: Brazilian Portuguese translation. Closes: #599032.
@@ -13,7 +14,16 @@
   * 04_manpage.patch: patch from A. Costa. Fixes typos in the manual 
     page. Closes: #600899.
 
- -- Josselin Mouette <joss at debian.org>  Sat, 09 Oct 2010 09:59:07 +0200
+  [ Sjoerd Simons ]
+  * New upstream release
+  * Bump gobject-introspection to the lastest version to generate the most
+    recent .gir version
+  * debian/patches/03_error_message.patch
+    + Removed, merged upstream
+  * debian/rules:
+    + Specify compilation with gtk2
+
+ -- Sjoerd Simons <sjoerd at debian.org>  Sat, 27 Nov 2010 23:17:47 +0000
 
 gconf (2.31.5-1) experimental; urgency=low
 

Modified: desktop/experimental/gconf/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gconf/debian/control?rev=25689&op=diff
==============================================================================
--- desktop/experimental/gconf/debian/control [utf-8] (original)
+++ desktop/experimental/gconf/debian/control [utf-8] Sat Nov 27 23:18:03 2010
@@ -29,8 +29,8 @@
                python-support (>= 0.5.3),
                autotools-dev,
                libglib2.0-doc,
-               gobject-introspection,
-               libgirepository1.0-dev (>= 0.6.7),
+               gobject-introspection (>= 0.9.12),
+               libgirepository1.0-dev (>= 0.9.12),
                gir1.0-glib-2.0
 Standards-Version: 3.8.4
 Homepage:  http://projects.gnome.org/gconf/

Modified: desktop/experimental/gconf/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gconf/debian/control.in?rev=25689&op=diff
==============================================================================
--- desktop/experimental/gconf/debian/control.in [utf-8] (original)
+++ desktop/experimental/gconf/debian/control.in [utf-8] Sat Nov 27 23:18:03 2010
@@ -24,8 +24,8 @@
                python-support (>= 0.5.3),
                autotools-dev,
                libglib2.0-doc,
-               gobject-introspection,
-               libgirepository1.0-dev (>= 0.6.7),
+               gobject-introspection (>= 0.9.12),
+               libgirepository1.0-dev (>= 0.9.12),
                gir1.0-glib-2.0
 Standards-Version: 3.8.4
 Homepage:  http://projects.gnome.org/gconf/

Modified: desktop/experimental/gconf/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gconf/debian/patches/series?rev=25689&op=diff
==============================================================================
--- desktop/experimental/gconf/debian/patches/series [utf-8] (original)
+++ desktop/experimental/gconf/debian/patches/series [utf-8] Sat Nov 27 23:18:03 2010
@@ -1,5 +1,4 @@
 01_defaults_path.patch
 02_fix_wrong_return_value.patch
-03_error_message.patch
 04_manpage.patch
 25_gconf-path-max-hurd.patch

Modified: desktop/experimental/gconf/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gconf/debian/rules?rev=25689&op=diff
==============================================================================
--- desktop/experimental/gconf/debian/rules [utf-8] (original)
+++ desktop/experimental/gconf/debian/rules [utf-8] Sat Nov 27 23:18:03 2010
@@ -24,7 +24,8 @@
 		/usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/docbook.xsl $<
 
 DEB_INSTALL_DOCS_gconf2 += doc/FAQ.txt NEWS README TODO
-DEB_CONFIGURE_EXTRA_FLAGS += --enable-gtk-doc --libexecdir=/usr/lib/libgconf2-4
+DEB_CONFIGURE_EXTRA_FLAGS += --enable-gtk-doc --libexecdir=/usr/lib/libgconf2-4 \
+  --with-gtk=2.0
 DEB_MAKE_INVOKE += pkglibdir=/usr/lib/libgconf2-4
 
 LDFLAGS += -Wl,-z,defs -Wl,--as-needed