[med-svn] r10014 - trunk/packages/swarm/trunk/debian

[Scott Christley]

Author: schristley-guest
Date: 2012-03-15 16:34:14 +0000 (Thu, 15 Mar 2012)
New Revision: 10014

Added:
   trunk/packages/swarm/trunk/debian/lintian-override
Modified:
   trunk/packages/swarm/trunk/debian/changelog
   trunk/packages/swarm/trunk/debian/control
   trunk/packages/swarm/trunk/debian/libswarm2-dev.install
   trunk/packages/swarm/trunk/debian/libswarm2.install
   trunk/packages/swarm/trunk/debian/rules
Log:
resolve some lintian issues

Modified: trunk/packages/swarm/trunk/debian/changelog
===================================================================
--- trunk/packages/swarm/trunk/debian/changelog	2012-03-15 15:44:40 UTC (rev 10013)
+++ trunk/packages/swarm/trunk/debian/changelog	2012-03-15 16:34:14 UTC (rev 10014)
@@ -9,6 +9,7 @@
   * debian/libswarm2.install: installation files
   * debian/libswarm2-dev.install: installation files
   * debian/copyright: copyright details
+  * debian/lintian-override: override shlib-with-executable-stack
 
   [ Thorsten Alteholz ]
   * New upstream version

Modified: trunk/packages/swarm/trunk/debian/control
===================================================================
--- trunk/packages/swarm/trunk/debian/control	2012-03-15 15:44:40 UTC (rev 10013)
+++ trunk/packages/swarm/trunk/debian/control	2012-03-15 16:34:14 UTC (rev 10014)
@@ -6,7 +6,7 @@
 Uploaders: Scott Christley <schristley at mac.com>,
  Andreas Tille <tille at debian.org>,
  Charles Plessy <plessy at debian.org>
-Build-Depends: debhelper (>= 8), gobjc, gperf, libhdf5-serial-dev, blt-dev, libxpm-dev
+Build-Depends: debhelper (>= 8), gobjc, gperf, libhdf5-serial-dev, blt-dev, libxpm-dev, chrpath
 Standards-Version: 3.9.2
 Homepage: http://www.swarm.org/
 Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/swarm/trunk/

Modified: trunk/packages/swarm/trunk/debian/libswarm2-dev.install
===================================================================
--- trunk/packages/swarm/trunk/debian/libswarm2-dev.install	2012-03-15 15:44:40 UTC (rev 10013)
+++ trunk/packages/swarm/trunk/debian/libswarm2-dev.install	2012-03-15 16:34:14 UTC (rev 10014)
@@ -12,10 +12,8 @@
 usr/include/swarm/tclobjc/*.h
 usr/include/swarm/tkobjc/*.h
 usr/include/objc/*.h usr/include/swarm/objc
-etc/swarm/* usr/share/swarm
 usr/share/swarm/*
-usr/bin/libtool-swarm
-usr/lib/libswarm.so.2
-usr/lib/libswarm.so
-usr/lib/libswarmobjc.so.0
-usr/lib/libswarmobjc.so
+usr/lib/swarm/libswarm.so.2 usr/lib
+usr/lib/swarm/libswarm.so usr/lib
+usr/lib/libswarmobjc.so.0 usr/lib
+usr/lib/libswarmobjc.so usr/lib

Modified: trunk/packages/swarm/trunk/debian/libswarm2.install
===================================================================
--- trunk/packages/swarm/trunk/debian/libswarm2.install	2012-03-15 15:44:40 UTC (rev 10013)
+++ trunk/packages/swarm/trunk/debian/libswarm2.install	2012-03-15 16:34:14 UTC (rev 10014)
@@ -1,3 +1,4 @@
-usr/lib/libswarm.so.2*
+usr/lib/swarm/libswarm.so.2* usr/lib
 usr/lib/libswarmobjc.so.0*
-usr/lib/libswarm*.a
+usr/lib/swarm/libswarm*.a usr/lib
+usr/share/lintian/overrides/libswarm2

Added: trunk/packages/swarm/trunk/debian/lintian-override
===================================================================
--- trunk/packages/swarm/trunk/debian/lintian-override	                        (rev 0)
+++ trunk/packages/swarm/trunk/debian/lintian-override	2012-03-15 16:34:14 UTC (rev 10014)
@@ -0,0 +1,2 @@
+# Swarm uses trampolines
+libswarm2 binary: shlib-with-executable-stack

Modified: trunk/packages/swarm/trunk/debian/rules
===================================================================
--- trunk/packages/swarm/trunk/debian/rules	2012-03-15 15:44:40 UTC (rev 10013)
+++ trunk/packages/swarm/trunk/debian/rules	2012-03-15 16:34:14 UTC (rev 10014)
@@ -8,7 +8,7 @@
 	dh $@
 
 override_dh_auto_configure:
-	dh_auto_configure -- --with-tcl=/usr/lib/tcl8.5 --with-tk=/usr/lib/tk8.5 --without-jdkdir
+	dh_auto_configure -- --with-tcl=/usr/lib/tcl8.5 --with-tk=/usr/lib/tk8.5 --without-jdkdir --enable-subdirs
 
 override_dh_auto_test:
 
@@ -16,6 +16,12 @@
 	dh_clean
 	rm -rf config.log
 
+override_dh_install:
+	chrpath -d debian/tmp/usr/lib/swarm/libswarm.so
+	mkdir -p debian/tmp/usr/share/lintian/overrides
+	cp debian/lintian-override debian/tmp/usr/share/lintian/overrides/libswarm2
+	dh_install
+
 get-orig-source:
 	mkdir -p ../tarballs
 	uscan --verbose --force-download --destdir ../tarballs