[med-svn] r9352 - trunk/packages/libhmsbeagle/trunk/debian

[Andreas Tille]

Author: tille
Date: 2012-01-20 14:29:21 +0000 (Fri, 20 Jan 2012)
New Revision: 9352

Added:
   trunk/packages/libhmsbeagle/trunk/debian/libhmsbeagle-java.jlibs
Removed:
   trunk/packages/libhmsbeagle/trunk/debian/libbeagle-java.jlibs
Modified:
   trunk/packages/libhmsbeagle/trunk/debian/changelog
   trunk/packages/libhmsbeagle/trunk/debian/control
   trunk/packages/libhmsbeagle/trunk/debian/rules
Log:
Consistent naming of Java package; upload to unstable


Modified: trunk/packages/libhmsbeagle/trunk/debian/changelog
===================================================================
--- trunk/packages/libhmsbeagle/trunk/debian/changelog	2012-01-20 14:08:22 UTC (rev 9351)
+++ trunk/packages/libhmsbeagle/trunk/debian/changelog	2012-01-20 14:29:21 UTC (rev 9352)
@@ -1,6 +1,6 @@
 libhmsbeagle (1.0-1) unstable; urgency=low
 
-  * Initial upload to Debian (Closes: #???)
+  * Initial upload to Debian (Closes: #656609)
   * debian/get-orig-source: Fetch tagged version instead of trunk
   * debian/watch: Detect new tags
   * debian/control:

Modified: trunk/packages/libhmsbeagle/trunk/debian/control
===================================================================
--- trunk/packages/libhmsbeagle/trunk/debian/control	2012-01-20 14:08:22 UTC (rev 9351)
+++ trunk/packages/libhmsbeagle/trunk/debian/control	2012-01-20 14:29:21 UTC (rev 9352)
@@ -52,7 +52,7 @@
  optimizers.  This allows these packages to make use of implementations that
  make use of optimized hardware such as graphics processing units.
 
-Package: libbeagle-java
+Package: libhmsbeagle-java
 Architecture: all
 Section: java
 Depends: ${java:Depends}, ${misc:Depends}, ${shlibs:Depends}

Deleted: trunk/packages/libhmsbeagle/trunk/debian/libbeagle-java.jlibs
===================================================================
--- trunk/packages/libhmsbeagle/trunk/debian/libbeagle-java.jlibs	2012-01-20 14:08:22 UTC (rev 9351)
+++ trunk/packages/libhmsbeagle/trunk/debian/libbeagle-java.jlibs	2012-01-20 14:29:21 UTC (rev 9352)
@@ -1 +0,0 @@
-lib/*.jar

Added: trunk/packages/libhmsbeagle/trunk/debian/libhmsbeagle-java.jlibs
===================================================================
--- trunk/packages/libhmsbeagle/trunk/debian/libhmsbeagle-java.jlibs	                        (rev 0)
+++ trunk/packages/libhmsbeagle/trunk/debian/libhmsbeagle-java.jlibs	2012-01-20 14:29:21 UTC (rev 9352)
@@ -0,0 +1 @@
+lib/*.jar

Modified: trunk/packages/libhmsbeagle/trunk/debian/rules
===================================================================
--- trunk/packages/libhmsbeagle/trunk/debian/rules	2012-01-20 14:08:22 UTC (rev 9351)
+++ trunk/packages/libhmsbeagle/trunk/debian/rules	2012-01-20 14:29:21 UTC (rev 9352)
@@ -5,6 +5,8 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+pkg := $(shell dpkg-parsechangelog | sed -n 's/^Source: //p')
+
 %:
 	dh $@ --with autoreconf --with javahelper
 
@@ -22,10 +24,10 @@
 	#Shunt jni .so to jni directory.
 	mkdir -p -m755 debian/tmp/usr/lib/jni
 	mv debian/tmp/usr/lib/*jni.* debian/tmp/usr/lib/jni
-	sed -i "s/libdir='\/usr\/lib'/libdir='\/usr\/lib\/jni'/" debian/tmp/usr/lib/jni/libhmsbeagle-jni.la
-	#dh_install doc/man /usr/share
-	#dh_install doc/html /usr/share/doc/libhmsbeagle1
 
+	# will be removed later anyway (see below)
+	# sed -i "s/libdir='\/usr\/lib'/libdir='\/usr\/lib\/jni'/" debian/tmp/usr/lib/jni/libhmsbeagle-jni.la
+
 	# Remove unneeded *.la files according to
 	# http://lists.debian.org/debian-devel/2009/08/msg00783.html
 	# Release goal: Getting rid of unneeded *.la / emptying dependency_libs
@@ -41,5 +43,10 @@
 	rm -rf doc .config configure
 	rm -rf lib build
 
+# Does not help to fix the lintian issue ... hmmm
+#override_dh_shlibdeps:
+#	# somehow shlibdeps is not called for jni subdir
+#	dh_shlibdeps -- debian/$(pkg)1/usr/lib/jni/* debian/$(pkg)1/usr/lib/lib*
+
 get-orig-source:
 	. debian/get-orig-source