[pkg-java] r3287 - trunk/libgnome-java/debian/patches
Thomas Girard
tgg at alioth.debian.org
Fri Apr 20 20:00:47 UTC 2007
Author: tgg
Date: 2007-04-20 20:00:47 +0000 (Fri, 20 Apr 2007)
New Revision: 3287
Added:
trunk/libgnome-java/debian/patches/01_late_javadoc.diff
trunk/libgnome-java/debian/patches/03_reduce_distclean.diff
trunk/libgnome-java/debian/patches/04_pkgconfig_for_jni.diff
trunk/libgnome-java/debian/patches/series
Log:
add a bunch of patches
Added: trunk/libgnome-java/debian/patches/01_late_javadoc.diff
===================================================================
--- trunk/libgnome-java/debian/patches/01_late_javadoc.diff 2007-04-20 19:57:09 UTC (rev 3286)
+++ trunk/libgnome-java/debian/patches/01_late_javadoc.diff 2007-04-20 20:00:47 UTC (rev 3287)
@@ -0,0 +1,96 @@
+Index: libgnome-java-2.12.7/Makefile.am
+===================================================================
+--- libgnome-java-2.12.7.orig/Makefile.am 2007-04-20 18:49:26.000000000 +0000
++++ libgnome-java-2.12.7/Makefile.am 2007-04-20 18:51:05.000000000 +0000
+@@ -227,8 +227,6 @@
+ # build api docs
+ apidir = $(docbasedir)/libgnome-java-$(VERSION)/api
+
+-if BUILD_JAVADOC
+-ALL_LOCAL_DEPS += doc-stamp
+ doc-stamp: $(java_gnome_source_files)
+ $(JAVADOC) \
+ -d doc/api \
+@@ -242,7 +240,6 @@
+ org.gnu.gnome \
+ org.gnu.gnome.event
+ touch doc-stamp
+-endif
+ all-local: $(ALL_LOCAL_DEPS)
+
+ # install other docs
+@@ -262,19 +259,6 @@
+ mv -f gnome$(apiversion).jar gnome$(apiversion)-$(VERSION).jar && \
+ $(LN_S) gnome$(apiversion)-$(VERSION).jar gnome$(apiversion).jar
+
+-# install api documentation
+-if BUILD_JAVADOC
+- $(mkinstalldirs) $(DESTDIR)$(apidir)
+- @for dir in $(dest_gnome_javadoc_dirs); \
+- do \
+- $(mkinstalldirs) $(DESTDIR)$(apidir)/$${dir}; \
+- done
+- @for file in $(all_dest_gnome_javadoc_html_files); \
+- do \
+- $(INSTALL_DATA) doc/api/$${file} $(DESTDIR)$(apidir)/$${file}; \
+- done
+-endif
+-
+ # install examples
+ @for dir in $(examples); \
+ do \
+Index: libgnome-java-2.12.7/Makefile.in
+===================================================================
+--- libgnome-java-2.12.7.orig/Makefile.in 2007-04-20 18:51:08.000000000 +0000
++++ libgnome-java-2.12.7/Makefile.in 2007-04-20 18:53:42.000000000 +0000
+@@ -2940,19 +2940,19 @@
+
+ @BUILD_SRCJAR_TRUE at gnome$(apiversion)-src.jar:
+ @BUILD_SRCJAR_TRUE@ $(JAR) cf $@ $(patsubst src/java/%.java,-C $(top_srcdir)/src/java %.java,$(java_gnome_source_files))
+- at BUILD_JAVADOC_TRUE@doc-stamp: $(java_gnome_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 $(CLASSPATH):$(srcdir)/src/java:src/java \
+- at BUILD_JAVADOC_TRUE@ org.gnu.gnome \
+- at BUILD_JAVADOC_TRUE@ org.gnu.gnome.event
+- at BUILD_JAVADOC_TRUE@ touch doc-stamp
++doc-stamp: $(java_gnome_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 $(CLASSPATH):$(srcdir)/src/java:src/java \
++ org.gnu.gnome \
++ org.gnu.gnome.event
++ touch doc-stamp
+ all-local: $(ALL_LOCAL_DEPS)
+
+ # build tutorial
+@@ -2964,17 +2964,6 @@
+ mv -f gnome$(apiversion).jar gnome$(apiversion)-$(VERSION).jar && \
+ $(LN_S) gnome$(apiversion)-$(VERSION).jar gnome$(apiversion).jar
+
+-# install api documentation
+- at BUILD_JAVADOC_TRUE@ $(mkinstalldirs) $(DESTDIR)$(apidir)
+- at BUILD_JAVADOC_TRUE@ @for dir in $(dest_gnome_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_gnome_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/libgnome-java/debian/patches/03_reduce_distclean.diff
===================================================================
--- trunk/libgnome-java/debian/patches/03_reduce_distclean.diff 2007-04-20 19:57:09 UTC (rev 3286)
+++ trunk/libgnome-java/debian/patches/03_reduce_distclean.diff 2007-04-20 20:00:47 UTC (rev 3287)
@@ -0,0 +1,51 @@
+Index: libgnome-java-2.12.7/Makefile.am
+===================================================================
+--- libgnome-java-2.12.7.orig/Makefile.am 2007-04-20 19:52:30.000000000 +0000
++++ libgnome-java-2.12.7/Makefile.am 2007-04-20 19:53:51.000000000 +0000
+@@ -312,15 +312,3 @@
+
+ distclean-local:
+ -rm -rf $(srcdir)/autom4te.cache
+-
+-DISTCLEANFILES = \
+- src/java/org/gnu/gnome/GnomeConfig.java \
+- $(srcdir)/Makefile.jni \
+- $(srcdir)/aclocal.m4 \
+- $(srcdir)/compile \
+- $(srcdir)/config.guess \
+- $(srcdir)/config.sub \
+- $(srcdir)/depcomp \
+- $(srcdir)/install-sh \
+- $(srcdir)/ltmain.sh \
+- $(srcdir)/missing
+Index: libgnome-java-2.12.7/Makefile.in
+===================================================================
+--- libgnome-java-2.12.7.orig/Makefile.in 2007-04-20 19:53:54.000000000 +0000
++++ libgnome-java-2.12.7/Makefile.in 2007-04-20 19:54:41.000000000 +0000
+@@ -806,18 +806,6 @@
+ doc/tutorial/Third.java \
+ doc/tutorial/Fourth.java
+
+-DISTCLEANFILES = \
+- src/java/org/gnu/gnome/GnomeConfig.java \
+- $(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
+
+@@ -2687,7 +2675,6 @@
+ -rm -f src/java/org/gnu/gnome/event/$(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/libgnome-java/debian/patches/04_pkgconfig_for_jni.diff
===================================================================
--- trunk/libgnome-java/debian/patches/04_pkgconfig_for_jni.diff 2007-04-20 19:57:09 UTC (rev 3286)
+++ trunk/libgnome-java/debian/patches/04_pkgconfig_for_jni.diff 2007-04-20 20:00:47 UTC (rev 3287)
@@ -0,0 +1,11 @@
+Index: libgnome-java-2.12.7/gnome2-java.pc.in
+===================================================================
+--- libgnome-java-2.12.7.orig/gnome2-java.pc.in 2007-04-20 19:59:10.000000000 +0000
++++ libgnome-java-2.12.7/gnome2-java.pc.in 2007-04-20 19:59:25.000000000 +0000
+@@ -10,5 +10,5 @@
+ Version: @VERSION@
+ api_version=@apiversion@
+ classpath=@INSTALLED_CLASSPATH@
+-Libs: -L at libdir@ -lgnomejava
++Libs: -L at libdir@/jni -lgnomejava
+
Added: trunk/libgnome-java/debian/patches/series
===================================================================
--- trunk/libgnome-java/debian/patches/series 2007-04-20 19:57:09 UTC (rev 3286)
+++ trunk/libgnome-java/debian/patches/series 2007-04-20 20:00:47 UTC (rev 3287)
@@ -0,0 +1,3 @@
+01_late_javadoc.diff
+03_reduce_distclean.diff
+04_pkgconfig_for_jni.diff
More information about the pkg-java-commits
mailing list