r2168 - trunk/libgconf-java/debian

[Mark Howard]

Author: mh
Date: 2006-06-03 16:43:18 +0000 (Sat, 03 Jun 2006)
New Revision: 2168

Modified:
   trunk/libgconf-java/debian/changelog
   trunk/libgconf-java/debian/control
   trunk/libgconf-java/debian/rules
Log:
backported ubuntu changes

Modified: trunk/libgconf-java/debian/changelog
===================================================================
--- trunk/libgconf-java/debian/changelog	2006-06-03 16:37:08 UTC (rev 2167)
+++ trunk/libgconf-java/debian/changelog	2006-06-03 16:43:18 UTC (rev 2168)
@@ -1,3 +1,30 @@
+libgconf-java (2.12.2-1) unstable; urgency=low
+
+  * Back-ported Ubuntu changes. 
+    Thanks to the ubuntu developers listed below.
+
+ -- Mark Howard <mh at debian.org>  Sat,  3 Jun 2006 17:42:30 +0100
+
+libgconf-java (2.12.2-0ubuntu2) dapper; urgency=low
+
+  * Install doc files into proper doc directory.
+  * Explicitely build-depend on gcj.
+
+ -- Matthias Klose <doko at ubuntu.com>  Mon, 24 Apr 2006 19:23:46 +0000
+
+libgconf-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:43:23 +0000
+
+libgconf-java (2.12.1-0ubuntu1) breezy; urgency=low
+
+  * Initial release.
+
+ -- root <natem at natemccallum.com>  Sun,  8 Jan 2006 19:34:50 +0000
 libgconf-java (2.10.1-1) unstable; urgency=low
 
   * New upstream release

Modified: trunk/libgconf-java/debian/control
===================================================================
--- trunk/libgconf-java/debian/control	2006-06-03 16:37:08 UTC (rev 2167)
+++ trunk/libgconf-java/debian/control	2006-06-03 16:43:18 UTC (rev 2168)
@@ -1,17 +1,18 @@
 Source: libgconf-java
 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, libgtk-java (>=2.6), libgconf2-dev
+Maintainer: Debian Java maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Uploaders: Mark Howard <mh at debian.org>
+Build-Depends: debhelper (>> 4), gcj, java-gcj-compat-dev, docbook-utils, cdbs, pkg-config, libgtk-java (>= 2.8), libgconf2-dev, libglib-java, libgtk2.0-dev (>= 2.8)
 Standards-Version: 3.6.1.0
 
 Package: libgconf-java
 Section: libs
 Architecture: any
-Depends: libgtk-java (>=2.6)
+Depends: ${shlibs:Depends}
 Replaces: libgtk2-java
 Conflicts: libgtk2-java
-Description: Gconf bindings for Java
+Description: LIBGCONF bindings for Java
  The Java-Gnome project provides a framework for creating Gtk and Gnome
  applications using Java. This covers the entire gtk and gnome API, so you can
  create true gnome applications, which work just like any other desktop
@@ -20,16 +21,16 @@
  should use java-gnome if you want to use standard gtk and gnome features such
  as stock icons, and file chooser buttons; or if you want to use additional
  gnome libraries such as gnome-vfs, vte, libmozembed.
- . 
- This package provides gconf support.
  .
+ This package provides libgconf support.
+ .
  These Debian packages provide both java bytecode for running in a JVM and
  natively compiled code (gcj) to run applications directly. Java-Gnome is also
  available for windows platforms if you want cross-platform compatibility.
  Java-Gnome is now API stable - if you develop an application for java-gnome
  2.x, it will work with java-gnome 2.(x+2). It is also regularly updated to the
  latest bindings - it is part of the official gnome bindings release and
- follows the gnome release schedule. 
+ follows the gnome release schedule.
  .
  http://java-gnome.sf.net
- 
+

Modified: trunk/libgconf-java/debian/rules
===================================================================
--- trunk/libgconf-java/debian/rules	2006-06-03 16:37:08 UTC (rev 2167)
+++ trunk/libgconf-java/debian/rules	2006-06-03 16:43:18 UTC (rev 2168)
@@ -5,6 +5,16 @@
 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/libgconf-java::
+	mv debian/libgconf-java/usr/share/doc/libgconf-java-*/* \
+		debian/libgconf-java/usr/share/doc/libgconf-java/
+	rmdir debian/libgconf-java/usr/share/doc/libgconf-java-*
+	rm -f debian/libgconf-java/usr/share/doc/libgconf-java/COPYING*
+	rm -f debian/libgconf-java/usr/share/doc/libgconf-java/INSTALL*
+
 clean::
 	-rm -rf doc/api/
 	find -name *.Plo | xargs rm -f
+