r2166 - trunk/libgnome-java/debian

[Mark Howard]

Author: mh
Date: 2006-06-03 16:31:36 +0000 (Sat, 03 Jun 2006)
New Revision: 2166

Modified:
   trunk/libgnome-java/debian/changelog
   trunk/libgnome-java/debian/control
   trunk/libgnome-java/debian/libgnome-java.install
   trunk/libgnome-java/debian/rules
Log:
import ubuntu changes

Modified: trunk/libgnome-java/debian/changelog
===================================================================
--- trunk/libgnome-java/debian/changelog	2006-06-03 16:23:17 UTC (rev 2165)
+++ trunk/libgnome-java/debian/changelog	2006-06-03 16:31:36 UTC (rev 2166)
@@ -1,3 +1,37 @@
+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. 
+
+ -- Mark Howard <mh at debian.org>  Sat,  3 Jun 2006 17:30:13 +0100
+
+libgnome-java (2.12.2-0ubuntu3) dapper; urgency=low
+
+  * Add build dependency on libgtk2.0-dev (>= 2.8).
+  * Install doc files into proper doc directory.
+
+ -- Matthias Klose <doko at ubuntu.com>  Mon, 24 Apr 2006 19:15:18 +0000
+
+libgnome-java (2.12.2-0ubuntu2) dapper; urgency=low
+
+  * Explicitely build-depend on gcj.
+
+ -- Matthias Klose <doko at ubuntu.com>  Sun, 23 Apr 2006 21:56:08 +0200
+
+libgnome-java (2.12.2-0ubuntu1) dapper; urgency=low
+
+  * New upstream version.
+  * debian/control: Fixes.
+  * debian/rules: Explicitely include -I/usr/lib/jvm/java-gcj/include.
+
+ -- Matthias Klose <doko at ubuntu.com>  Sun, 16 Apr 2006 16:51:04 +0000
+
+libgnome-java (2.12.1-0ubuntu1) breezy; urgency=low
+
+  * Initial release.
+
+ -- root <natem at natemccallum.com>  Sun,  8 Jan 2006 19:35:23 +0000
+
 libgnome-java (2.10.1-1.1) unstable; urgency=high
 
   * Non-maintainer upload.

Modified: trunk/libgnome-java/debian/control
===================================================================
--- trunk/libgnome-java/debian/control	2006-06-03 16:23:17 UTC (rev 2165)
+++ trunk/libgnome-java/debian/control	2006-06-03 16:31:36 UTC (rev 2166)
@@ -1,14 +1,16 @@
 Source: libgnome-java
 Section: libs
 Priority: optional
-Maintainer: Mark Howard <mh at debian.org>
+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
 
 Package: libgnome-java
 Section: libs
 Architecture: all
-Depends: libgnome-jni (= ${Source-Version}), libgtk-java (>=2.6)
+Depends: libgnome-jni (= ${Source-Version}), libgtk-java (>=2.8)
 Replaces: libgnome0-java, libgnome2-java
 Conflicts: libgnome2-java
 Description: Gnome bindings for Java

Modified: trunk/libgnome-java/debian/libgnome-java.install
===================================================================
--- trunk/libgnome-java/debian/libgnome-java.install	2006-06-03 16:23:17 UTC (rev 2165)
+++ trunk/libgnome-java/debian/libgnome-java.install	2006-06-03 16:31:36 UTC (rev 2166)
@@ -1 +1 @@
-debian/tmp/usr/share/*
+debian/tmp/usr/*

Modified: trunk/libgnome-java/debian/rules
===================================================================
--- trunk/libgnome-java/debian/rules	2006-06-03 16:23:17 UTC (rev 2165)
+++ trunk/libgnome-java/debian/rules	2006-06-03 16:31:36 UTC (rev 2166)
@@ -5,6 +5,17 @@
 include /usr/share/cdbs/1/rules/utils.mk
 include /usr/share/cdbs/1/class/gnome.mk
 
+CFLAGS = -I/usr/lib/jvm/java-gcj/include
+
+binary-post-install/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-*
+	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*
+
 clean::
 	-rm -rf doc/api/
-	-find -name *.Plo | xargs rm -f
+	find -name *.Plo | xargs rm -f
+