[pkg-java] r3156 - trunk/glib-java/debian

[Thomas Girard]

Author: tgg
Date: 2007-04-10 11:48:20 +0000 (Tue, 10 Apr 2007)
New Revision: 3156

Added:
   trunk/glib-java/debian/libglib-cni.install
   trunk/glib-java/debian/libglib-jni.install
Modified:
   trunk/glib-java/debian/control
   trunk/glib-java/debian/libglib-java.install
   trunk/glib-java/debian/rules
Log:
fill -jni and -cni packages


Modified: trunk/glib-java/debian/control
===================================================================
--- trunk/glib-java/debian/control	2007-04-09 22:39:25 UTC (rev 3155)
+++ trunk/glib-java/debian/control	2007-04-10 11:48:20 UTC (rev 3156)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Java maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Mark Howard <mh at debian.org>, Thomas Girard <thomas.g.girard at free.fr>
-Build-Depends: debhelper (>> 5), gcj, java-gcj-compat-dev (>= 1.0.65-6), docbook-utils, cdbs (>= 0.4.34), pkg-config, libglib2.0-dev (>= 2.12.0)
+Build-Depends: debhelper (>> 5), gcj, java-gcj-compat-dev (>= 1.0.65-6), docbook-utils, cdbs (>= 0.4.34), pkg-config, libglib2.0-dev (>= 2.12.0), quilt
 Standards-Version: 3.7.2.0
 
 Package: libglib-java

Added: trunk/glib-java/debian/libglib-cni.install
===================================================================
--- trunk/glib-java/debian/libglib-cni.install	2007-04-09 22:39:25 UTC (rev 3155)
+++ trunk/glib-java/debian/libglib-cni.install	2007-04-10 11:48:20 UTC (rev 3156)
@@ -0,0 +1 @@
+debian/tmp/usr/lib/libglibjava*.so	usr/lib

Modified: trunk/glib-java/debian/libglib-java.install
===================================================================
--- trunk/glib-java/debian/libglib-java.install	2007-04-09 22:39:25 UTC (rev 3155)
+++ trunk/glib-java/debian/libglib-java.install	2007-04-10 11:48:20 UTC (rev 3156)
@@ -1,5 +1 @@
 debian/tmp/usr/share/java/glib*.jar
-debian/tmp/usr/share/glib-java
-debian/tmp/usr/include
-debian/tmp/usr/lib/pkgconfig
-debian/tmp/usr/lib/lib*jni*.so		usr/lib/jni

Added: trunk/glib-java/debian/libglib-jni.install
===================================================================
--- trunk/glib-java/debian/libglib-jni.install	2007-04-09 22:39:25 UTC (rev 3155)
+++ trunk/glib-java/debian/libglib-jni.install	2007-04-10 11:48:20 UTC (rev 3156)
@@ -0,0 +1,4 @@
+debian/tmp/usr/share/glib-java
+debian/tmp/usr/include
+debian/tmp/usr/lib/pkgconfig
+debian/tmp/usr/lib/lib*jni*.so          usr/lib/jni

Modified: trunk/glib-java/debian/rules
===================================================================
--- trunk/glib-java/debian/rules	2007-04-09 22:39:25 UTC (rev 3155)
+++ trunk/glib-java/debian/rules	2007-04-10 11:48:20 UTC (rev 3156)
@@ -1,10 +1,12 @@
 #!/usr/bin/make -f
 
 include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/autotools.mk
 #include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
 base = libglib-java
 jar  = glib0.4.jar
+jni  = libglib-jni
 
 include /usr/share/gcj/debian_defaults
 
@@ -19,6 +21,7 @@
 	docdir='$$(datadir)/doc/$(base)' \
 	apidir='$$(datadir)/doc/$(base)-doc/api'
 
+DEB_DH_MAKESHLIBS_ARGS_ALL = -Xlibjni
 DEB_COMPRESS_EXCLUDE = .java
 
 common-post-build-indep::
@@ -27,9 +30,9 @@
 	    JAVADOC_OPTIONS='' \
 	    JAVADOC_FOOTER=''
 
-binary-post-install/$(base)::
+binary-post-install/$(jni)::
 	sed -i -e 's/-[0-9.]*\.jar$$/.jar/' \
-	    debian/$(base)/usr/lib/pkgconfig/glib-java.pc
+	    debian/$(jni)/usr/lib/pkgconfig/glib-java.pc
 
 binary-post-install/$(base)-gcj::
 	rm -rf debian/$(base)-gcj/usr/share/doc/$(base)-gcj