r26110 - in /desktop/experimental/libgnomekbd/debian: changelog control control.in patches/02-fix-for-newer-gtk.patch patches/100_gdkwindow_patch.patch patches/series rules

pochu at users.alioth.debian.org pochu at users.alioth.debian.org
Sun Jan 2 19:52:47 UTC 2011 

Author: pochu
Date: Sun Jan  2 19:52:45 2011
New Revision: 26110

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=26110
Log:
* New upstream release.
  + debian/patches/02-fix-for-newer-gtk.patch:
    - Patch from upstream git master, fix build with gtk+ 2.91.7.
  + debian/patches/100_gdkwindow_patch.patch:
    - Removed, fixed upstream.
  + debian/control.in:
    - Bump libgtk3.0-dev requirement.

Added:
    desktop/experimental/libgnomekbd/debian/patches/02-fix-for-newer-gtk.patch
Removed:
    desktop/experimental/libgnomekbd/debian/patches/100_gdkwindow_patch.patch
Modified:
    desktop/experimental/libgnomekbd/debian/changelog
    desktop/experimental/libgnomekbd/debian/control
    desktop/experimental/libgnomekbd/debian/control.in
    desktop/experimental/libgnomekbd/debian/patches/series
    desktop/experimental/libgnomekbd/debian/rules

Modified: desktop/experimental/libgnomekbd/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/libgnomekbd/debian/changelog?rev=26110&op=diff
==============================================================================
--- desktop/experimental/libgnomekbd/debian/changelog [utf-8] (original)
+++ desktop/experimental/libgnomekbd/debian/changelog [utf-8] Sun Jan  2 19:52:45 2011
@@ -1,3 +1,15 @@
+libgnomekbd (2.91.4-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+    + debian/patches/02-fix-for-newer-gtk.patch:
+      - Patch from upstream git master, fix build with gtk+ 2.91.7.
+    + debian/patches/100_gdkwindow_patch.patch:
+      - Removed, fixed upstream.
+    + debian/control.in:
+      - Bump libgtk3.0-dev requirement.
+
+ -- Emilio Pozuelo Monfort <pochu at debian.org>  Sun, 02 Jan 2011 18:53:07 +0000
+
 libgnomekbd (2.91.3.1-2) experimental; urgency=low
 
   + debian/patches/100_gdkwindow_patch.patch:

Modified: desktop/experimental/libgnomekbd/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/libgnomekbd/debian/control?rev=26110&op=diff
==============================================================================
--- desktop/experimental/libgnomekbd/debian/control [utf-8] (original)
+++ desktop/experimental/libgnomekbd/debian/control [utf-8] Sun Jan  2 19:52:45 2011
@@ -15,7 +15,7 @@
         gnome-pkg-tools (>= 0.10),
         dpkg-dev (>= 1.13.19),
         libglib2.0-dev (>= 2.26),
-        libgtk3.0-dev (>= 2.91.6),
+        libgtk3.0-dev (>= 2.91.7),
         libxklavier-dev (>= 5.0),
         intltool (>= 0.35)
 Standards-Version: 3.9.1
@@ -29,7 +29,7 @@
 Depends: libgnomekbd7 (= ${binary:Version}),
         ${misc:Depends},
         libglib2.0-dev (>= 2.26),
-        libgtk3.0-dev,
+        libgtk3.0-dev (>= 2.91.7),
         libxklavier-dev (>= 5.0),
         libx11-dev
 Description: GNOME library to manage keyboard configuration - development files

Modified: desktop/experimental/libgnomekbd/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/libgnomekbd/debian/control.in?rev=26110&op=diff
==============================================================================
--- desktop/experimental/libgnomekbd/debian/control.in [utf-8] (original)
+++ desktop/experimental/libgnomekbd/debian/control.in [utf-8] Sun Jan  2 19:52:45 2011
@@ -10,7 +10,7 @@
         gnome-pkg-tools (>= 0.10),
         dpkg-dev (>= 1.13.19),
         libglib2.0-dev (>= 2.26),
-        libgtk3.0-dev (>= 2.91.6),
+        libgtk3.0-dev (>= 2.91.7),
         libxklavier-dev (>= 5.0),
         intltool (>= 0.35)
 Standards-Version: 3.9.1
@@ -24,7 +24,7 @@
 Depends: libgnomekbd7 (= ${binary:Version}),
         ${misc:Depends},
         libglib2.0-dev (>= 2.26),
-        libgtk3.0-dev,
+        libgtk3.0-dev (>= 2.91.7),
         libxklavier-dev (>= 5.0),
         libx11-dev
 Description: GNOME library to manage keyboard configuration - development files

Added: desktop/experimental/libgnomekbd/debian/patches/02-fix-for-newer-gtk.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/libgnomekbd/debian/patches/02-fix-for-newer-gtk.patch?rev=26110&op=file
==============================================================================
--- desktop/experimental/libgnomekbd/debian/patches/02-fix-for-newer-gtk.patch (added)
+++ desktop/experimental/libgnomekbd/debian/patches/02-fix-for-newer-gtk.patch [utf-8] Sun Jan  2 19:52:45 2011
@@ -1,0 +1,34 @@
+From e431fae90ed97debb86fc9e0c89622e524feb213 Mon Sep 17 00:00:00 2001
+From: Saleem Abdulrasool <compnerd at compnerd.org>
+Date: Wed, 22 Dec 2010 17:08:04 -0800
+Subject: [PATCH] fix for newer gtk+
+
+---
+ configure.in |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index f50990d..59a8753 100644
+--- a/configure.in
++++ b/configure.in
+@@ -16,7 +16,7 @@ dnl ***************************************************************************
+ dnl *** Minimum library versions for libgnomekbd                            ***
+ dnl ***************************************************************************
+ GLIB_REQUIRED=2.18
+-GDK_REQUIRED=2.18
++GDK_REQUIRED=2.91.7
+ GTK_REQUIRED=2.90
+ LIBXKLAVIER_REQUIRED=5.0
+ 
+@@ -63,7 +63,7 @@ PKG_CHECK_MODULES(GDK, gdk-3.0 >= $GDK_REQUIRED)
+ AC_SUBST(GDK_CFLAGS)
+ AC_SUBST(GDK_LIBS)
+ 
+-PKG_CHECK_MODULES(GTK, gtk+-3.0 >= $GTK_REQUIRED gdk-x11-3.0 >= $GDK_REQUIRED)
++PKG_CHECK_MODULES(GTK, gtk+-3.0 >= $GTK_REQUIRED)
+ 
+ AC_SUBST(GTK_CFLAGS)
+ AC_SUBST(GTK_LIBS)
+-- 
+1.7.2.3
+

Modified: desktop/experimental/libgnomekbd/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/libgnomekbd/debian/patches/series?rev=26110&op=diff
==============================================================================
--- desktop/experimental/libgnomekbd/debian/patches/series [utf-8] (original)
+++ desktop/experimental/libgnomekbd/debian/patches/series [utf-8] Sun Jan  2 19:52:45 2011
@@ -1,2 +1,2 @@
 01_requires_private.patch
-100_gdkwindow_patch.patch
+02-fix-for-newer-gtk.patch

Modified: desktop/experimental/libgnomekbd/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/libgnomekbd/debian/rules?rev=26110&op=diff
==============================================================================
--- desktop/experimental/libgnomekbd/debian/rules [utf-8] (original)
+++ desktop/experimental/libgnomekbd/debian/rules [utf-8] Sun Jan  2 19:52:45 2011
@@ -1,10 +1,10 @@
 #!/usr/bin/make -f
 
+include /usr/share/cdbs/1/rules/autoreconf.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/utils.mk
 include /usr/share/cdbs/1/class/gnome.mk
 include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
-include /usr/share/cdbs/1/rules/autoreconf.mk
 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
 LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed

More information about the pkg-gnome-commits mailing list