[pkg-java] r3314 - in trunk/libglade-java/debian: . patches
Thomas Girard
tgg at alioth.debian.org
Mon Apr 23 21:14:43 UTC 2007
Author: tgg
Date: 2007-04-23 21:14:42 +0000 (Mon, 23 Apr 2007)
New Revision: 3314
Added:
trunk/libglade-java/debian/patches/01_late_javadoc.diff
trunk/libglade-java/debian/patches/03_reduce_distclean.diff
trunk/libglade-java/debian/patches/04_pkgconfig_for_jni.diff
Modified:
trunk/libglade-java/debian/changelog
trunk/libglade-java/debian/control
Log:
add patches
Modified: trunk/libglade-java/debian/changelog
===================================================================
--- trunk/libglade-java/debian/changelog 2007-04-23 20:33:22 UTC (rev 3313)
+++ trunk/libglade-java/debian/changelog 2007-04-23 21:14:42 UTC (rev 3314)
@@ -3,9 +3,9 @@
* Add myself to Uploaders.
* Merge with Ubuntu:
o new packages libglade-java-doc, libglade-java-gcj
- o bump standards
+ o bump standards to 3.7.2
o tighten build-dependencies on java-gcj-compat-dev, libgnome-java,
- libgtk-java and libglib-java.
+ libgtk-java and libglib-java
* New upstream release.
* Bump debhelper level and build-dependency.
* New packages, libglade-cni and libglade-jni.
Modified: trunk/libglade-java/debian/control
===================================================================
--- trunk/libglade-java/debian/control 2007-04-23 20:33:22 UTC (rev 3313)
+++ trunk/libglade-java/debian/control 2007-04-23 21:14:42 UTC (rev 3314)
@@ -3,13 +3,13 @@
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), gcj, java-gcj-compat-dev (>= 1.0.65-6), docbook-utils, cdbs, pkg-config, libgnome-java (>= 2.12.6), libgtk-java (>= 2.10), libglib-java (>= 0.4), libgnome2-dev, libglade2-dev, libgnomeui-dev, libgnomecanvas2-dev, quilt (>= 0.29-2), autotools-dev
+Build-Depends: debhelper (>> 5), gcj, java-gcj-compat-dev (>= 1.0.65-6), docbook-utils, cdbs, pkg-config, libgnome-java (>= 2.12.7), libgnome-cni (>= 2.12.7), libgtk-java (>= 2.10.2), libgtk-cni (>= 2.10.2), libglib-java (>= 0.4.2), libglib-cni (>= 0.4.2), libglade2-dev (>= 2.5.1), libgnomeui-dev (>= 2.11.0), libgnomecanvas2-dev (>= 2.11.0), quilt (>= 0.29-2), autotools-dev
Standards-Version: 3.7.2
Package: libglade-java
Section: libs
Architecture: all
-Depends: libglade-jni (>= ${source:Version}), libgnome-java (>= 2.12.6)
+Depends: libglade-jni (>= ${source:Version}), libgnome-java (>= 2.12.7)
Replaces: libgtk2-java
Recommends: libglade-java-gcj
Conflicts: libgtk2-java
@@ -67,7 +67,7 @@
Package: libglade-java-gcj
Section: libs
Architecture: any
-Depends: libglade-java (>= ${Source-Version}), libgnome-java-gcj, ${misc:Depends}, ${shlibs:Depends}
+Depends: libglade-java (>= ${Source-Version}), libgnome-java-gcj (>= 2.12.7), ${misc:Depends}, ${shlibs:Depends}
Description: LIBGLADE 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
Added: trunk/libglade-java/debian/patches/01_late_javadoc.diff
===================================================================
--- trunk/libglade-java/debian/patches/01_late_javadoc.diff 2007-04-23 20:33:22 UTC (rev 3313)
+++ trunk/libglade-java/debian/patches/01_late_javadoc.diff 2007-04-23 21:14:42 UTC (rev 3314)
@@ -0,0 +1,111 @@
+Index: libglade-java-2.12.8/Makefile.am
+===================================================================
+--- libglade-java-2.12.8.orig/Makefile.am 2007-04-23 21:04:44.000000000 +0000
++++ libglade-java-2.12.8/Makefile.am 2007-04-23 21:05:23.000000000 +0000
+@@ -211,8 +211,6 @@
+ # build api docs
+ apidir = $(docbasedir)/libglade-java-$(VERSION)/api
+
+-if BUILD_JAVADOC
+-ALL_LOCAL_DEPS += doc-stamp
+ doc-stamp: $(java_glade_source_files)
+ $(JAVADOC) \
+ -d doc/api \
+@@ -225,7 +223,6 @@
+ -classpath $(JGJAR):$(GTKJAR):$(GNOMEJAR):$(srcdir)/src/java:src/java \
+ org.gnu.glade
+ touch doc-stamp
+-endif
+ all-local: $(ALL_LOCAL_DEPS)
+
+ # install other docs
+@@ -241,19 +238,6 @@
+ mv -f glade$(apiversion).jar glade$(apiversion)-$(VERSION).jar && \
+ $(LN_S) glade$(apiversion)-$(VERSION).jar glade$(apiversion).jar
+
+-# install api documentation
+-if BUILD_JAVADOC
+- $(mkinstalldirs) $(DESTDIR)$(apidir)
+- @for dir in $(dest_glade_javadoc_dirs); \
+- do \
+- $(mkinstalldirs) $(DESTDIR)$(apidir)/$${dir}; \
+- done
+- @for file in $(all_dest_glade_javadoc_html_files); \
+- do \
+- $(INSTALL_DATA) doc/api/$${file} $(DESTDIR)$(apidir)/$${file}; \
+- done
+-endif
+-
+ # install examples
+ @for dir in $(examples); \
+ do \
+Index: libglade-java-2.12.8/Makefile.in
+===================================================================
+--- libglade-java-2.12.8.orig/Makefile.in 2007-04-23 21:05:26.000000000 +0000
++++ libglade-java-2.12.8/Makefile.in 2007-04-23 21:08:31.000000000 +0000
+@@ -39,7 +39,6 @@
+ host_triplet = @host@
+ @BUILD_SRCJAR_TRUE at am__append_1 = glade$(apiversion)-src.jar
+ @BUILD_SRCJAR_TRUE at am__append_2 = glade$(apiversion)-src.jar
+- at BUILD_JAVADOC_TRUE@am__append_3 = doc-stamp
+ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
+ $(srcdir)/Makefile.in $(srcdir)/glade-java.pc.in \
+ $(top_srcdir)/configure \
+@@ -441,7 +440,7 @@
+ $(shell find doc -name '*.html') doc/api/package-list \
+ doc/api/stylesheet.css doc/api/resources/inherit.gif \
+ glade$(apiversion).jar
+-ALL_LOCAL_DEPS = $(am__append_2) $(am__append_3)
++ALL_LOCAL_DEPS = $(am__append_2)
+ AM_CPPFLAGS = -Isrc/jni -I$(srcdir)/src/jni
+ @BUILD_GCJ_FALSE at lib_LTLIBRARIES = libgladejni.la
+ @BUILD_GCJ_TRUE at lib_LTLIBRARIES = libgladejava.la libgladejni.la
+@@ -1770,18 +1769,18 @@
+ @BUILD_SRCJAR_TRUE at glade$(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/gnu/glade/Config.java
+- at BUILD_JAVADOC_TRUE@doc-stamp: $(java_glade_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):$(GTKJAR):$(GNOMEJAR):$(srcdir)/src/java:src/java \
+- at BUILD_JAVADOC_TRUE@ org.gnu.glade
+- at BUILD_JAVADOC_TRUE@ touch doc-stamp
++doc-stamp: $(java_glade_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):$(GTKJAR):$(GNOMEJAR):$(srcdir)/src/java:src/java \
++ org.gnu.glade
++ touch doc-stamp
+ all-local: $(ALL_LOCAL_DEPS)
+
+ install-data-hook:
+@@ -1789,17 +1788,6 @@
+ mv -f glade$(apiversion).jar glade$(apiversion)-$(VERSION).jar && \
+ $(LN_S) glade$(apiversion)-$(VERSION).jar glade$(apiversion).jar
+
+-# install api documentation
+- at BUILD_JAVADOC_TRUE@ $(mkinstalldirs) $(DESTDIR)$(apidir)
+- at BUILD_JAVADOC_TRUE@ @for dir in $(dest_glade_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_glade_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/libglade-java/debian/patches/03_reduce_distclean.diff
===================================================================
--- trunk/libglade-java/debian/patches/03_reduce_distclean.diff 2007-04-23 20:33:22 UTC (rev 3313)
+++ trunk/libglade-java/debian/patches/03_reduce_distclean.diff 2007-04-23 21:14:42 UTC (rev 3314)
@@ -0,0 +1,42 @@
+Index: libglade-java-2.12.8/Makefile.am
+===================================================================
+--- libglade-java-2.12.8.orig/Makefile.am 2007-04-23 21:09:55.000000000 +0000
++++ libglade-java-2.12.8/Makefile.am 2007-04-23 21:11:15.000000000 +0000
+@@ -269,15 +269,7 @@
+
+ DISTCLEANFILES = \
+ glade-java.pc \
+- src/java/org/gnu/glade/Config.java \
+- $(srcdir)/aclocal.m4 \
+- $(srcdir)/compile \
+- $(srcdir)/config.guess \
+- $(srcdir)/config.sub \
+- $(srcdir)/depcomp \
+- $(srcdir)/install-sh \
+- $(srcdir)/ltmain.sh \
+- $(srcdir)/missing
++ src/java/org/gnu/glade/Config.java
+
+ CLEANFILES += \
+ doc-stamp \
+Index: libglade-java-2.12.8/Makefile.in
+===================================================================
+--- libglade-java-2.12.8.orig/Makefile.in 2007-04-23 21:11:17.000000000 +0000
++++ libglade-java-2.12.8/Makefile.in 2007-04-23 21:11:38.000000000 +0000
+@@ -605,15 +605,7 @@
+
+ DISTCLEANFILES = \
+ glade-java.pc \
+- src/java/org/gnu/glade/Config.java \
+- $(srcdir)/aclocal.m4 \
+- $(srcdir)/compile \
+- $(srcdir)/config.guess \
+- $(srcdir)/config.sub \
+- $(srcdir)/depcomp \
+- $(srcdir)/install-sh \
+- $(srcdir)/ltmain.sh \
+- $(srcdir)/missing
++ src/java/org/gnu/glade/Config.java
+
+ all: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) all-am
Added: trunk/libglade-java/debian/patches/04_pkgconfig_for_jni.diff
===================================================================
--- trunk/libglade-java/debian/patches/04_pkgconfig_for_jni.diff 2007-04-23 20:33:22 UTC (rev 3313)
+++ trunk/libglade-java/debian/patches/04_pkgconfig_for_jni.diff 2007-04-23 21:14:42 UTC (rev 3314)
@@ -0,0 +1,10 @@
+Index: libglade-java-2.12.8/glade-java.pc.in
+===================================================================
+--- libglade-java-2.12.8.orig/glade-java.pc.in 2007-04-23 21:15:49.000000000 +0000
++++ libglade-java-2.12.8/glade-java.pc.in 2007-04-23 21:16:34.000000000 +0000
+@@ -11,4 +11,5 @@
+ Version: @VERSION@
+ api_version=@apiversion@
+ classpath=@INSTALLED_CLASSPATH@
++jnilibs=-L at libdir@/jni -lgladejni
+ Libs: -L at libdir@ -lgladejava
More information about the pkg-java-commits
mailing list