r25701 - in /desktop/experimental/libgnomekbd/debian: ./ patches/

sjoerd at users.alioth.debian.org sjoerd at users.alioth.debian.org
Sun Nov 28 18:56:43 UTC 2010 

Author: sjoerd
Date: Sun Nov 28 18:56:40 2010
New Revision: 25701

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=25701
Log:
Package new upstream release

Added:
    desktop/experimental/libgnomekbd/debian/libgnomekbd7.install
      - copied unchanged from r25700, desktop/experimental/libgnomekbd/debian/libgnomekbd4.install
    desktop/experimental/libgnomekbd/debian/patches/0001-Add-gio-to-the-required-pkg-config-modules.patch
Removed:
    desktop/experimental/libgnomekbd/debian/libgnomekbd4.install
    desktop/experimental/libgnomekbd/debian/patches/10_null_style_crasher.patch
    desktop/experimental/libgnomekbd/debian/patches/99_ltmain_as-needed.patch
Modified:
    desktop/experimental/libgnomekbd/debian/changelog
    desktop/experimental/libgnomekbd/debian/control
    desktop/experimental/libgnomekbd/debian/control.in
    desktop/experimental/libgnomekbd/debian/libgnomekbd-common.install
    desktop/experimental/libgnomekbd/debian/patches/01_requires_private.patch
    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=25701&op=diff
==============================================================================
--- desktop/experimental/libgnomekbd/debian/changelog [utf-8] (original)
+++ desktop/experimental/libgnomekbd/debian/changelog [utf-8] Sun Nov 28 18:56:40 2010
@@ -1,3 +1,16 @@
+libgnomekbd (2.91.2-1) UNRELEASED; urgency=low
+
+  * New upstream release
+  * debian/patches/10_null_style_crasher.patch
+    + Removed, fixed upstream
+  * debian/patches/99_ltmain_as-needed.patch
+    + Removed, use dh-autoreconf instead
+  * Bumped soname from 4 to 7
+  * debian/patches/0001-Add-gio-to-the-required-pkg-config-modules.patch
+    + Added. Fix compilation with --as-needed
+
+ -- Sjoerd Simons <sjoerd at debian.org>  Sun, 28 Nov 2010 18:55:18 +0000
+
 libgnomekbd (2.30.2-2) unstable; urgency=low
 
   * 10_null_style_crasher.patch: stolen from upstream git. Fix a crasher 

Modified: desktop/experimental/libgnomekbd/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/libgnomekbd/debian/control?rev=25701&op=diff
==============================================================================
--- desktop/experimental/libgnomekbd/debian/control [utf-8] (original)
+++ desktop/experimental/libgnomekbd/debian/control [utf-8] Sun Nov 28 18:56:40 2010
@@ -7,7 +7,7 @@
 Section: gnome
 Priority: optional
 Maintainer: Loic Minier <lool at dooz.org>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu at debian.org>, Josselin Mouette <joss at debian.org>, Sebastian Dröge <slomo at debian.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu at debian.org>, Josselin Mouette <joss at debian.org>, Sebastian Dröge <slomo at debian.org>, Sjoerd Simons <sjoerd at debian.org>
 Build-Depends: debhelper (>= 5),
         autotools-dev,
         cdbs,

Modified: desktop/experimental/libgnomekbd/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/libgnomekbd/debian/control.in?rev=25701&op=diff
==============================================================================
--- desktop/experimental/libgnomekbd/debian/control.in [utf-8] (original)
+++ desktop/experimental/libgnomekbd/debian/control.in [utf-8] Sun Nov 28 18:56:40 2010
@@ -4,13 +4,13 @@
 Maintainer: Loic Minier <lool at dooz.org>
 Uploaders: @GNOME_TEAM@
 Build-Depends: debhelper (>= 5),
+        dh-autoreconf,
         autotools-dev,
         cdbs,
         gnome-pkg-tools (>= 0.10),
         dpkg-dev (>= 1.13.19),
-        libglib2.0-dev (>= 2.16),
-        libgconf2-dev (>= 2.14.0),
-        libgtk2.0-dev (>= 2.13),
+        libglib2.0-dev (>= 2.26),
+        libgtk3.0-dev,
         libxklavier-dev (>= 5.0),
         intltool (>= 0.35)
 Standards-Version: 3.8.3
@@ -21,11 +21,10 @@
 Conflicts: libgnomekbdui-dev
 Replaces: libgnomekbdui-dev
 Provides: libgnomekbdui-dev
-Depends: libgnomekbd4 (= ${binary:Version}),
+Depends: libgnomekbd7 (= ${binary:Version}),
         ${misc:Depends},
-        libglib2.0-dev (>= 2.16),
-        libgtk2.0-dev (>= 2.13),
-        libgconf2-dev (>= 2.14.0),
+        libglib2.0-dev (>= 2.26),
+        libgtk3.0-dev,
         libxklavier-dev (>= 5.0),
         libx11-dev
 Description: GNOME library to manage keyboard configuration - development files
@@ -36,7 +35,7 @@
  .
  This package contains the development files.
 
-Package: libgnomekbd4
+Package: libgnomekbd7
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends},

Modified: desktop/experimental/libgnomekbd/debian/libgnomekbd-common.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/libgnomekbd/debian/libgnomekbd-common.install?rev=25701&op=diff
==============================================================================
--- desktop/experimental/libgnomekbd/debian/libgnomekbd-common.install [utf-8] (original)
+++ desktop/experimental/libgnomekbd/debian/libgnomekbd-common.install [utf-8] Sun Nov 28 18:56:40 2010
@@ -1,2 +1,1 @@
 debian/tmp/usr/share/locale
-debian/tmp/etc/gconf

Added: desktop/experimental/libgnomekbd/debian/patches/0001-Add-gio-to-the-required-pkg-config-modules.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/libgnomekbd/debian/patches/0001-Add-gio-to-the-required-pkg-config-modules.patch?rev=25701&op=file
==============================================================================
--- desktop/experimental/libgnomekbd/debian/patches/0001-Add-gio-to-the-required-pkg-config-modules.patch (added)
+++ desktop/experimental/libgnomekbd/debian/patches/0001-Add-gio-to-the-required-pkg-config-modules.patch [utf-8] Sun Nov 28 18:56:40 2010
@@ -1,0 +1,46 @@
+From 63f7aefc7916feb90db7910345b03ee0ff568de5 Mon Sep 17 00:00:00 2001
+From: Sjoerd Simons <sjoerd at luon.net>
+Date: Sun, 28 Nov 2010 18:34:23 +0000
+Subject: [PATCH] Add gio to the required pkg-config modules
+
+libgnomekbd uses GSettings, which is part of GIO. If GIO isn't added to the
+pkg-config modules and the LDFLAGS linking will fail when using -Wl,--as-needed
+---
+ configure.in            |    2 +-
+ libgnomekbd/Makefile.am |    2 ++
+ 2 files changed, 3 insertions(+), 1 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index 09985c3..f88ba40 100644
+--- a/configure.in
++++ b/configure.in
+@@ -53,7 +53,7 @@ IT_PROG_INTLTOOL([0.35.0])
+ 
+ AC_CHECK_FUNCS(setlocale)
+ 
+-PKG_CHECK_MODULES(GLIB, glib-2.0 >= $GLIB_REQUIRED)
++PKG_CHECK_MODULES(GLIB, glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED)
+ 
+ AC_SUBST(GLIB_CFLAGS)
+ AC_SUBST(GLIB_LIBS)
+diff --git a/libgnomekbd/Makefile.am b/libgnomekbd/Makefile.am
+index 1f7933d..1afdf3a 100644
+--- a/libgnomekbd/Makefile.am
++++ b/libgnomekbd/Makefile.am
+@@ -26,11 +26,13 @@ libgnomekbd_la_CFLAGS = $(common_CFLAGS)
+ 
+ libgnomekbdui_la_CFLAGS = $(common_CFLAGS)		\
+ 	-DUIDIR=\"$(uidir)\"				\
++	$(GLIB_CFLAGS) \
+ 	$(GTK_CFLAGS)
+ 
+ common_LDFLAGS = -version-info @VERSION_INFO@ -no-undefined
+ 
+ common_LIBADD = \
++		$(GLIB_LIBS) \
+ 		$(GDK_LIBS) \
+ 		$(LIBXKLAVIER_LIBS) \
+ 		$(XLIB_LIBS)
+-- 
+1.7.2.3
+

Modified: desktop/experimental/libgnomekbd/debian/patches/01_requires_private.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/libgnomekbd/debian/patches/01_requires_private.patch?rev=25701&op=diff
==============================================================================
--- desktop/experimental/libgnomekbd/debian/patches/01_requires_private.patch [utf-8] (original)
+++ desktop/experimental/libgnomekbd/debian/patches/01_requires_private.patch [utf-8] Sun Nov 28 18:56:40 2010
@@ -6,8 +6,8 @@
  Name: libgnomekbd
  Description: GNOME keyboard shared library
  Version: @VERSION@
--Requires: gmodule-export-2.0 gdk-2.0 >= @GDK_REQUIRED@ gconf-2.0 >= @GCONF_REQUIRED@ libxklavier >= @LIBXKLAVIER_REQUIRED@
+-Requires: gmodule-export-2.0 gdk-2.0 >= @GDK_REQUIRED@ libxklavier >= @LIBXKLAVIER_REQUIRED@
 +Requires: gmodule-export-2.0 
-+Requires.private: gdk-2.0 >= @GDK_REQUIRED@ gconf-2.0 >= @GCONF_REQUIRED@ libxklavier >= @LIBXKLAVIER_REQUIRED@
++Requires.private: gdk-2.0 >= @GDK_REQUIRED@ libxklavier >= @LIBXKLAVIER_REQUIRED@
  Libs: -L${libdir} -lgnomekbd
  Cflags: -I${includedir}

Modified: desktop/experimental/libgnomekbd/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/libgnomekbd/debian/patches/series?rev=25701&op=diff
==============================================================================
--- desktop/experimental/libgnomekbd/debian/patches/series [utf-8] (original)
+++ desktop/experimental/libgnomekbd/debian/patches/series [utf-8] Sun Nov 28 18:56:40 2010
@@ -1,3 +1,2 @@
+0001-Add-gio-to-the-required-pkg-config-modules.patch
 01_requires_private.patch
-10_null_style_crasher.patch
-99_ltmain_as-needed.patch

Modified: desktop/experimental/libgnomekbd/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/libgnomekbd/debian/rules?rev=25701&op=diff
==============================================================================
--- desktop/experimental/libgnomekbd/debian/rules [utf-8] (original)
+++ desktop/experimental/libgnomekbd/debian/rules [utf-8] Sun Nov 28 18:56:40 2010
@@ -1,11 +1,11 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/rules/debhelper.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
 
-DEB_DH_MAKESHLIBS_ARGS_libgnomekbd4 += -V 'libgnomekbd4 (>= 2.29.5)'
+DEB_DH_MAKESHLIBS_ARGS_libgnomekbd7 += -V 'libgnomekbd7'

More information about the pkg-gnome-commits mailing list