[pkg-java] r3347 - trunk/libgconf-java/debian

[Thomas Girard]

Author: tgg
Date: 2007-04-25 16:00:07 +0000 (Wed, 25 Apr 2007)
New Revision: 3347

Added:
   trunk/libgconf-java/debian/libgconf-java.NEWS
Modified:
   trunk/libgconf-java/debian/rules
Log:
update rules, add NEWS


Added: trunk/libgconf-java/debian/libgconf-java.NEWS
===================================================================
--- trunk/libgconf-java/debian/libgconf-java.NEWS	2007-04-25 15:13:08 UTC (rev 3346)
+++ trunk/libgconf-java/debian/libgconf-java.NEWS	2007-04-25 16:00:07 UTC (rev 3347)
@@ -0,0 +1,13 @@
+libgconf-java (2.12.6-1) experimental; urgency=low
+
+  libgconf-java was split into libgconf-jni, libgconf-java-doc and
+  libgconf-cni. Only libgconf-jni gets automatically installed, so
+  you'll need to install libgconf-cni and libgconf-java-doc by hand if
+  you need them.
+
+  Also included is libgconf-java-gcj, which contains the new GCJ binary
+  compatible native classes. Debian Java packages should no longer
+  contain the C++ natively compiled code (libgconf-cni here), but an
+  exception was granted for java-gnome libraries.
+
+ --  Thomas Girard <thomas.g.girard at free.fr>  Wed, 25 Apr 2007 14:44:36 +0000

Modified: trunk/libgconf-java/debian/rules
===================================================================
--- trunk/libgconf-java/debian/rules	2007-04-25 15:13:08 UTC (rev 3346)
+++ trunk/libgconf-java/debian/rules	2007-04-25 16:00:07 UTC (rev 3347)
@@ -1,24 +1,37 @@
 #!/usr/bin/make -f
 
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
-include /usr/share/cdbs/1/rules/utils.mk
-include /usr/share/cdbs/1/class/gnome.mk
 
+# make sure we'll run patched distclean: target *before* unpatching
+# because upstream distclean: removes files we want to keep
+clean:: distclean-first
+
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+include /usr/share/cdbs/1/class/autotools.mk
+
 base = libgconf-java
 jar  = gconf2.12.jar
+jni  = libgconf-jni
+cni  = libgconf-cni
 
-with_native := yes
-GCJ = /usr/lib/jvm/java-gcj/bin/gcj
-GCJ_DBTOOL = /usr/lib/jvm/java-gcj/bin/gcj-dbtool
+include /usr/share/gcj/debian_defaults
 
-DEB_CONFIGURE_EXTRA_FLAGS = --without-javadocs --without-gcj-compile
+DEB_HOST_ARCH ?= $(shell dpkg-architecture qDEB_HOST_ARCH)
+ifneq (,$(filter $(DEB_HOST_ARCH), $(gcj_native_archs)))
+  with_native := yes
+endif
 
+DEB_CONFIGURE_EXTRA_FLAGS = --without-javadocs
+
+# we distclean: before unpatching so we don't need cleaning after
+DEB_MAKE_CLEAN_TARGET =
+
 DEB_MAKE_INSTALL_TARGET  := install DESTDIR=$(CURDIR)/debian/tmp/ \
 	docdir='$$(datadir)/doc/$(base)' \
 	apidir='$$(datadir)/doc/$(base)-doc/api'
 
-DEB_DH_MAKESHLIBS_ARGS_ALL = -Xlibgconfjni
+DEB_DH_MAKESHLIBS_ARGS_$(jni) = -n -V "$(jni) (>= 2.12.6)"
+DEB_DH_MAKESHLIBS_ARGS_$(cni) = -V "$(cni) (>= 2.12.6)"
 DEB_COMPRESS_EXCLUDE = .java
 
 common-post-build-indep::
@@ -27,34 +40,20 @@
 	    JAVADOC_OPTIONS='' \
 	    JAVADOC_FOOTER=''
 
-ifeq ($(with_native),yes)
-common-post-build-arch:: $(jar).so
-$(jar).so: $(jar)
-common-post-build-arch::
-	$(GCJ) -O2 -g -Wl,-Bsymbolic,-O1 \
-	    -shared -fPIC -fjni -findirect-dispatch \
-	    -o $(jar).so \
-	    $(jar)
-endif
-
-binary-post-install/$(base)::
+binary-post-install/$(jni)::
 	sed -i -e 's/-[0-9.]*\.jar$$/.jar/' \
-	    debian/$(base)/usr/lib/pkgconfig/gconf-java.pc
+	    debian/$(jni)/usr/lib/pkgconfig/gconf-java.pc
 
-binary-post-install/$(base)-gcj::
-ifeq ($(with_native),yes)
+binary-post-install/$(cni)::
+	mkdir -p debian/$(cni)/usr/share/lintian/overrides
+	cp debian/$(cni).lintian debian/$(cni)/usr/share/lintian/overrides/$(cni)
+
+binary-post-install/$(base)-gcj:: binary-post-install/$(base)
 	rm -rf debian/$(base)-gcj/usr/share/doc/$(base)-gcj
 	ln -s $(base) \
 	    debian/$(base)-gcj/usr/share/doc/$(base)-gcj
-
-	mkdir -p debian/$(base)-gcj/usr/share/gcj/classmap.d
-	$(GCJ_DBTOOL) -n \
-	    debian/$(base)-gcj/usr/share/gcj/classmap.d/$(base).db
-
-	$(GCJ_DBTOOL) -f \
-	    debian/$(base)-gcj/usr/share/gcj/classmap.d/$(base).db \
-	    debian/$(base)/usr/share/java/$(jar) \
-	    /usr/lib/gcj/$(jar).so
+ifeq ($(with_native),yes)
+	dh_nativejava -p$(base)-gcj
 endif
 
 binary-post-install/$(base)-doc::
@@ -66,3 +65,7 @@
 	rm -f $(jar).so
 	find -name *.Plo | xargs -r rm -f
 
+DEB_PHONY_RULES += distclean-first
+
+distclean-first:
+	-test -f debian/stamp-patched && $(DEB_MAKE_INVOKE) -k distclean