r2192 - trunk/libgnome-java/debian

[Mark Howard]

Author: mh
Date: 2006-06-06 10:49:20 +0000 (Tue, 06 Jun 2006)
New Revision: 2192

Modified:
   trunk/libgnome-java/debian/changelog
   trunk/libgnome-java/debian/control
   trunk/libgnome-java/debian/libgnome-java.install
   trunk/libgnome-java/debian/rules
Log:
making ready for release


Modified: trunk/libgnome-java/debian/changelog
===================================================================
--- trunk/libgnome-java/debian/changelog	2006-06-06 10:04:11 UTC (rev 2191)
+++ trunk/libgnome-java/debian/changelog	2006-06-06 10:49:20 UTC (rev 2192)
@@ -1,9 +1,11 @@
 libgnome-java (2.12.2-1) unstable; urgency=low
 
-  * Back-ported ubuntu changes, restoring original binary-package structure. 
-    Thanks to the ubuntu developers listed below. 
+  * Back-ported ubuntu changes, restoring original binary-package structure.
+    Thanks to the ubuntu developers listed below.
+  * Build with recent gcj. Closes: #334816, #369989
+  * Removed libgcj-dev build dependency. Closes: #359732
 
- -- Mark Howard <mh at debian.org>  Sat,  3 Jun 2006 17:30:13 +0100
+ -- Mark Howard <mh at debian.org>  Tue,  6 Jun 2006 11:43:20 +0100
 
 libgnome-java (2.12.2-0ubuntu3) dapper; urgency=low
 

Modified: trunk/libgnome-java/debian/control
===================================================================
--- trunk/libgnome-java/debian/control	2006-06-06 10:04:11 UTC (rev 2191)
+++ trunk/libgnome-java/debian/control	2006-06-06 10:49:20 UTC (rev 2192)
@@ -3,9 +3,8 @@
 Priority: optional
 Maintainer: Debian Java maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Mark Howard <mh at debian.org>
-Build-Depends: debhelper (>> 4), libgtk2.0-dev (>=2.6), libgnome2-dev (>=2.10), libgnomeui-dev, gcj, docbook-utils, libgcj-dev, cdbs, fastjar, pkg-config, gjdoc, libgtk-java (>=2.6)
-Build-Depends: debhelper (>> 4), gcj, java-gcj-compat-dev, docbook-utils, cdbs, pkg-config, libgtk-java (>= 2.8), libgnome2-dev, libglib-java, libgnomeui-dev, libgnomecanvas2-dev, libgtk2.0-dev (>= 2.8)
-Standards-Version: 3.6.1.0
+Build-Depends: debhelper (>> 5), gcj, java-gcj-compat-dev, docbook-utils, cdbs, pkg-config, libgtk-java (>= 2.8), libgnome2-dev, libglib-java, libgnomeui-dev, libgnomecanvas2-dev, libgtk2.0-dev (>= 2.8)
+Standards-Version: 3.7.2.0
 
 Package: libgnome-java
 Section: libs

Modified: trunk/libgnome-java/debian/libgnome-java.install
===================================================================
--- trunk/libgnome-java/debian/libgnome-java.install	2006-06-06 10:04:11 UTC (rev 2191)
+++ trunk/libgnome-java/debian/libgnome-java.install	2006-06-06 10:49:20 UTC (rev 2192)
@@ -1 +1 @@
-debian/tmp/usr/*
+debian/tmp/usr/share/*

Modified: trunk/libgnome-java/debian/rules
===================================================================
--- trunk/libgnome-java/debian/rules	2006-06-06 10:04:11 UTC (rev 2191)
+++ trunk/libgnome-java/debian/rules	2006-06-06 10:49:20 UTC (rev 2192)
@@ -8,13 +8,21 @@
 CFLAGS = -I/usr/lib/jvm/java-gcj/include
 
 binary-post-install/libgnome-java::
-	mv debian/libgnome-java/usr/share/doc/libgnome-java-*/* \
+	-mv debian/libgnome-java/usr/share/doc/libgnome-java-*/* \
 		debian/libgnome-java/usr/share/doc/libgnome-java/
-	rmdir debian/libgnome-java/usr/share/doc/libgnome-java-*
+	-rmdir debian/libgnome-java/usr/share/doc/libgnome-java-*
 	rm -f debian/libgnome-java/usr/share/doc/libgnome-java/COPYING*
 	rm -f debian/libgnome-java/usr/share/doc/libgnome-java/INSTALL*
 	rm -f debian/libgnome-java/usr/share/doc/libgnome-java/NEWS*
 
+binary-post-install/libgnome-jni::
+	-mv debian/libgnome-jni/usr/share/doc/libgnome-jni-*/* \
+		debian/libgnome-jni/usr/share/doc/libgnome-jni/
+	-rmdir debian/libgnome-jni/usr/share/doc/libgnome-jni-*
+	rm -f debian/libgnome-jni/usr/share/doc/libgnome-jni/COPYING*
+	rm -f debian/libgnome-jni/usr/share/doc/libgnome-jni/INSTALL*
+	rm -f debian/libgnome-jni/usr/share/doc/libgnome-jni/NEWS*
+
 clean::
 	-rm -rf doc/api/
 	find -name *.Plo | xargs rm -f