[pkg-java] r3200 - in trunk/cairo-java/debian: . patches
Thomas Girard
tgg at alioth.debian.org
Sat Apr 14 13:51:20 UTC 2007
Author: tgg
Date: 2007-04-14 13:51:19 +0000 (Sat, 14 Apr 2007)
New Revision: 3200
Added:
trunk/cairo-java/debian/libcairo-cni.install
trunk/cairo-java/debian/libcairo-cni.lintian
trunk/cairo-java/debian/libcairo-java-doc.doc-base
trunk/cairo-java/debian/libcairo-java-doc.install
trunk/cairo-java/debian/libcairo-java.NEWS
trunk/cairo-java/debian/libcairo-java.install
trunk/cairo-java/debian/libcairo-jni.install
trunk/cairo-java/debian/patches/01_late_javadoc.diff
trunk/cairo-java/debian/patches/02_dont_install_jar.diff
trunk/cairo-java/debian/patches/03_reduce_distclean.diff
trunk/cairo-java/debian/patches/04_pkgconfig_for_jni.diff
trunk/cairo-java/debian/patches/series
Removed:
trunk/cairo-java/debian/cairo-java.install
trunk/cairo-java/debian/libcairo-java.lintian
Modified:
trunk/cairo-java/debian/changelog
trunk/cairo-java/debian/compat
trunk/cairo-java/debian/control
trunk/cairo-java/debian/rules
Log:
merge with ubuntu and add -cni and -jni packages
Deleted: trunk/cairo-java/debian/cairo-java.install
===================================================================
--- trunk/cairo-java/debian/cairo-java.install 2007-04-14 13:00:48 UTC (rev 3199)
+++ trunk/cairo-java/debian/cairo-java.install 2007-04-14 13:51:19 UTC (rev 3200)
@@ -1 +0,0 @@
-debian/tmp/usr/*
Modified: trunk/cairo-java/debian/changelog
===================================================================
--- trunk/cairo-java/debian/changelog 2007-04-14 13:00:48 UTC (rev 3199)
+++ trunk/cairo-java/debian/changelog 2007-04-14 13:51:19 UTC (rev 3200)
@@ -1,3 +1,18 @@
+cairo-java (1.0.8-2) experimental; urgency=low
+
+ * Add myself to Uploaders: field.
+ * Bump debhelper level to 5.
+ * Merge with Ubuntu:
+ o move documentation into libcairo-java-doc package.
+ o new package, libcairo-java-gcj, containing the GCJ binary compatible
+ native code.
+ * New packages libcairo-jni and libcairo-cni, split from libcairo-java so
+ that the latter can be Arch:all.
+ * Use quilt to manage patches.
+ * Add autotools-dev build dependency.
+
+ -- Thomas Girard <thomas.g.girard at free.fr> Sat, 14 Apr 2007 07:14:04 +0000
+
cairo-java (1.0.8-1) unstable; urgency=low
* New upstream release
@@ -7,6 +22,33 @@
-- Mark Howard <mh at debian.org> Mon, 19 Feb 2007 19:28:15 +0000
+cairo-java (1.0.6-0ubuntu1) feisty; urgency=low
+
+ * New upstream version.
+
+ -- Matthias Klose <doko at ubuntu.com> Sat, 6 Jan 2007 20:51:00 +0000
+
+cairo-java (1.0.5-0ubuntu2) edgy; urgency=low
+
+ * Use dh_nativejava to build the -gcj package.
+ * libglib-java: Recommend libglib-java-gcj.
+
+ -- Matthias Klose <doko at ubuntu.com> Mon, 9 Oct 2006 20:40:41 +0200
+
+cairo-java (1.0.5-0ubuntu1) edgy; urgency=low
+
+ * New upstream release.
+ * Makefile.am: Unconditionalize the doc-stamp target, remove the
+ install-data-hook.
+ * Split out libcairo-java-doc. Configure --without-javadocs, because gjdoc
+ fails on some architectures.
+ * Split out libcairo-java-gcj.
+ * Configure --without-gcj-compile; rebuild the natively compiled for gcj
+ from bytecode instead from source using using -fjni -findirect-dispatch.
+ * Do not install a shlibs file for the jni library.
+
+ -- Matthias Klose <doko at ubuntu.com> Wed, 16 Aug 2006 18:41:41 +0000
+
cairo-java (1.0.4-1) unstable; urgency=low
* New upstream release
Modified: trunk/cairo-java/debian/compat
===================================================================
--- trunk/cairo-java/debian/compat 2007-04-14 13:00:48 UTC (rev 3199)
+++ trunk/cairo-java/debian/compat 2007-04-14 13:51:19 UTC (rev 3200)
@@ -1 +1 @@
-4
+5
Modified: trunk/cairo-java/debian/control
===================================================================
--- trunk/cairo-java/debian/control 2007-04-14 13:00:48 UTC (rev 3199)
+++ trunk/cairo-java/debian/control 2007-04-14 13:51:19 UTC (rev 3200)
@@ -2,17 +2,18 @@
Section: libs
Priority: optional
Maintainer: Debian Java maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Mark Howard <mh at debian.org>
-Build-Depends: debhelper (>> 5), gcj, java-gcj-compat-dev, docbook-utils, cdbs (>= 0.4.34), pkg-config, libfontconfig1-dev, libcairo2-dev, libglib-java, libglib2.0-dev
+Uploaders: Mark Howard <mh at debian.org>, Thomas Girard <thomas.g.girard at free.fr>
+Build-Depends: debhelper (>> 5), gcj, java-gcj-compat-dev (>= 1.0.65-6), docbook-utils, cdbs (>= 0.4.34), pkg-config, libfontconfig1-dev, libcairo2-dev, libglib-java (>= 0.4), libglib-java-doc, libglib-jni (>= 0.4.2-4), libglib-cni, libglib2.0-dev, quilt (>= 0.29-2), autotools-dev
Standards-Version: 3.7.2.0
Package: libcairo-java
Section: libs
-Architecture: any
-Depends: ${shlibs:Depends}
+Architecture: all
+Depends: libcairo-jni (>= ${source:Version}), libglib-java (>= 0.4)
Replaces: libgtk2-java, cairo-java
+Recommends: libcairo-java-gcj
Conflicts: libgtk2-java
-Description: CAIRO bindings for Java
+Description: Cairo 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
@@ -22,15 +23,78 @@
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 cairo support.
+ This package provides architecture-independant files for Cairo bindings.
.
- 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.
+ http://java-gnome.sf.net
+
+Package: libcairo-java-gcj
+Section: libs
+Architecture: any
+Depends: libcairo-java (>= ${source:Version}), libglib-java-gcj, ${misc:Depends}, ${shlibs:Depends}
+Description: Cairo bindings for Java (native code for use with gij)
+ 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
+ application. Most other Java UI toolkits such as SWT or swing provide at most
+ compatibility layers so that your app will look like gnome appliactions. You
+ 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 natively compiled code to run with gij.
+ .
http://java-gnome.sf.net
+Package: libcairo-java-doc
+Section: doc
+Architecture: all
+Depends: classpath-doc, libglib-java-doc
+Replaces: libcairo-java (<< 1.0.8-2)
+Description: Cairo bindings for Java (API documentation)
+ 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
+ application. Most other Java UI toolkits such as SWT or swing provide at most
+ compatibility layers so that your app will look like gnome appliactions. You
+ 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 contains the API documentation for the Cairo bindings.
+
+Package: libcairo-jni
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}
+Conflicts: libcairo-java (<< 1.0.8-2)
+Description: Cairo bindings for Java (native library)
+ 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
+ application. Most other Java UI toolkits such as SWT or swing provide at most
+ compatibility layers so that your app will look like gnome appliactions. You
+ 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 the architecture-dependant library for Cairo bindings.
+ .
+ http://java-gnome.sf.net
+
+Package: libcairo-cni
+Section: libs
+Architecture: any
+Depends: libcairo-jni (= ${binary:Version}), ${shlibs:Depends}
+Description: Cairo bindings for Java (native code)
+ 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
+ application. Most other Java UI toolkits such as SWT or swing provide at most
+ compatibility layers so that your app will look like gnome appliactions. You
+ 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 natively compiled code for Cairo bindings.
+ .
+ http://java-gnome.sf.net
Added: trunk/cairo-java/debian/libcairo-cni.install
===================================================================
--- trunk/cairo-java/debian/libcairo-cni.install 2007-04-14 13:00:48 UTC (rev 3199)
+++ trunk/cairo-java/debian/libcairo-cni.install 2007-04-14 13:51:19 UTC (rev 3200)
@@ -0,0 +1 @@
+debian/tmp/usr/lib/libcairojava*.so usr/lib
\ No newline at end of file
Added: trunk/cairo-java/debian/libcairo-cni.lintian
===================================================================
--- trunk/cairo-java/debian/libcairo-cni.lintian 2007-04-14 13:00:48 UTC (rev 3199)
+++ trunk/cairo-java/debian/libcairo-cni.lintian 2007-04-14 13:51:19 UTC (rev 3200)
@@ -0,0 +1 @@
+libcairo-cni: package-name-doesnt-match-sonames libcairojava-1.0
Added: trunk/cairo-java/debian/libcairo-java-doc.doc-base
===================================================================
--- trunk/cairo-java/debian/libcairo-java-doc.doc-base 2007-04-14 13:00:48 UTC (rev 3199)
+++ trunk/cairo-java/debian/libcairo-java-doc.doc-base 2007-04-14 13:51:19 UTC (rev 3200)
@@ -0,0 +1,9 @@
+Document: libcairo-java-doc
+Title: Programmer API for Cairo Java bindings
+Author: Jeffrey S. Morgan <kuzman at gmail.com>
+Abstract: Javadocs programmer API for the Cairo Java bindings
+Section: Programming
+
+Format: HTML
+Index: /usr/share/doc/libcairo-java/api/index.html
+Files: /usr/share/doc/libcairo-java/api/*.html
Added: trunk/cairo-java/debian/libcairo-java-doc.install
===================================================================
--- trunk/cairo-java/debian/libcairo-java-doc.install 2007-04-14 13:00:48 UTC (rev 3199)
+++ trunk/cairo-java/debian/libcairo-java-doc.install 2007-04-14 13:51:19 UTC (rev 3200)
@@ -0,0 +1 @@
+doc/api usr/share/doc/libcairo-java
Added: trunk/cairo-java/debian/libcairo-java.NEWS
===================================================================
--- trunk/cairo-java/debian/libcairo-java.NEWS 2007-04-14 13:00:48 UTC (rev 3199)
+++ trunk/cairo-java/debian/libcairo-java.NEWS 2007-04-14 13:51:19 UTC (rev 3200)
@@ -0,0 +1,13 @@
+cairo-java (1.0.8-2) experimental; urgency=low
+
+ libcairo-java was split into libcairo-jni, libcairo-java-doc and
+ libcairo-cni. Only libcairo-jni gets automatically installed, so
+ you'll need to install libcairo-cni and libcairo-java-doc by hand if
+ you need them.
+
+ Also included is libcairo-java-gcj, which contains the new GCJ binary
+ compatible native classes. Debian Java packages should no longer
+ contain the C++ natively compiled code (libcairo-cni here), but an
+ exception was granted for java-gnome libraries.
+
+ -- Thomas Girard <thomas.g.girard at free.fr> Thu, 12 Apr 2007 20:44:49 +0000
Copied: trunk/cairo-java/debian/libcairo-java.install (from rev 3179, trunk/cairo-java/debian/cairo-java.install)
===================================================================
--- trunk/cairo-java/debian/cairo-java.install 2007-04-12 08:38:11 UTC (rev 3179)
+++ trunk/cairo-java/debian/libcairo-java.install 2007-04-14 13:51:19 UTC (rev 3200)
@@ -0,0 +1 @@
+debian/tmp/usr/share/java/cairo*.jar
Deleted: trunk/cairo-java/debian/libcairo-java.lintian
===================================================================
--- trunk/cairo-java/debian/libcairo-java.lintian 2007-04-14 13:00:48 UTC (rev 3199)
+++ trunk/cairo-java/debian/libcairo-java.lintian 2007-04-14 13:51:19 UTC (rev 3200)
@@ -1,3 +0,0 @@
-# Following java naming conventions.
-# package isn't big enough to have a separate -jni package
-libcairo-java: package-name-doesnt-match-sonames libcairojava-1.0 libcairojni-1.0
Added: trunk/cairo-java/debian/libcairo-jni.install
===================================================================
--- trunk/cairo-java/debian/libcairo-jni.install 2007-04-14 13:00:48 UTC (rev 3199)
+++ trunk/cairo-java/debian/libcairo-jni.install 2007-04-14 13:51:19 UTC (rev 3200)
@@ -0,0 +1,2 @@
+debian/tmp/usr/lib/pkgconfig
+debian/tmp/usr/lib/lib*jni*.so usr/lib/jni
Added: trunk/cairo-java/debian/patches/01_late_javadoc.diff
===================================================================
--- trunk/cairo-java/debian/patches/01_late_javadoc.diff 2007-04-14 13:00:48 UTC (rev 3199)
+++ trunk/cairo-java/debian/patches/01_late_javadoc.diff 2007-04-14 13:51:19 UTC (rev 3200)
@@ -0,0 +1,94 @@
+Index: cairo-java-1.0.8/Makefile.am
+===================================================================
+--- cairo-java-1.0.8.orig/Makefile.am 2007-04-14 12:53:01.000000000 +0000
++++ cairo-java-1.0.8/Makefile.am 2007-04-14 13:18:35.000000000 +0000
+@@ -126,8 +126,6 @@
+ # build api docs
+ apidir = $(docbasedir)/cairo-java-$(VERSION)/api
+
+-if BUILD_JAVADOC
+-ALL_LOCAL_DEPS += doc-stamp
+ doc-stamp: $(java_cairo_source_files)
+ $(JAVADOC) \
+ -d doc/api \
+@@ -140,7 +138,6 @@
+ -classpath $(JGJAR):$(srcdir)/src/java:src/java \
+ org.freedesktop.cairo
+ touch doc-stamp
+-endif
+
+ all-local: $(ALL_LOCAL_DEPS)
+
+@@ -157,19 +154,6 @@
+ mv -f cairo$(apiversion).jar cairo$(apiversion)-$(VERSION).jar && \
+ $(LN_S) cairo$(apiversion)-$(VERSION).jar cairo$(apiversion).jar
+
+-# install api documentation
+-if BUILD_JAVADOC
+- $(mkinstalldirs) $(DESTDIR)$(apidir)
+- @for dir in $(dest_cairo_javadoc_dirs); \
+- do \
+- $(mkinstalldirs) $(DESTDIR)$(apidir)/$${dir}; \
+- done
+- @for file in $(all_dest_cairo_javadoc_html_files); \
+- do \
+- $(INSTALL_DATA) doc/api/$${file} $(DESTDIR)$(apidir)/$${file}; \
+- done
+-endif
+-
+ # install examples
+ @for dir in $(examples); \
+ do \
+Index: cairo-java-1.0.8/Makefile.in
+===================================================================
+--- cairo-java-1.0.8.orig/Makefile.in 2007-04-14 12:55:42.000000000 +0000
++++ cairo-java-1.0.8/Makefile.in 2007-04-14 13:17:14.000000000 +0000
+@@ -1615,18 +1615,18 @@
+ @BUILD_SRCJAR_TRUE at cairo$(apiversion)-src.jar:
+ @BUILD_SRCJAR_TRUE@ $(JAR) cf $@ $(patsubst src/java/%.java,-C $(top_srcdir)/src/java %.java,$(srcjar_files))
+ @BUILD_SRCJAR_TRUE@ $(JAR) uf $@ -C src/java org/freedesktop/cairo/Config.java
+- at BUILD_JAVADOC_TRUE@doc-stamp: $(java_cairo_source_files)
+- at BUILD_JAVADOC_TRUE@ $(JAVADOC) \
+- at BUILD_JAVADOC_TRUE@ -d doc/api \
+- at BUILD_JAVADOC_TRUE@ $(JAVADOC_OPTIONS) \
+- at BUILD_JAVADOC_TRUE@ -sourcepath $(srcdir)/src/java \
+- at BUILD_JAVADOC_TRUE@ -windowtitle "Cairo-Java $(VERSION) API Reference" \
+- at BUILD_JAVADOC_TRUE@ -doctitle "Cairo-Java $(VERSION) API Reference" \
+- at BUILD_JAVADOC_TRUE@ -footer "$(JAVADOC_FOOTER)" \
+- at BUILD_JAVADOC_TRUE@ -public \
+- at BUILD_JAVADOC_TRUE@ -classpath $(JGJAR):$(srcdir)/src/java:src/java \
+- at BUILD_JAVADOC_TRUE@ org.freedesktop.cairo
+- at BUILD_JAVADOC_TRUE@ touch doc-stamp
++doc-stamp: $(java_cairo_source_files)
++ $(JAVADOC) \
++ -d doc/api \
++ $(JAVADOC_OPTIONS) \
++ -sourcepath $(srcdir)/src/java \
++ -windowtitle "Cairo-Java $(VERSION) API Reference" \
++ -doctitle "Cairo-Java $(VERSION) API Reference" \
++ -footer "$(JAVADOC_FOOTER)" \
++ -public \
++ -classpath $(JGJAR):$(srcdir)/src/java:src/java \
++ org.freedesktop.cairo
++ touch doc-stamp
+
+ all-local: $(ALL_LOCAL_DEPS)
+
+@@ -1635,17 +1635,6 @@
+ mv -f cairo$(apiversion).jar cairo$(apiversion)-$(VERSION).jar && \
+ $(LN_S) cairo$(apiversion)-$(VERSION).jar cairo$(apiversion).jar
+
+-# install api documentation
+- at BUILD_JAVADOC_TRUE@ $(mkinstalldirs) $(DESTDIR)$(apidir)
+- at BUILD_JAVADOC_TRUE@ @for dir in $(dest_cairo_javadoc_dirs); \
+- at BUILD_JAVADOC_TRUE@ do \
+- at BUILD_JAVADOC_TRUE@ $(mkinstalldirs) $(DESTDIR)$(apidir)/$${dir}; \
+- at BUILD_JAVADOC_TRUE@ done
+- at BUILD_JAVADOC_TRUE@ @for file in $(all_dest_cairo_javadoc_html_files); \
+- at BUILD_JAVADOC_TRUE@ do \
+- at BUILD_JAVADOC_TRUE@ $(INSTALL_DATA) doc/api/$${file} $(DESTDIR)$(apidir)/$${file}; \
+- at BUILD_JAVADOC_TRUE@ done
+-
+ # install examples
+ @for dir in $(examples); \
+ do \
Added: trunk/cairo-java/debian/patches/02_dont_install_jar.diff
===================================================================
--- trunk/cairo-java/debian/patches/02_dont_install_jar.diff 2007-04-14 13:00:48 UTC (rev 3199)
+++ trunk/cairo-java/debian/patches/02_dont_install_jar.diff 2007-04-14 13:51:19 UTC (rev 3200)
@@ -0,0 +1,30 @@
+Index: cairo-java-1.0.8/Makefile.am
+===================================================================
+--- cairo-java-1.0.8.orig/Makefile.am 2007-04-14 13:18:35.000000000 +0000
++++ cairo-java-1.0.8/Makefile.am 2007-04-14 13:19:50.000000000 +0000
+@@ -150,10 +150,6 @@
+ dest_cairo_javadoc_dirs = $(patsubst doc/api/%,%,$(shell cd doc/api; find . -type d))
+
+ install-data-hook:
+- cd $(DESTDIR)$(jardir) && \
+- mv -f cairo$(apiversion).jar cairo$(apiversion)-$(VERSION).jar && \
+- $(LN_S) cairo$(apiversion)-$(VERSION).jar cairo$(apiversion).jar
+-
+ # install examples
+ @for dir in $(examples); \
+ do \
+Index: cairo-java-1.0.8/Makefile.in
+===================================================================
+--- cairo-java-1.0.8.orig/Makefile.in 2007-04-14 13:17:14.000000000 +0000
++++ cairo-java-1.0.8/Makefile.in 2007-04-14 13:19:12.000000000 +0000
+@@ -1631,10 +1631,6 @@
+ all-local: $(ALL_LOCAL_DEPS)
+
+ install-data-hook:
+- cd $(DESTDIR)$(jardir) && \
+- mv -f cairo$(apiversion).jar cairo$(apiversion)-$(VERSION).jar && \
+- $(LN_S) cairo$(apiversion)-$(VERSION).jar cairo$(apiversion).jar
+-
+ # install examples
+ @for dir in $(examples); \
+ do \
Added: trunk/cairo-java/debian/patches/03_reduce_distclean.diff
===================================================================
--- trunk/cairo-java/debian/patches/03_reduce_distclean.diff 2007-04-14 13:00:48 UTC (rev 3199)
+++ trunk/cairo-java/debian/patches/03_reduce_distclean.diff 2007-04-14 13:51:19 UTC (rev 3200)
@@ -0,0 +1,48 @@
+Index: cairo-java-1.0.8/Makefile.am
+===================================================================
+--- cairo-java-1.0.8.orig/Makefile.am 2007-04-14 13:23:01.000000000 +0000
++++ cairo-java-1.0.8/Makefile.am 2007-04-14 13:29:21.000000000 +0000
+@@ -180,18 +180,7 @@
+ -rm -rf $(srcdir)/autom4te.cache
+
+ DISTCLEANFILES = \
+- cairo-java.pc \
+- src/java/org/freedesktop/cairo/Config.java \
+- $(srcdir)/Makefile.in \
+- $(srcdir)/aclocal.m4 \
+- $(srcdir)/compile \
+- $(srcdir)/config.guess \
+- $(srcdir)/config.sub \
+- $(srcdir)/configure \
+- $(srcdir)/depcomp \
+- $(srcdir)/install-sh \
+- $(srcdir)/ltmain.sh \
+- $(srcdir)/missing
++ cairo-java.pc
+
+ CLEANFILES += \
+ doc-stamp \
+Index: cairo-java-1.0.8/Makefile.in
+===================================================================
+--- cairo-java-1.0.8.orig/Makefile.in 2007-04-14 13:25:24.000000000 +0000
++++ cairo-java-1.0.8/Makefile.in 2007-04-14 13:30:15.000000000 +0000
+@@ -504,18 +504,7 @@
+ $(example_files)
+
+ DISTCLEANFILES = \
+- cairo-java.pc \
+- src/java/org/freedesktop/cairo/Config.java \
+- $(srcdir)/Makefile.in \
+- $(srcdir)/aclocal.m4 \
+- $(srcdir)/compile \
+- $(srcdir)/config.guess \
+- $(srcdir)/config.sub \
+- $(srcdir)/configure \
+- $(srcdir)/depcomp \
+- $(srcdir)/install-sh \
+- $(srcdir)/ltmain.sh \
+- $(srcdir)/missing
++ cairo-java.pc
+
+ all: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) all-am
Added: trunk/cairo-java/debian/patches/04_pkgconfig_for_jni.diff
===================================================================
--- trunk/cairo-java/debian/patches/04_pkgconfig_for_jni.diff 2007-04-14 13:00:48 UTC (rev 3199)
+++ trunk/cairo-java/debian/patches/04_pkgconfig_for_jni.diff 2007-04-14 13:51:19 UTC (rev 3200)
@@ -0,0 +1,11 @@
+Index: cairo-java-1.0.8/cairo-java.pc.in
+===================================================================
+--- cairo-java-1.0.8.orig/cairo-java.pc.in 2007-04-14 13:32:26.000000000 +0000
++++ cairo-java-1.0.8/cairo-java.pc.in 2007-04-14 13:32:37.000000000 +0000
+@@ -11,5 +11,5 @@
+ Requires: cairo glib-java
+ api_version=@apiversion@
+ classpath=@INSTALLED_CLASSPATH@
+-jnilibs=-L at libdir@ -lcairojni
++jnilibs=-L at libdir@/jni -lcairojni
+ Libs: -L at libdir@ -lcairojava
Added: trunk/cairo-java/debian/patches/series
===================================================================
--- trunk/cairo-java/debian/patches/series 2007-04-14 13:00:48 UTC (rev 3199)
+++ trunk/cairo-java/debian/patches/series 2007-04-14 13:51:19 UTC (rev 3200)
@@ -0,0 +1,4 @@
+01_late_javadoc.diff
+02_dont_install_jar.diff
+03_reduce_distclean.diff
+04_pkgconfig_for_jni.diff
Modified: trunk/cairo-java/debian/rules
===================================================================
--- trunk/cairo-java/debian/rules 2007-04-14 13:00:48 UTC (rev 3199)
+++ trunk/cairo-java/debian/rules 2007-04-14 13:51:19 UTC (rev 3200)
@@ -1,22 +1,69 @@
#!/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
-CFLAGS = -I/usr/lib/jvm/java-gcj/include
+# make sure we'll run patched distclean: target *before* unpatching
+# because upstream distclean: removes files we want to keep
+clean:: distclean-first
-binary-post-install/libcairo-java::
- mv debian/libcairo-java/usr/share/doc/cairo-java-*/* \
- debian/libcairo-java/usr/share/doc/libcairo-java/
- rmdir debian/libcairo-java/usr/share/doc/cairo-java-*
- rm -f debian/libcairo-java/usr/share/doc/libcairo-java/COPYING*
- rm -f debian/libcairo-java/usr/share/doc/libcairo-java/INSTALL*
- mkdir -p debian/libcairo-java/usr/share/lintian/overrides/
- cp debian/libcairo-java.lintian debian/libcairo-java/usr/share/lintian/overrides/libcairo-java
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+include /usr/share/cdbs/1/class/autotools.mk
+base = libcairo-java
+jar = cairo1.0.jar
+jni = libcairo-jni
+cni = libcairo-cni
+
+include /usr/share/gcj/debian_defaults
+
+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
+
+DEB_MAKE_INSTALL_TARGET := install DESTDIR=$(CURDIR)/debian/tmp/ \
+ docdir='$$(datadir)/doc/$(base)' \
+ apidir='$$(datadir)/doc/$(base)-doc/api'
+
+DEB_DH_MAKESHLIBS_ARGS_$(jni) = -n
+DEB_DH_SHLIBDEPS_ARGS_$(jni) = -l/usr/lib/jni
+DEB_COMPRESS_EXCLUDE = .java
+DEB_PHONY_RULES += distclean-first
+
+common-post-build-indep::
+ $(MAKE) doc-stamp \
+ JAVADOC=gjdoc \
+ JAVADOC_OPTIONS='' \
+ JAVADOC_FOOTER=''
+
+binary-post-install/$(jni)::
+ sed -i -e 's/-[0-9.]*\.jar$$/.jar/' \
+ debian/$(jni)/usr/lib/pkgconfig/cairo-java.pc
+
+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::
+ rm -rf debian/$(base)-gcj/usr/share/doc/$(base)-gcj
+ ln -s $(base) \
+ debian/$(base)-gcj/usr/share/doc/$(base)-gcj
+ifeq ($(with_native),yes)
+ dh_nativejava -p$(base)-gcj
+endif
+
+binary-post-install/$(base)-doc::
+ cd debian/$(base)-doc/usr/share/doc/$(base)-doc \
+ && rm -f changelog
+
clean::
- -rm -rf doc/api/
- find -name *.Plo | xargs rm -f
+ rm -rf doc/api
+ rm -f $(jar).so
+ find -name *.Plo | xargs -r rm -f
+DEB_PHONY_RULES += distclean-first
+
+distclean-first: debian/stamp-patched
+ -$(DEB_MAKE_INVOKE) -k distclean
More information about the pkg-java-commits
mailing list