r46035 - in /desktop/unstable/gnome-calculator/debian: changelog control.in patches/fix-linking-problems.patch patches/series rules

[ah at users.alioth.debian.org]

Author: ah
Date: Tue Sep 22 17:22:05 2015
New Revision: 46035

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=46035
Log:
* New upstream release.
* Update build-dependencies according to configure.ac changes:
  - drop gnome-common
* Add debian/patches/fix-linking-problems.patch
  - this avoids FTBFS by explicitly referencing all required libraries
* Add snippet to debian/rules to drop '*.la' from being installed

Added:
    desktop/unstable/gnome-calculator/debian/patches/fix-linking-problems.patch
    desktop/unstable/gnome-calculator/debian/patches/series
Modified:
    desktop/unstable/gnome-calculator/debian/changelog
    desktop/unstable/gnome-calculator/debian/control.in
    desktop/unstable/gnome-calculator/debian/rules

Modified: desktop/unstable/gnome-calculator/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-calculator/debian/changelog?rev=46035&op=diff
==============================================================================
--- desktop/unstable/gnome-calculator/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gnome-calculator/debian/changelog	[utf-8] Tue Sep 22 17:22:05 2015
@@ -1,3 +1,14 @@
+gnome-calculator (3.18.0-1) unstable; urgency=medium
+
+  * New upstream release.
+  * Update build-dependencies according to configure.ac changes:
+    - drop gnome-common
+  * Add debian/patches/fix-linking-problems.patch
+    - this avoids FTBFS by explicitly referencing all required libraries
+  * Add snippet to debian/rules to drop '*.la' from being installed
+
+ -- Andreas Henriksson <andreas at fatal.se>  Tue, 22 Sep 2015 18:38:41 +0200
+
 gnome-calculator (3.16.2-1) unstable; urgency=medium
 
   * New upstream release.

Modified: desktop/unstable/gnome-calculator/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-calculator/debian/control.in?rev=46035&op=diff
==============================================================================
--- desktop/unstable/gnome-calculator/debian/control.in	[utf-8] (original)
+++ desktop/unstable/gnome-calculator/debian/control.in	[utf-8] Tue Sep 22 17:22:05 2015
@@ -7,7 +7,6 @@
 Build-Depends: cdbs (>= 0.4.41),
                debhelper (>= 9),
                dh-autoreconf,
-               gnome-common,
                gnome-pkg-tools (>= 0.10),
                yelp-tools (>= 3.1.1),
                intltool (>= 0.50),

Added: desktop/unstable/gnome-calculator/debian/patches/fix-linking-problems.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-calculator/debian/patches/fix-linking-problems.patch?rev=46035&op=file
==============================================================================
--- desktop/unstable/gnome-calculator/debian/patches/fix-linking-problems.patch	(added)
+++ desktop/unstable/gnome-calculator/debian/patches/fix-linking-problems.patch	[utf-8] Tue Sep 22 17:22:05 2015
@@ -0,0 +1,46 @@
+From: Andreas Henriksson <andreas at fatal.se>
+Subject: Explicitly link required libraries
+
+Linking gnome-calculator fails because of undefined symbol
+'gtk_source_completion_provider_get_type'
+
+Linking gcalccmd fails because of undefined symbol
+'g_object_unref'
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -38,6 +38,11 @@
+ PKG_CHECK_MODULES(GNOME_CALCULATOR, [
+     gtk+-3.0 >= $GTK_REQUIRED
+     gmodule-export-2.0
++    gtksourceview-3.0 >= $GTKSOURCEVIEW_REQUIRED
++])
++
++PKG_CHECK_MODULES(GCALCCMD, [
++    gobject-2.0 >= $GLIB_REQUIRED
+ ])
+ 
+ PKG_CHECK_MODULES(SEARCH_PROVIDER, [
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -44,6 +44,7 @@
+ 	$(GNOME_CALCULATOR_LIBS) \
+ 	$(top_builddir)/lib/libcalculator.la
+ 
++
+ gcalccmd_SOURCES = \
+ 	config.vapi \
+ 	gcalccmd.vala
+@@ -57,7 +58,12 @@
+ 	$(top_builddir)/lib/libcalculator.vapi \
+ 	$(top_builddir)/lib/mpfr.vapi
+ 
++gcalccmd_CPPFLAGS = \
++	$(AM_CPPFLAGS) \
++	$(GCALCCMD_CFLAGS)
++
+ gcalccmd_LDADD = \
++	$(GCALCCMD_LIBS) \
+ 	$(top_builddir)/lib/libcalculator.la
+ 
+ -include $(top_srcdir)/git.mk

Added: desktop/unstable/gnome-calculator/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-calculator/debian/patches/series?rev=46035&op=file
==============================================================================
--- desktop/unstable/gnome-calculator/debian/patches/series	(added)
+++ desktop/unstable/gnome-calculator/debian/patches/series	[utf-8] Tue Sep 22 17:22:05 2015
@@ -0,0 +1 @@
+fix-linking-problems.patch

Modified: desktop/unstable/gnome-calculator/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-calculator/debian/rules?rev=46035&op=diff
==============================================================================
--- desktop/unstable/gnome-calculator/debian/rules	[utf-8] (original)
+++ desktop/unstable/gnome-calculator/debian/rules	[utf-8] Tue Sep 22 17:22:05 2015
@@ -11,3 +11,6 @@
 
 # make the transitional package have a high enough version number
 DEB_DH_GENCONTROL_ARGS_gcalctool += -u-v1:$(DEB_VERSION)
+
+install/gnome-calculator::
+	find debian/tmp -name '*.la' | xargs rm -f