r30841 - in /desktop/unstable/libgnomeprintui/debian: changelog control control.in patches/01-link-missing-libs.patch patches/series rules

biebl at users.alioth.debian.org biebl at users.alioth.debian.org
Thu Oct 20 04:52:27 UTC 2011


Author: biebl
Date: Thu Oct 20 04:52:26 2011
New Revision: 30841

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=30841
Log:
* debian/patches/01-link-missing-libs.patch:
  - Link libgnomeprintui against -lm (using the LT_LIB_M macro) and the
    gtk-doc scanner against LIBGNOMEPRINTUI_LIBS. Closes: #640450
* debian/control.in:
  - Add Build-Depends on dh-autoreconf.
* debian/rules:
  - Include autoreconf.mk to regenerate the build system.

Added:
    desktop/unstable/libgnomeprintui/debian/patches/01-link-missing-libs.patch
Modified:
    desktop/unstable/libgnomeprintui/debian/changelog
    desktop/unstable/libgnomeprintui/debian/control
    desktop/unstable/libgnomeprintui/debian/control.in
    desktop/unstable/libgnomeprintui/debian/patches/series
    desktop/unstable/libgnomeprintui/debian/rules

Modified: desktop/unstable/libgnomeprintui/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgnomeprintui/debian/changelog?rev=30841&op=diff
==============================================================================
--- desktop/unstable/libgnomeprintui/debian/changelog [utf-8] (original)
+++ desktop/unstable/libgnomeprintui/debian/changelog [utf-8] Thu Oct 20 04:52:26 2011
@@ -1,3 +1,15 @@
+libgnomeprintui (2.18.6-3) UNRELEASED; urgency=low
+
+  * debian/patches/01-link-missing-libs.patch:
+    - Link libgnomeprintui against -lm (using the LT_LIB_M macro) and the
+      gtk-doc scanner against LIBGNOMEPRINTUI_LIBS. Closes: #640450
+  * debian/control.in:
+    - Add Build-Depends on dh-autoreconf.
+  * debian/rules:
+    - Include autoreconf.mk to regenerate the build system.
+
+ -- Michael Biebl <biebl at debian.org>  Thu, 20 Oct 2011 06:45:42 +0200
+
 libgnomeprintui (2.18.6-2) unstable; urgency=low
 
   * debian/control.in:

Modified: desktop/unstable/libgnomeprintui/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgnomeprintui/debian/control?rev=30841&op=diff
==============================================================================
--- desktop/unstable/libgnomeprintui/debian/control [utf-8] (original)
+++ desktop/unstable/libgnomeprintui/debian/control [utf-8] Thu Oct 20 04:52:26 2011
@@ -11,6 +11,7 @@
 Standards-Version: 3.9.2
 Build-Depends: debhelper (>= 8),
                cdbs (>= 0.4.41),
+               dh-autoreconf,
                gettext,
                gnome-pkg-tools (>= 0.10),
                libxml2-dev,

Modified: desktop/unstable/libgnomeprintui/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgnomeprintui/debian/control.in?rev=30841&op=diff
==============================================================================
--- desktop/unstable/libgnomeprintui/debian/control.in [utf-8] (original)
+++ desktop/unstable/libgnomeprintui/debian/control.in [utf-8] Thu Oct 20 04:52:26 2011
@@ -6,6 +6,7 @@
 Standards-Version: 3.9.2
 Build-Depends: debhelper (>= 8),
                cdbs (>= 0.4.41),
+               dh-autoreconf,
                gettext,
                gnome-pkg-tools (>= 0.10),
                libxml2-dev,

Added: desktop/unstable/libgnomeprintui/debian/patches/01-link-missing-libs.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgnomeprintui/debian/patches/01-link-missing-libs.patch?rev=30841&op=file
==============================================================================
--- desktop/unstable/libgnomeprintui/debian/patches/01-link-missing-libs.patch (added)
+++ desktop/unstable/libgnomeprintui/debian/patches/01-link-missing-libs.patch [utf-8] Thu Oct 20 04:52:26 2011
@@ -1,0 +1,42 @@
+Description: Link against all necessary libraries
+Author: Michael Biebl <biebl at debian.org>
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=640450
+diff --git a/configure.in b/configure.in
+index 9f68deb..d483c6c 100644
+--- a/configure.in
++++ b/configure.in
+@@ -69,6 +69,9 @@ PKG_CHECK_MODULES(LIBGNOMEPRINTUI, [
+ AC_SUBST(LIBGNOMEPRINTUI_CFLAGS)
+ AC_SUBST(LIBGNOMEPRINTUI_LIBS)
+ 
++LT_LIB_M
++AC_SUBST(LIBM)
++
+ AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
+ 
+ dnl ================================================
+diff --git a/doc/Makefile.am b/doc/Makefile.am
+index b7f57ec..238a3e5 100644
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
+@@ -51,7 +51,7 @@ extra_files =
+ # CFLAGS and LDFLAGS for compiling scan program. Only needed if your app/lib
+ # contains GtkObjects/GObjects and you want to document signals and properties.
+ GTKDOC_CFLAGS = -DWE_ARE_LIBGNOMEPRINT_INTERNALS -I$(top_builddir) -I$(top_srcdir) $(LIBGNOMEPRINTUI_CFLAGS) $(CFLAGS)
+-GTKDOC_LIBS = $(top_builddir)/libgnomeprintui/libgnomeprintui-2-2.la $(LDFLAGS)
++GTKDOC_LIBS = $(top_builddir)/libgnomeprintui/libgnomeprintui-2-2.la $(LIBGNOMEPRINTUI_LIBS) $(LDFLAGS)
+ 
+ # _CC and _LD are already defined in gtk-doc.make
+ # GTKDOC_CC=$(LIBTOOL) --mode=compile $(CC)
+diff --git a/libgnomeprintui/Makefile.am b/libgnomeprintui/Makefile.am
+index 8d67682..cd503bd 100644
+--- a/libgnomeprintui/Makefile.am
++++ b/libgnomeprintui/Makefile.am
+@@ -35,6 +35,7 @@ headers = \
+ 
+ libgnomeprintui_2_2_la_LIBADD = \
+ 	$(LIBGNOMEPRINTUI_LIBS) \
++	$(LIBM) \
+ 	gpaui/libgpaui.la 
+ 
+ libgnomeprintui_2_2_la_LDFLAGS = \

Modified: desktop/unstable/libgnomeprintui/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgnomeprintui/debian/patches/series?rev=30841&op=diff
==============================================================================
--- desktop/unstable/libgnomeprintui/debian/patches/series [utf-8] (original)
+++ desktop/unstable/libgnomeprintui/debian/patches/series [utf-8] Thu Oct 20 04:52:26 2011
@@ -1,0 +1,1 @@
+01-link-missing-libs.patch

Modified: desktop/unstable/libgnomeprintui/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgnomeprintui/debian/rules?rev=30841&op=diff
==============================================================================
--- desktop/unstable/libgnomeprintui/debian/rules [utf-8] (original)
+++ desktop/unstable/libgnomeprintui/debian/rules [utf-8] Thu Oct 20 04:52:26 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-get-source.mk




More information about the pkg-gnome-commits mailing list