r26724 - in /desktop/unstable/control-center/debian: changelog control control.in patches/02_keyboard_ldflags.patch patches/70_relibtoolize.patch patches/99_ltmain_as-needed.patch patches/series rules source/ source/format

pochu at users.alioth.debian.org pochu at users.alioth.debian.org
Sat Feb 26 17:25:04 UTC 2011 

Author: pochu
Date: Sat Feb 26 17:25:01 2011
New Revision: 26724

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=26724
Log:
* debian/patches/02_keyboard_ldflags.patch:
  + Link the keyboard panel against libxklavier. Fixes build with
    --as-needed. Closes: #554117.
* debian/patches/70_relibtoolize.patch,
  debian/patches/99_ltmain_as-needed.patch:
  + Removed, superseded by...
* debian/control.in,
  debian/rules:
  + Use dh-autoreconf.

Added:
    desktop/unstable/control-center/debian/patches/02_keyboard_ldflags.patch
    desktop/unstable/control-center/debian/source/
    desktop/unstable/control-center/debian/source/format
Removed:
    desktop/unstable/control-center/debian/patches/70_relibtoolize.patch
    desktop/unstable/control-center/debian/patches/99_ltmain_as-needed.patch
Modified:
    desktop/unstable/control-center/debian/changelog
    desktop/unstable/control-center/debian/control
    desktop/unstable/control-center/debian/control.in
    desktop/unstable/control-center/debian/patches/series
    desktop/unstable/control-center/debian/rules

Modified: desktop/unstable/control-center/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/control-center/debian/changelog?rev=26724&op=diff
==============================================================================
--- desktop/unstable/control-center/debian/changelog [utf-8] (original)
+++ desktop/unstable/control-center/debian/changelog [utf-8] Sat Feb 26 17:25:01 2011
@@ -1,3 +1,17 @@
+control-center (1:2.30.1-3) unstable; urgency=low
+
+  * debian/patches/02_keyboard_ldflags.patch:
+    + Link the keyboard panel against libxklavier. Fixes build with
+      --as-needed. Closes: #554117.
+  * debian/patches/70_relibtoolize.patch,
+    debian/patches/99_ltmain_as-needed.patch:
+    + Removed, superseded by...
+  * debian/control.in,
+    debian/rules:
+    + Use dh-autoreconf.
+
+ -- Emilio Pozuelo Monfort <pochu at debian.org>  Sat, 26 Feb 2011 17:22:49 +0000
+
 control-center (1:2.30.1-2) unstable; urgency=low
 
   * debian/control.in:

Modified: desktop/unstable/control-center/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/control-center/debian/control?rev=26724&op=diff
==============================================================================
--- desktop/unstable/control-center/debian/control [utf-8] (original)
+++ desktop/unstable/control-center/debian/control [utf-8] Sat Feb 26 17:25:01 2011
@@ -11,9 +11,9 @@
 Standards-Version: 3.8.3
 Build-Depends: cdbs (>= 0.4.41),
                gnome-pkg-tools (>= 0.10),
-               quilt,
-               dpkg-dev (>= 1.13.19),
+               dh-autoreconf,
                debhelper (>= 5.0.0),
+               gnome-common,
                docbook-to-man,
                autotools-dev,
                type-handling (>= 0.2.8),

Modified: desktop/unstable/control-center/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/control-center/debian/control.in?rev=26724&op=diff
==============================================================================
--- desktop/unstable/control-center/debian/control.in [utf-8] (original)
+++ desktop/unstable/control-center/debian/control.in [utf-8] Sat Feb 26 17:25:01 2011
@@ -6,9 +6,9 @@
 Standards-Version: 3.8.3
 Build-Depends: cdbs (>= 0.4.41),
                gnome-pkg-tools (>= 0.10),
-               quilt,
-               dpkg-dev (>= 1.13.19),
+               dh-autoreconf,
                debhelper (>= 5.0.0),
+               gnome-common,
                docbook-to-man,
                autotools-dev,
                type-handling (>= 0.2.8),

Added: desktop/unstable/control-center/debian/patches/02_keyboard_ldflags.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/control-center/debian/patches/02_keyboard_ldflags.patch?rev=26724&op=file
==============================================================================
--- desktop/unstable/control-center/debian/patches/02_keyboard_ldflags.patch (added)
+++ desktop/unstable/control-center/debian/patches/02_keyboard_ldflags.patch [utf-8] Sat Feb 26 17:25:01 2011
@@ -1,0 +1,11 @@
+--- a/capplets/keyboard/Makefile.am
++++ b/capplets/keyboard/Makefile.am
+@@ -15,7 +15,7 @@
+ 	gnome-keyboard-properties-xkbpv.c \
+ 	gnome-keyboard-properties-xkb.h
+ 
+-gnome_keyboard_properties_LDADD = $(GNOMECC_CAPPLETS_LIBS) $(LIBGNOMEKBDUI_LIBS)
++gnome_keyboard_properties_LDADD = $(GNOMECC_CAPPLETS_LIBS) $(LIBGNOMEKBDUI_LIBS) $(LIBGNOMEKBD_LIBS)
+ 
+ @INTLTOOL_DESKTOP_RULE@
+ 

Modified: desktop/unstable/control-center/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/control-center/debian/patches/series?rev=26724&op=diff
==============================================================================
--- desktop/unstable/control-center/debian/patches/series [utf-8] (original)
+++ desktop/unstable/control-center/debian/patches/series [utf-8] Sat Feb 26 17:25:01 2011
@@ -1,4 +1,3 @@
 01_ml_po.patch
+02_keyboard_ldflags.patch
 25_window_manager_settings.patch
-70_relibtoolize.patch
-99_ltmain_as-needed.patch

Modified: desktop/unstable/control-center/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/control-center/debian/rules?rev=26724&op=diff
==============================================================================
--- desktop/unstable/control-center/debian/rules [utf-8] (original)
+++ desktop/unstable/control-center/debian/rules [utf-8] Sat Feb 26 17:25:01 2011
@@ -1,7 +1,7 @@
 #!/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/patchsys-quilt.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

Added: desktop/unstable/control-center/debian/source/format
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/control-center/debian/source/format?rev=26724&op=file
==============================================================================
--- desktop/unstable/control-center/debian/source/format (added)
+++ desktop/unstable/control-center/debian/source/format [utf-8] Sat Feb 26 17:25:01 2011
@@ -1,0 +1,1 @@
+3.0 (quilt)

More information about the pkg-gnome-commits mailing list