[pkg-java] r3258 - in trunk/glib-java/debian: . patches

[Thomas Girard]

Author: tgg
Date: 2007-04-17 10:40:16 +0000 (Tue, 17 Apr 2007)
New Revision: 3258

Removed:
   trunk/glib-java/debian/patches/02_dont_install_jar.diff
Modified:
   trunk/glib-java/debian/changelog
   trunk/glib-java/debian/patches/series
Log:
restore jar version, drop 02_dont_install_jar.diff


Modified: trunk/glib-java/debian/changelog
===================================================================
--- trunk/glib-java/debian/changelog	2007-04-16 21:56:05 UTC (rev 3257)
+++ trunk/glib-java/debian/changelog	2007-04-17 10:40:16 UTC (rev 3258)
@@ -2,8 +2,10 @@
 
   * Make libglib-java-gcj binNMU clean.
   * Ensure libglib-java-gcj is built after libglib-java.
+  * Drop patch 02_dont_install_jar.diff, it was removing jar version
+    information.
 
- -- Thomas Girard <thomas.g.girard at free.fr>  Mon, 16 Apr 2007 19:57:25 +0000
+ -- Thomas Girard <thomas.g.girard at free.fr>  Tue, 17 Apr 2007 10:39:49 +0000
 
 glib-java (0.4.2-4) experimental; urgency=low
 

Deleted: trunk/glib-java/debian/patches/02_dont_install_jar.diff
===================================================================
--- trunk/glib-java/debian/patches/02_dont_install_jar.diff	2007-04-16 21:56:05 UTC (rev 3257)
+++ trunk/glib-java/debian/patches/02_dont_install_jar.diff	2007-04-17 10:40:16 UTC (rev 3258)
@@ -1,52 +0,0 @@
-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)

Modified: trunk/glib-java/debian/patches/series
===================================================================
--- trunk/glib-java/debian/patches/series	2007-04-16 21:56:05 UTC (rev 3257)
+++ trunk/glib-java/debian/patches/series	2007-04-17 10:40:16 UTC (rev 3258)
@@ -1,4 +1,3 @@
 01_late_javadoc.diff
-02_dont_install_jar.diff
 03_reduce_distclean.diff
 04_pkgconfig_for_jni.diff