Author: tgg
Date: 2007-04-09 22:39:25 +0000 (Mon, 09 Apr 2007)
New Revision: 3155
Added:
trunk/glib-java/debian/patches/
trunk/glib-java/debian/patches/01_late_javadoc.diff
trunk/glib-java/debian/patches/02_dont_install_jar.diff
trunk/glib-java/debian/patches/03_reduce_distclean.diff
trunk/glib-java/debian/patches/04_pkgconfig_for_jni.diff
trunk/glib-java/debian/patches/series
Modified:
trunk/glib-java/debian/rules
Log:
add quilt patches built from Ubuntu
Added: trunk/glib-java/debian/patches/01_late_javadoc.diff
===================================================================
--- trunk/glib-java/debian/patches/01_late_javadoc.diff 2007-04-09 14:12:38 UTC
(rev 3154)
+++ trunk/glib-java/debian/patches/01_late_javadoc.diff 2007-04-09 22:39:25 UTC
(rev 3155)
@@ -0,0 +1,100 @@
+Index: libglib-java/Makefile.am
+===================================================================
+--- libglib-java.orig/Makefile.am 2007-04-09 15:00:03.000000000 +0000
++++ libglib-java/Makefile.am 2007-04-09 15:01:48.000000000 +0000
+@@ -129,13 +129,6 @@
+ # build api docs
+ apidir = $(docbasedir)/glib-java-$(VERSION)/api
+
+-if BUILD_JAVADOC
+-all-local: $(top_builddir)/doc-stamp
+-else
+-all-local:
+-endif
+-
+-if BUILD_JAVADOC
+ doc-stamp: $(java_gnome_source_files)
+ $(JAVADOC) \
+ -d doc/api \
+@@ -146,10 +139,6 @@
+ -footer "$(JAVADOC_FOOTER)" \
+ org.gnu.glib
+ touch doc-stamp
+-else
+-doc-stamp:
+- touch doc-stamp
+-endif
+
+ # install other docs
+ docdir = $(docbasedir)/glib-java-$(VERSION)
+@@ -165,19 +154,6 @@
+ mv -f glib$(apiversion).jar glib$(apiversion)-$(VERSION).jar &&
\
+ $(LN_S) glib$(apiversion)-$(VERSION).jar glib$(apiversion).jar
+
+-# install api documentation
+-if BUILD_JAVADOC
+- $(mkinstalldirs) $(DESTDIR)$(apidir)
+- @for dir in $(dest_javadoc_dirs); \
+- do \
+- $(mkinstalldirs) $(DESTDIR)$(apidir)/$${dir}; \
+- done
+- @for file in $(all_dest_javadoc_html_files); \
+- do \
+- $(INSTALL_DATA) doc/api/$${file} $(DESTDIR)$(apidir)/$${file}; \
+- done
+-endif
+-
+ uninstall-local:
+ -rm -f $(DESTDIR)$(glib_jardir)/glib$(apiversion)-$(VERSION).jar
+ -rm -rf $(DESTDIR)$(datadir)/doc/glib-java-$(VERSION)
+Index: libglib-java/Makefile.in
+===================================================================
+--- libglib-java.orig/Makefile.in 2007-04-09 15:01:55.000000000 +0000
++++ libglib-java/Makefile.in 2007-04-09 15:04:57.000000000 +0000
+@@ -1527,18 +1527,16 @@
+ @[EMAIL PROTECTED]: $(top_builddir)/doc-stamp
+ @[EMAIL PROTECTED]:
+
[EMAIL PROTECTED]@doc-stamp: $(java_gnome_source_files)
[EMAIL PROTECTED]@ $(JAVADOC) \
[EMAIL PROTECTED]@ -d doc/api \
[EMAIL PROTECTED]@ $(JAVADOC_OPTIONS) \
[EMAIL PROTECTED]@ -sourcepath $(srcdir)/src/java \
[EMAIL PROTECTED]@ -windowtitle "glib-java $(VERSION) API
Reference" \
[EMAIL PROTECTED]@ -doctitle "glib-java $(VERSION) API Reference" \
[EMAIL PROTECTED]@ -footer "$(JAVADOC_FOOTER)" \
[EMAIL PROTECTED]@ org.gnu.glib
[EMAIL PROTECTED]@ touch doc-stamp
[EMAIL PROTECTED]@doc-stamp:
[EMAIL PROTECTED]@ touch doc-stamp
++doc-stamp: $(java_gnome_source_files)
++ $(JAVADOC) \
++ -d doc/api \
++ $(JAVADOC_OPTIONS) \
++ -sourcepath $(srcdir)/src/java \
++ -windowtitle "glib-java $(VERSION) API Reference" \
++ -doctitle "glib-java $(VERSION) API Reference" \
++ -footer "$(JAVADOC_FOOTER)" \
++ org.gnu.glib
++ touch doc-stamp
+
+ install-data-hook:
+ # install versionless jar symlink
+@@ -1546,17 +1544,6 @@
+ mv -f glib$(apiversion).jar glib$(apiversion)-$(VERSION).jar &&
\
+ $(LN_S) glib$(apiversion)-$(VERSION).jar glib$(apiversion).jar
+
+-# install api documentation
[EMAIL PROTECTED]@ $(mkinstalldirs) $(DESTDIR)$(apidir)
[EMAIL PROTECTED]@ @for dir in $(dest_javadoc_dirs); \
[EMAIL PROTECTED]@ do \
[EMAIL PROTECTED]@ $(mkinstalldirs) $(DESTDIR)$(apidir)/$${dir}; \
[EMAIL PROTECTED]@ done
[EMAIL PROTECTED]@ @for file in $(all_dest_javadoc_html_files); \
[EMAIL PROTECTED]@ do \
[EMAIL PROTECTED]@ $(INSTALL_DATA) doc/api/$${file}
$(DESTDIR)$(apidir)/$${file}; \
[EMAIL PROTECTED]@ done
+-
+ uninstall-local:
+ -rm -f $(DESTDIR)$(glib_jardir)/glib$(apiversion)-$(VERSION).jar
+ -rm -rf $(DESTDIR)$(datadir)/doc/glib-java-$(VERSION)
Added: trunk/glib-java/debian/patches/02_dont_install_jar.diff
===================================================================
--- trunk/glib-java/debian/patches/02_dont_install_jar.diff 2007-04-09
14:12:38 UTC (rev 3154)
+++ trunk/glib-java/debian/patches/02_dont_install_jar.diff 2007-04-09
22:39:25 UTC (rev 3155)
@@ -0,0 +1,52 @@
+Index: libglib-java/Makefile.am
+===================================================================
+--- libglib-java.orig/Makefile.am 2007-04-09 15:32:51.000000000 +0000
++++ libglib-java/Makefile.am 2007-04-09 15:33:43.000000000 +0000
+@@ -148,12 +148,6 @@
+ all_dest_javadoc_html_files = $(patsubst doc/api/%,%,$(shell find doc/api
-type f))
+ dest_javadoc_dirs = $(patsubst doc/api/%,%,$(shell cd doc/api; find . -type
d))
+
+-install-data-hook:
+-# install versionless jar symlink
+- cd $(DESTDIR)$(glib_jardir) && \
+- mv -f glib$(apiversion).jar glib$(apiversion)-$(VERSION).jar &&
\
+- $(LN_S) glib$(apiversion)-$(VERSION).jar glib$(apiversion).jar
+-
+ uninstall-local:
+ -rm -f $(DESTDIR)$(glib_jardir)/glib$(apiversion)-$(VERSION).jar
+ -rm -rf $(DESTDIR)$(datadir)/doc/glib-java-$(VERSION)
+Index: libglib-java/Makefile.in
+===================================================================
+--- libglib-java.orig/Makefile.in 2007-04-09 15:37:10.000000000 +0000
++++ libglib-java/Makefile.in 2007-04-09 15:39:11.000000000 +0000
+@@ -1415,8 +1415,6 @@
+ install-data-am: install-docDATA install-glib_jarDATA \
+ install-glibjavasrcjarDATA install-glibjnuDATA \
+ install-glibmacroDATA install-pkgconfigDATA
+- @$(NORMAL_INSTALL)
+- $(MAKE) $(AM_MAKEFLAGS) install-data-hook
+
+ install-exec-am: install-libLTLIBRARIES
+
+@@ -1459,7 +1457,7 @@
+ distclean-generic distclean-libtool distclean-local \
+ distclean-tags distcleancheck distdir distuninstallcheck dvi \
+ dvi-am html html-am info info-am install install-am \
+- install-data install-data-am install-data-hook install-docDATA \
++ install-data install-data-am install-docDATA \
+ install-exec install-exec-am install-glib_jarDATA \
+ install-glibjavasrcjarDATA install-glibjnuDATA \
+ install-glibmacroDATA install-info install-info-am \
+@@ -1538,12 +1536,6 @@
+ org.gnu.glib
+ touch doc-stamp
+
+-install-data-hook:
+-# install versionless jar symlink
+- cd $(DESTDIR)$(glib_jardir) && \
+- mv -f glib$(apiversion).jar glib$(apiversion)-$(VERSION).jar &&
\
+- $(LN_S) glib$(apiversion)-$(VERSION).jar glib$(apiversion).jar
+-
+ uninstall-local:
+ -rm -f $(DESTDIR)$(glib_jardir)/glib$(apiversion)-$(VERSION).jar
+ -rm -rf $(DESTDIR)$(datadir)/doc/glib-java-$(VERSION)
Added: trunk/glib-java/debian/patches/03_reduce_distclean.diff
===================================================================
--- trunk/glib-java/debian/patches/03_reduce_distclean.diff 2007-04-09
14:12:38 UTC (rev 3154)
+++ trunk/glib-java/debian/patches/03_reduce_distclean.diff 2007-04-09
22:39:25 UTC (rev 3155)
@@ -0,0 +1,54 @@
+Index: libglib-java/Makefile.am
+===================================================================
+--- libglib-java.orig/Makefile.am 2007-04-09 23:07:36.000000000 +0000
++++ libglib-java/Makefile.am 2007-04-09 23:07:58.000000000 +0000
+@@ -182,17 +182,5 @@
+ clean-local:
+ -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: libglib-java/Makefile.in
+===================================================================
+--- libglib-java.orig/Makefile.in 2007-04-09 23:08:01.000000000 +0000
++++ libglib-java/Makefile.in 2007-04-09 23:09:57.000000000 +0000
+@@ -479,19 +479,6 @@
+ macros/jg_lib.m4 \
+ src/java/org/gnu/glib/Config.java.in
+
+-
+-# 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
+
+@@ -1384,7 +1371,6 @@
+ -rm -f src/java/org/gnu/glib/$(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/glib-java/debian/patches/04_pkgconfig_for_jni.diff
===================================================================
--- trunk/glib-java/debian/patches/04_pkgconfig_for_jni.diff 2007-04-09
14:12:38 UTC (rev 3154)
+++ trunk/glib-java/debian/patches/04_pkgconfig_for_jni.diff 2007-04-09
22:39:25 UTC (rev 3155)
@@ -0,0 +1,12 @@
+Index: libglib-java/glib-java.pc.in
+===================================================================
+--- libglib-java.orig/glib-java.pc.in 2007-04-09 23:12:32.000000000 +0000
++++ libglib-java/glib-java.pc.in 2007-04-09 23:12:54.000000000 +0000
+@@ -13,6 +13,6 @@
+ [EMAIL PROTECTED]@
+ [EMAIL PROTECTED]@
+ [EMAIL PROTECTED]@
[EMAIL PROTECTED]@ -lglibjni
[EMAIL PROTECTED]@/jni -lglibjni
+ Libs: [EMAIL PROTECTED]@ -lglibjava
+ Cflags: [EMAIL PROTECTED]@/glib-java
Added: trunk/glib-java/debian/patches/series
===================================================================
--- trunk/glib-java/debian/patches/series 2007-04-09 14:12:38 UTC (rev
3154)
+++ trunk/glib-java/debian/patches/series 2007-04-09 22:39:25 UTC (rev
3155)
@@ -0,0 +1,4 @@
+01_late_javadoc.diff
+02_dont_install_jar.diff
+03_reduce_distclean.diff
+04_pkgconfig_for_jni.diff
Modified: trunk/glib-java/debian/rules
===================================================================
--- trunk/glib-java/debian/rules 2007-04-09 14:12:38 UTC (rev 3154)
+++ trunk/glib-java/debian/rules 2007-04-09 22:39:25 UTC (rev 3155)
@@ -1,7 +1,7 @@
#!/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/simple-patchsys.mk
base = libglib-java
jar = glib0.4.jar
_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
