[pkg-java] r3216 - in trunk/libgtk-java/debian: . patches
Thomas Girard
tgg at alioth.debian.org
Sat Apr 14 19:35:50 UTC 2007
Author: tgg
Date: 2007-04-14 19:35:50 +0000 (Sat, 14 Apr 2007)
New Revision: 3216
Added:
trunk/libgtk-java/debian/patches/
trunk/libgtk-java/debian/patches/01_late_javadoc.diff
trunk/libgtk-java/debian/patches/02_dont_install_jar.diff
trunk/libgtk-java/debian/patches/03_reduce_distclean.diff
trunk/libgtk-java/debian/patches/04_pkgconfig_for_jni.diff
trunk/libgtk-java/debian/patches/series
Modified:
trunk/libgtk-java/debian/changelog
trunk/libgtk-java/debian/control
Log:
once again adapt the patch for java-gnome
Modified: trunk/libgtk-java/debian/changelog
===================================================================
--- trunk/libgtk-java/debian/changelog 2007-04-14 17:44:43 UTC (rev 3215)
+++ trunk/libgtk-java/debian/changelog 2007-04-14 19:35:50 UTC (rev 3216)
@@ -6,7 +6,6 @@
o build depends on java-gcj-compat-dev >= 1.0.65-1.
* New upstream release.
* Tighten build-dependency on libgtk2.0-dev.
- * Drop build-dependency on docbook.
* Use dh_nativejava to build libgtk-java-gcj package.
* Move the CNI native code into new package libgtk-cni.
* Bump debhelper compat level to 5.
Modified: trunk/libgtk-java/debian/control
===================================================================
--- trunk/libgtk-java/debian/control 2007-04-14 17:44:43 UTC (rev 3215)
+++ trunk/libgtk-java/debian/control 2007-04-14 19:35:50 UTC (rev 3216)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian Java maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Mark Howard <mh at debian.org>, Thomas Girard <thomas.g.girard at free.fr>
-Build-Depends: debhelper (>> 5), libgtk2.0-dev (>= 2.10.0), gcj, java-gcj-compat-dev (>= 1.0.65-6), docbook-utils, cdbs (>= 0.4.34), pkg-config, libglib-java (>= 0.4.2-4), libglib-cni, libcairo-java (>= 1.0.8-2), libcairo-cni, quilt (>= 0.29-2), autotools-dev
+Build-Depends: debhelper (>> 5), libgtk2.0-dev (>= 2.10.0), gcj, java-gcj-compat-dev (>= 1.0.65-6), docbook, docbook-utils, cdbs (>= 0.4.34), pkg-config, libglib-java (>= 0.4.2-4), libglib-cni, libcairo-java (>= 1.0.8-2), libcairo-cni, quilt (>= 0.29-2), autotools-dev
Standards-Version: 3.7.2.0
Package: libgtk-java
Added: trunk/libgtk-java/debian/patches/01_late_javadoc.diff
===================================================================
--- trunk/libgtk-java/debian/patches/01_late_javadoc.diff 2007-04-14 17:44:43 UTC (rev 3215)
+++ trunk/libgtk-java/debian/patches/01_late_javadoc.diff 2007-04-14 19:35:50 UTC (rev 3216)
@@ -0,0 +1,109 @@
+Index: libgtk-java-2.10.2/Makefile.am
+===================================================================
+--- libgtk-java-2.10.2.orig/Makefile.am 2007-04-14 18:57:19.000000000 +0000
++++ libgtk-java-2.10.2/Makefile.am 2007-04-14 18:58:04.000000000 +0000
+@@ -747,8 +747,6 @@
+ # build api docs
+ apidir = $(docbasedir)/libgtk-java-$(VERSION)/api
+
+-if BUILD_JAVADOC
+-ALL_LOCAL_DEPS += doc-stamp
+ doc-stamp: $(java_gtk_source_files)
+ $(JAVADOC) \
+ -d doc/api \
+@@ -766,10 +764,6 @@
+ org.gnu.gtk \
+ org.gnu.gtk.event
+ touch doc-stamp
+-else
+-doc-stamp:
+- touch doc-stamp
+-endif
+
+ all-local: $(ALL_LOCAL_DEPS)
+
+@@ -798,19 +792,6 @@
+ mv -f gtk$(gtkapiversion).jar gtk$(gtkapiversion)-$(VERSION).jar && \
+ $(LN_S) gtk$(gtkapiversion)-$(VERSION).jar gtk$(gtkapiversion).jar
+
+-# install api documentation
+-if BUILD_JAVADOC
+- $(mkinstalldirs) $(DESTDIR)$(apidir)
+- @for dir in $(dest_gtk_javadoc_dirs); \
+- do \
+- $(mkinstalldirs) $(DESTDIR)$(apidir)/$${dir}; \
+- done
+- @for file in $(all_dest_gtk_javadoc_html_files); \
+- do \
+- $(INSTALL_DATA) doc/api/$${file} $(DESTDIR)$(apidir)/$${file}; \
+- done
+-endif
+-
+ # install examples
+ @for dir in $(examples); \
+ do \
+Index: libgtk-java-2.10.2/Makefile.in
+===================================================================
+--- libgtk-java-2.10.2.orig/Makefile.in 2007-04-14 18:58:29.000000000 +0000
++++ libgtk-java-2.10.2/Makefile.in 2007-04-14 19:12:46.000000000 +0000
+@@ -12666,25 +12666,23 @@
+ @BUILD_SRCJAR_TRUE at gtk$(gtkapiversion)-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/gnu/gtk/Config.java
+- at BUILD_JAVADOC_TRUE@doc-stamp: $(java_gtk_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 "Java-Gnome $(VERSION) API Reference" \
+- at BUILD_JAVADOC_TRUE@ -doctitle "Java-Gnome $(VERSION) API Reference" \
+- at BUILD_JAVADOC_TRUE@ -footer "$(JAVADOC_FOOTER)" \
+- at BUILD_JAVADOC_TRUE@ -public \
+- at BUILD_JAVADOC_TRUE@ -classpath $(JGJAR):$(CAIROJAR):$(srcdir)/src/java:src/java \
+- at BUILD_JAVADOC_TRUE@ org.gnu.glib \
+- at BUILD_JAVADOC_TRUE@ org.gnu.pango \
+- at BUILD_JAVADOC_TRUE@ org.gnu.atk \
+- at BUILD_JAVADOC_TRUE@ org.gnu.gdk \
+- at BUILD_JAVADOC_TRUE@ org.gnu.gtk \
+- at BUILD_JAVADOC_TRUE@ org.gnu.gtk.event
+- at BUILD_JAVADOC_TRUE@ touch doc-stamp
+- at BUILD_JAVADOC_FALSE@doc-stamp:
+- at BUILD_JAVADOC_FALSE@ touch doc-stamp
++doc-stamp: $(java_gtk_source_files)
++ $(JAVADOC) \
++ -d doc/api \
++ $(JAVADOC_OPTIONS) \
++ -sourcepath $(srcdir)/src/java \
++ -windowtitle "Java-Gnome $(VERSION) API Reference" \
++ -doctitle "Java-Gnome $(VERSION) API Reference" \
++ -footer "$(JAVADOC_FOOTER)" \
++ -public \
++ -classpath $(JGJAR):$(CAIROJAR):$(srcdir)/src/java:src/java \
++ org.gnu.glib \
++ org.gnu.pango \
++ org.gnu.atk \
++ org.gnu.gdk \
++ org.gnu.gtk \
++ org.gnu.gtk.event
++ touch doc-stamp
+
+ all-local: $(ALL_LOCAL_DEPS)
+
+@@ -12700,17 +12698,6 @@
+ mv -f gtk$(gtkapiversion).jar gtk$(gtkapiversion)-$(VERSION).jar && \
+ $(LN_S) gtk$(gtkapiversion)-$(VERSION).jar gtk$(gtkapiversion).jar
+
+-# install api documentation
+- at BUILD_JAVADOC_TRUE@ $(mkinstalldirs) $(DESTDIR)$(apidir)
+- at BUILD_JAVADOC_TRUE@ @for dir in $(dest_gtk_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_gtk_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/libgtk-java/debian/patches/02_dont_install_jar.diff
===================================================================
--- trunk/libgtk-java/debian/patches/02_dont_install_jar.diff 2007-04-14 17:44:43 UTC (rev 3215)
+++ trunk/libgtk-java/debian/patches/02_dont_install_jar.diff 2007-04-14 19:35:50 UTC (rev 3216)
@@ -0,0 +1,32 @@
+Index: libgtk-java-2.10.2/Makefile.am
+===================================================================
+--- libgtk-java-2.10.2.orig/Makefile.am 2007-04-14 19:14:52.000000000 +0000
++++ libgtk-java-2.10.2/Makefile.am 2007-04-14 19:15:24.000000000 +0000
+@@ -787,11 +787,6 @@
+ dest_gtk_javadoc_dirs = $(patsubst doc/api/%,%,$(shell cd doc/api; find . -type d))
+
+ install-data-hook:
+-# install versionless jar symlink
+- cd $(DESTDIR)$(gtk_jardir) && \
+- mv -f gtk$(gtkapiversion).jar gtk$(gtkapiversion)-$(VERSION).jar && \
+- $(LN_S) gtk$(gtkapiversion)-$(VERSION).jar gtk$(gtkapiversion).jar
+-
+ # install examples
+ @for dir in $(examples); \
+ do \
+Index: libgtk-java-2.10.2/Makefile.in
+===================================================================
+--- libgtk-java-2.10.2.orig/Makefile.in 2007-04-14 19:15:36.000000000 +0000
++++ libgtk-java-2.10.2/Makefile.in 2007-04-14 19:15:45.000000000 +0000
+@@ -12693,11 +12693,6 @@
+ mv doc/index.html $@
+
+ install-data-hook:
+-# install versionless jar symlink
+- cd $(DESTDIR)$(gtk_jardir) && \
+- mv -f gtk$(gtkapiversion).jar gtk$(gtkapiversion)-$(VERSION).jar && \
+- $(LN_S) gtk$(gtkapiversion)-$(VERSION).jar gtk$(gtkapiversion).jar
+-
+ # install examples
+ @for dir in $(examples); \
+ do \
Added: trunk/libgtk-java/debian/patches/03_reduce_distclean.diff
===================================================================
--- trunk/libgtk-java/debian/patches/03_reduce_distclean.diff 2007-04-14 17:44:43 UTC (rev 3215)
+++ trunk/libgtk-java/debian/patches/03_reduce_distclean.diff 2007-04-14 19:35:50 UTC (rev 3216)
@@ -0,0 +1,53 @@
+Index: libgtk-java-2.10.2/Makefile.am
+===================================================================
+--- libgtk-java-2.10.2.orig/Makefile.am 2007-04-14 19:20:38.000000000 +0000
++++ libgtk-java-2.10.2/Makefile.am 2007-04-14 19:21:14.000000000 +0000
+@@ -830,17 +830,5 @@
+ -rm -rf $(srcdir)/doc/FAQ $(srcdir)/doc/FAQ.junk
+ -rm -rf doc/api
+
+-# distclean files and directories
+-DISTCLEANFILES = \
+- $(srcdir)/Makefile.jni \
+- $(srcdir)/aclocal.m4 \
+- $(srcdir)/compile \
+- $(srcdir)/config.guess \
+- $(srcdir)/config.sub \
+- $(srcdir)/depcomp \
+- $(srcdir)/install-sh \
+- $(srcdir)/ltmain.sh \
+- $(srcdir)/missing
+-
+ distclean-local:
+ -rm -rf $(srcdir)/autom4te.cache
+Index: libgtk-java-2.10.2/Makefile.in
+===================================================================
+--- libgtk-java-2.10.2.orig/Makefile.in 2007-04-14 19:21:29.000000000 +0000
++++ libgtk-java-2.10.2/Makefile.in 2007-04-14 19:22:02.000000000 +0000
+@@ -2759,18 +2759,6 @@
+ $(example_files)
+
+
+-# distclean files and directories
+-DISTCLEANFILES = \
+- $(srcdir)/Makefile.jni \
+- $(srcdir)/aclocal.m4 \
+- $(srcdir)/compile \
+- $(srcdir)/config.guess \
+- $(srcdir)/config.sub \
+- $(srcdir)/depcomp \
+- $(srcdir)/install-sh \
+- $(srcdir)/ltmain.sh \
+- $(srcdir)/missing
+-
+ all: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) all-am
+
+@@ -11780,7 +11768,6 @@
+ -rm -f src/java/org/gnu/pango/$(am__dirstamp)
+ -rm -f src/jni/$(DEPDIR)/$(am__dirstamp)
+ -rm -f src/jni/$(am__dirstamp)
+- -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
Added: trunk/libgtk-java/debian/patches/04_pkgconfig_for_jni.diff
===================================================================
--- trunk/libgtk-java/debian/patches/04_pkgconfig_for_jni.diff 2007-04-14 17:44:43 UTC (rev 3215)
+++ trunk/libgtk-java/debian/patches/04_pkgconfig_for_jni.diff 2007-04-14 19:35:50 UTC (rev 3216)
@@ -0,0 +1,12 @@
+Index: libgtk-java-2.10.2/gtk2-java.pc.in
+===================================================================
+--- libgtk-java-2.10.2.orig/gtk2-java.pc.in 2007-04-14 19:24:33.000000000 +0000
++++ libgtk-java-2.10.2/gtk2-java.pc.in 2007-04-14 19:25:31.000000000 +0000
+@@ -13,6 +13,6 @@
+ api_version=@gtkapiversion@
+ classpath=@INSTALLED_CLASSPATH@
+ macro_dir=@INSTALLED_MACRO_DIR@
+-jnilibs=-L at libdir@ -lgtkjni
++jnilibs=-L at libdir@/jni -lgtkjni
+ Libs: -L at libdir@ -lgtkjava
+ Cflags: -I at includedir@/libgtk-java
Added: trunk/libgtk-java/debian/patches/series
===================================================================
--- trunk/libgtk-java/debian/patches/series 2007-04-14 17:44:43 UTC (rev 3215)
+++ trunk/libgtk-java/debian/patches/series 2007-04-14 19:35:50 UTC (rev 3216)
@@ -0,0 +1,4 @@
+01_late_javadoc.diff
+02_dont_install_jar.diff
+03_reduce_distclean.diff
+04_pkgconfig_for_jni.diff
More information about the pkg-java-commits
mailing list