r2165 - trunk/libgtk-java/debian

[Mark Howard]

Author: mh
Date: 2006-06-03 16:23:17 +0000 (Sat, 03 Jun 2006)
New Revision: 2165

Modified:
   trunk/libgtk-java/debian/changelog
   trunk/libgtk-java/debian/control
   trunk/libgtk-java/debian/rules
Log:
Backported ubuntu changes

Modified: trunk/libgtk-java/debian/changelog
===================================================================
--- trunk/libgtk-java/debian/changelog	2006-06-03 16:19:44 UTC (rev 2164)
+++ trunk/libgtk-java/debian/changelog	2006-06-03 16:23:17 UTC (rev 2165)
@@ -1,3 +1,34 @@
+libgtk-java (2.8.4-1) unstable; urgency=low
+
+  * Back-ported ubunut changes to Debian 
+
+ -- Mark Howard <mh at debian.org>  Sat,  3 Jun 2006 17:22:30 +0100
+
+libgtk-java (2.8.4-0ubuntu4) dapper; urgency=low
+
+  * Make {build-,}depends match pkgconfig, by explicitely noting our
+    build and runtime dependencies on libglib-java and libcairo-java.
+
+ -- Adam Conrad <adconrad at ubuntu.com>  Tue, 25 Apr 2006 15:15:59 +1000
+
+libgtk-java (2.8.4-0ubuntu3) dapper; urgency=low
+
+  * Explicitely build-depend on gcj.
+
+ -- Matthias Klose <doko at ubuntu.com>  Sun, 23 Apr 2006 21:52:38 +0200
+
+libgtk-java (2.8.4-0ubuntu2) dapper; urgency=low
+
+  * Add docbook as build dependency.
+
+ -- Matthias Klose <doko at ubuntu.com>  Sat, 22 Apr 2006 17:01:02 +0200
+
+libgtk-java (2.8.4-0ubuntu1) dapper; urgency=low
+
+  * New upstream version.
+
+ -- Matthias Klose <doko at ubuntu.com>  Sun, 16 Apr 2006 15:37:46 +0000
+
 libgtk-java (2.6.2-4) unstable; urgency=low
 
   * Rebuild with gcj 4, thus depend on libgcj6 which is actully in sid.

Modified: trunk/libgtk-java/debian/control
===================================================================
--- trunk/libgtk-java/debian/control	2006-06-03 16:19:44 UTC (rev 2164)
+++ trunk/libgtk-java/debian/control	2006-06-03 16:23:17 UTC (rev 2165)
@@ -2,13 +2,13 @@
 Section: libs
 Priority: optional
 Maintainer: Mark Howard <mh at debian.org>
-Build-Depends: debhelper (>> 4), libgtk2.0-dev (>=2.6), gcj, docbook-utils, libgcj-dev, cdbs, fastjar, pkg-config, gjdoc
+Build-Depends: debhelper (>> 4), libgtk2.0-dev (>=2.6), gcj, java-gcj-compat-dev, docbook, docbook-utils, cdbs (>= 0.4.34), pkg-config, libglib-java, libcairo-java
 Standards-Version: 3.6.1.0
 
 Package: libgtk-java
 Section: libs
 Architecture: all
-Depends: libgtk-jni (= ${Source-Version})
+Depends: libgtk-jni (= ${Source-Version}), libglib-java, libcairo-java
 Replaces: libgtk0-java, libgtk2-java
 Conflicts: libgtk2-java
 Description: GTK+ bindings for Java

Modified: trunk/libgtk-java/debian/rules
===================================================================
--- trunk/libgtk-java/debian/rules	2006-06-03 16:19:44 UTC (rev 2164)
+++ trunk/libgtk-java/debian/rules	2006-06-03 16:23:17 UTC (rev 2165)
@@ -5,6 +5,8 @@
 include /usr/share/cdbs/1/rules/utils.mk
 include /usr/share/cdbs/1/class/gnome.mk
 
+CFLAGS = -I/usr/lib/jvm/java-gcj/include
+
 clean::
 	-rm -rf doc/api/
 	-find -name *.Plo | xargs rm -f