r29586 - in /desktop/unstable/libgnomeui/debian: changelog control control.in patches/01_link_libm.patch patches/series rules

biebl at users.alioth.debian.org biebl at users.alioth.debian.org
Mon Sep 5 09:23:25 UTC 2011


Author: biebl
Date: Mon Sep  5 09:23:25 2011
New Revision: 29586

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=29586
Log:
* debian/patches/01_link_libm.patch: Explicitly link against -lm.
  Closes: #640455
* Use dh-autoreconf to update the build system.

Added:
    desktop/unstable/libgnomeui/debian/patches/01_link_libm.patch
Modified:
    desktop/unstable/libgnomeui/debian/changelog
    desktop/unstable/libgnomeui/debian/control
    desktop/unstable/libgnomeui/debian/control.in
    desktop/unstable/libgnomeui/debian/patches/series
    desktop/unstable/libgnomeui/debian/rules

Modified: desktop/unstable/libgnomeui/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgnomeui/debian/changelog?rev=29586&op=diff
==============================================================================
--- desktop/unstable/libgnomeui/debian/changelog [utf-8] (original)
+++ desktop/unstable/libgnomeui/debian/changelog [utf-8] Mon Sep  5 09:23:25 2011
@@ -1,3 +1,11 @@
+libgnomeui (2.24.5-2) UNRELEASED; urgency=low
+
+  * debian/patches/01_link_libm.patch: Explicitly link against -lm.
+    Closes: #640455
+  * Use dh-autoreconf to update the build system.
+
+ -- Michael Biebl <biebl at debian.org>  Mon, 05 Sep 2011 11:17:08 +0200
+
 libgnomeui (2.24.5-1) unstable; urgency=low
 
   * New upstream release.

Modified: desktop/unstable/libgnomeui/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgnomeui/debian/control?rev=29586&op=diff
==============================================================================
--- desktop/unstable/libgnomeui/debian/control [utf-8] (original)
+++ desktop/unstable/libgnomeui/debian/control [utf-8] Mon Sep  5 09:23:25 2011
@@ -30,7 +30,9 @@
                libxml2-dev (>= 2.4.20),
                libx11-dev,
                libsm-dev,
-               libice-dev
+               libice-dev,
+               dh-autoreconf,
+               gtk-doc-tools
 Build-Depends-Indep: libglib2.0-doc, libgtk2.0-doc
 
 Package: libgnomeui-0

Modified: desktop/unstable/libgnomeui/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgnomeui/debian/control.in?rev=29586&op=diff
==============================================================================
--- desktop/unstable/libgnomeui/debian/control.in [utf-8] (original)
+++ desktop/unstable/libgnomeui/debian/control.in [utf-8] Mon Sep  5 09:23:25 2011
@@ -25,7 +25,9 @@
                libxml2-dev (>= 2.4.20),
                libx11-dev,
                libsm-dev,
-               libice-dev
+               libice-dev,
+               dh-autoreconf,
+               gtk-doc-tools
 Build-Depends-Indep: libglib2.0-doc, libgtk2.0-doc
 
 Package: libgnomeui-0

Added: desktop/unstable/libgnomeui/debian/patches/01_link_libm.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgnomeui/debian/patches/01_link_libm.patch?rev=29586&op=file
==============================================================================
--- desktop/unstable/libgnomeui/debian/patches/01_link_libm.patch (added)
+++ desktop/unstable/libgnomeui/debian/patches/01_link_libm.patch [utf-8] Mon Sep  5 09:23:25 2011
@@ -1,0 +1,43 @@
+From b29ca92bf0c8620f05ba59267978435bd19bfeac Mon Sep 17 00:00:00 2001
+From: Michael Biebl <biebl at debian.org>
+Date: Mon, 5 Sep 2011 03:39:14 +0200
+Subject: [PATCH] Explicitly link against libm for floor()
+
+http://mail.gnome.org/archives/desktop-devel-list/2011-August/msg00237.html
+---
+ configure.in           |    4 ++++
+ libgnomeui/Makefile.am |    3 ++-
+ 2 files changed, 6 insertions(+), 1 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index 3c4724e..6da7611 100644
+--- a/configure.in
++++ b/configure.in
+@@ -77,6 +77,10 @@ AC_STDC_HEADERS
+ AC_LIBTOOL_WIN32_DLL
+ AM_PROG_LIBTOOL
+ 
++dnl check for libm, for floor()
++AC_CHECK_LIBM
++AC_SUBST(LIBM)
++
+ dnl
+ dnl Check for -lX11 (for XUngrabServer in gnome-ui-init.c) and set
+ dnl X11_CFLAGS and X11_LIBS
+diff --git a/libgnomeui/Makefile.am b/libgnomeui/Makefile.am
+index 57db5e2..d5338fe 100644
+--- a/libgnomeui/Makefile.am
++++ b/libgnomeui/Makefile.am
+@@ -249,7 +249,8 @@ libgnomeui_2_la_LDFLAGS = \
+ libgnomeui_2_la_LIBADD = \
+ 	$(LIBGNOMEUI_LIBS)			\
+ 	$(SM_LIBS)				\
+-	$(X11_LIBS)
++	$(X11_LIBS)				\
++	$(LIBM)
+ 
+ LDADD = \
+ 	libgnomeui-2.la $(LIBGNOMEUI_LIBS)
+-- 
+1.7.5.4
+

Modified: desktop/unstable/libgnomeui/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgnomeui/debian/patches/series?rev=29586&op=diff
==============================================================================
--- desktop/unstable/libgnomeui/debian/patches/series [utf-8] (original)
+++ desktop/unstable/libgnomeui/debian/patches/series [utf-8] Mon Sep  5 09:23:25 2011
@@ -1,1 +1,2 @@
+01_link_libm.patch
 99_ltmain_as-needed.patch

Modified: desktop/unstable/libgnomeui/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgnomeui/debian/rules?rev=29586&op=diff
==============================================================================
--- desktop/unstable/libgnomeui/debian/rules [utf-8] (original)
+++ desktop/unstable/libgnomeui/debian/rules [utf-8] Mon Sep  5 09:23:25 2011
@@ -1,6 +1,7 @@
 #!/usr/bin/make -f
 
 include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/autoreconf.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




More information about the pkg-gnome-commits mailing list