[med-svn] r15546 - trunk/packages/libg2/trunk/debian

[Andreas Tille]

Author: tille
Date: 2013-12-16 16:21:39 +0000 (Mon, 16 Dec 2013)
New Revision: 15546

Modified:
   trunk/packages/libg2/trunk/debian/changelog
   trunk/packages/libg2/trunk/debian/rules
Log:
The typo in $(CURDIR) made libg2 linkage get skipped.  The LD_RUN_PATH trick is to avoid an RPATH setting in the resulting DSO.


Modified: trunk/packages/libg2/trunk/debian/changelog
===================================================================
--- trunk/packages/libg2/trunk/debian/changelog	2013-12-16 15:48:32 UTC (rev 15545)
+++ trunk/packages/libg2/trunk/debian/changelog	2013-12-16 16:21:39 UTC (rev 15546)
@@ -1,3 +1,12 @@
+g2 (0.72-5) unstable; urgency=medium
+
+  * The typo in $(CURDIR) made libg2 linkage get skipped.
+    The LD_RUN_PATH trick is to avoid an RPATH setting in the resulting DSO.
+    Thanks for the patch to Niko Tyni <ntyni at debian.org>
+    Closes: #712088
+
+ -- Andreas Tille <tille at debian.org>  Mon, 16 Dec 2013 17:12:01 +0100
+
 g2 (0.72-4) unstable; urgency=low
 
   * Make use of dh-autoreconf (thanks again to Samuel Thibault for

Modified: trunk/packages/libg2/trunk/debian/rules
===================================================================
--- trunk/packages/libg2/trunk/debian/rules	2013-12-16 15:48:32 UTC (rev 15545)
+++ trunk/packages/libg2/trunk/debian/rules	2013-12-16 16:21:39 UTC (rev 15546)
@@ -34,8 +34,8 @@
 	# clean up and build the shared lib
 	-rm -f src/*.o src/*/*.o
 	$(MAKE) PICFLAG="-fPIC" RVERSION=$(rversion) MVERSION=$(major) DEBCFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" shared
-	(cd ./g2_perl && perl Makefile.PL INSTALLDIRS=vendor LIBS="-L$(CURIDR)/g2_perl/.. -lg2")
-	$(MAKE) -C ./g2_perl
+	(cd ./g2_perl && perl Makefile.PL INSTALLDIRS=vendor LIBS="-L$(CURDIR) -lg2")
+	$(MAKE) -C ./g2_perl LD_RUN_PATH=""
 
 override_dh_auto_install:
 	$(MAKE) RVERSION=$(rversion) MVERSION=$(major) install prefix=$(CURDIR)/debian/libg2-dev