r26669 - in /desktop/unstable/gnome-panel/debian: changelog control control.in patches/0001-build-explicitly-link-to-xrandr.patch patches/70_relibtoolize.patch patches/99_ltmain_as-needed.patch patches/series rules

pochu at users.alioth.debian.org pochu at users.alioth.debian.org
Tue Feb 22 22:58:02 UTC 2011 

Author: pochu
Date: Tue Feb 22 22:57:59 2011
New Revision: 26669

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=26669
Log:
* debian/patches/0001-build-explicitly-link-to-xrandr.patch:
  + New patch from upstream git, fix build with --as-needed.
* debian/patches/70_relibtoolize.patch,
  debian/patches/99_ltmain_as-needed.patch:
  + Removed in favour of...
* debian/control.in,
  debian/rules:
  + Use autoreconf.
* The rebuild picks up a new libecal. Closes: #614654.

Added:
    desktop/unstable/gnome-panel/debian/patches/0001-build-explicitly-link-to-xrandr.patch
Removed:
    desktop/unstable/gnome-panel/debian/patches/70_relibtoolize.patch
    desktop/unstable/gnome-panel/debian/patches/99_ltmain_as-needed.patch
Modified:
    desktop/unstable/gnome-panel/debian/changelog
    desktop/unstable/gnome-panel/debian/control
    desktop/unstable/gnome-panel/debian/control.in
    desktop/unstable/gnome-panel/debian/patches/series
    desktop/unstable/gnome-panel/debian/rules

Modified: desktop/unstable/gnome-panel/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-panel/debian/changelog?rev=26669&op=diff
==============================================================================
--- desktop/unstable/gnome-panel/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-panel/debian/changelog [utf-8] Tue Feb 22 22:57:59 2011
@@ -1,3 +1,17 @@
+gnome-panel (2.30.2-4) unstable; urgency=low
+
+  * debian/patches/0001-build-explicitly-link-to-xrandr.patch:
+    + New patch from upstream git, fix build with --as-needed.
+  * debian/patches/70_relibtoolize.patch,
+    debian/patches/99_ltmain_as-needed.patch:
+    + Removed in favour of...
+  * debian/control.in,
+    debian/rules:
+    + Use autoreconf.
+  * The rebuild picks up a new libecal. Closes: #614654.
+
+ -- Emilio Pozuelo Monfort <pochu at debian.org>  Tue, 22 Feb 2011 22:53:31 +0000
+
 gnome-panel (2.30.2-3) unstable; urgency=low
 
   * Only recommend menu-xdg.

Modified: desktop/unstable/gnome-panel/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-panel/debian/control?rev=26669&op=diff
==============================================================================
--- desktop/unstable/gnome-panel/debian/control [utf-8] (original)
+++ desktop/unstable/gnome-panel/debian/control [utf-8] Tue Feb 22 22:57:59 2011
@@ -13,7 +13,7 @@
                debhelper (>= 5),
                intltool (>= 0.40.0),
                gnome-pkg-tools (>= 0.14),
-               dpkg-dev (>= 1.13.19),
+               dh-autoreconf,
                gnome-doc-utils,
                python,
                libx11-dev,

Modified: desktop/unstable/gnome-panel/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-panel/debian/control.in?rev=26669&op=diff
==============================================================================
--- desktop/unstable/gnome-panel/debian/control.in [utf-8] (original)
+++ desktop/unstable/gnome-panel/debian/control.in [utf-8] Tue Feb 22 22:57:59 2011
@@ -8,7 +8,7 @@
                debhelper (>= 5),
                intltool (>= 0.40.0),
                gnome-pkg-tools (>= 0.14),
-               dpkg-dev (>= 1.13.19),
+               dh-autoreconf,
                gnome-doc-utils,
                python,
                libx11-dev,

Added: desktop/unstable/gnome-panel/debian/patches/0001-build-explicitly-link-to-xrandr.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-panel/debian/patches/0001-build-explicitly-link-to-xrandr.patch?rev=26669&op=file
==============================================================================
--- desktop/unstable/gnome-panel/debian/patches/0001-build-explicitly-link-to-xrandr.patch (added)
+++ desktop/unstable/gnome-panel/debian/patches/0001-build-explicitly-link-to-xrandr.patch [utf-8] Tue Feb 22 22:57:59 2011
@@ -1,0 +1,46 @@
+From 787dc4c9b1d433829de03b6c89df3a748bddc31d Mon Sep 17 00:00:00 2001
+From: Vincent Untz <vuntz at gnome.org>
+Date: Tue, 14 Sep 2010 09:53:08 +0200
+Subject: [PATCH] build: explicitly link to xrandr
+
+https://bugzilla.gnome.org/show_bug.cgi?id=629562
+---
+ configure.ac            |    8 +++-----
+ gnome-panel/Makefile.am |    2 ++
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+--- a/configure.in
++++ b/configure.in
+@@ -260,11 +260,9 @@
+ 
+ dnl X RANDR extension
+ 
+-if $PKG_CONFIG --exists "xrandr >= 1.2.0" ; then
+-	AC_DEFINE(HAVE_RANDR, 1, [Have the Xrandr extension library])
+-	have_randr=yes
+-else
+-	have_randr=no
++PKG_CHECK_MODULES(XRANDR, xrandr >= 1.2.0, have_randr=yes, have_randr=no)
++if test "x$have_randr" = "xyes"; then
++  AC_DEFINE(HAVE_RANDR, 1, [Have the Xrandr extension library])
+ fi
+ 
+ dnl IDL directories
+--- a/gnome-panel/Makefile.am
++++ b/gnome-panel/Makefile.am
+@@ -17,6 +17,7 @@
+ 	-DGMENU_I_KNOW_THIS_IS_UNSTABLE				\
+ 	$(DISABLE_DEPRECATED_CFLAGS)				\
+ 	$(PANEL_CFLAGS)						\
++	$(XRANDR_CFLAGS)					\
+ 	$(WARN_CFLAGS)						\
+ 	$(NULL)
+ 
+@@ -156,6 +157,7 @@
+ 	$(top_builddir)/gnome-panel/libegg/libegg.la \
+ 	$(top_builddir)/gnome-panel/libpanel-util/libpanel-util.la \
+ 	$(PANEL_LIBS)		\
++	$(XRANDR_LIBS)								\
+ 	$(X_LIBS)
+ 
+ gnome_panel_LDFLAGS = -export-dynamic

Modified: desktop/unstable/gnome-panel/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-panel/debian/patches/series?rev=26669&op=diff
==============================================================================
--- desktop/unstable/gnome-panel/debian/patches/series [utf-8] (original)
+++ desktop/unstable/gnome-panel/debian/patches/series [utf-8] Tue Feb 22 22:57:59 2011
@@ -1,3 +1,4 @@
+0001-build-explicitly-link-to-xrandr.patch
 01_panel_submenus.patch
 02_mixer_applet.patch
 03_tasklist_orientation.patch
@@ -6,5 +7,3 @@
 10_bookmarks_limit.patch
 30_crasher_realize.patch
 31_crasher_pager.patch
-70_relibtoolize.patch
-99_ltmain_as-needed.patch

Modified: desktop/unstable/gnome-panel/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-panel/debian/rules?rev=26669&op=diff
==============================================================================
--- desktop/unstable/gnome-panel/debian/rules [utf-8] (original)
+++ desktop/unstable/gnome-panel/debian/rules [utf-8] Tue Feb 22 22:57:59 2011
@@ -1,11 +1,12 @@
 #!/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/gnome-pkg-tools/1/rules/gnome-version.mk
--include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.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