[pkg-java] r3262 - in trunk/libgtk-java/debian: . patches

[Thomas Girard]

Author: tgg
Date: 2007-04-17 20:39:07 +0000 (Tue, 17 Apr 2007)
New Revision: 3262

Removed:
   trunk/libgtk-java/debian/patches/02_dont_install_jar.diff
Modified:
   trunk/libgtk-java/debian/changelog
   trunk/libgtk-java/debian/libgtk-java-doc.install
   trunk/libgtk-java/debian/patches/series
Log:
drop unneeded patch


Modified: trunk/libgtk-java/debian/changelog
===================================================================
--- trunk/libgtk-java/debian/changelog	2007-04-17 20:31:28 UTC (rev 3261)
+++ trunk/libgtk-java/debian/changelog	2007-04-17 20:39:07 UTC (rev 3262)
@@ -3,8 +3,10 @@
   * Fix the libgtk-java-gcj dependency on libgtk-java.
   * New patch, 05_link_libgtkjava_libcairojava.diff, to make sure libgtkjava
     is linked with libcairojava.
+  * Drop patch 02_dont_install_jar.diff, it was removing jar version
+    information.
 
- -- Thomas Girard <thomas.g.girard at free.fr>  Sun, 15 Apr 2007 16:47:43 +0000
+ -- Thomas Girard <thomas.g.girard at free.fr>  Tue, 17 Apr 2007 11:11:08 +0000
 
 libgtk-java (2.10.2-1) experimental; urgency=low
 

Modified: trunk/libgtk-java/debian/libgtk-java-doc.install
===================================================================
--- trunk/libgtk-java/debian/libgtk-java-doc.install	2007-04-17 20:31:28 UTC (rev 3261)
+++ trunk/libgtk-java/debian/libgtk-java-doc.install	2007-04-17 20:39:07 UTC (rev 3262)
@@ -1,2 +1,2 @@
-debian/tmp/usr/share/doc/libgtk-java-*/examples usr/share/doc/libgtk-java
 doc/api usr/share/doc/libgtk-java
+doc/examples usr/share/doc/libgtk-java

Deleted: trunk/libgtk-java/debian/patches/02_dont_install_jar.diff
===================================================================
--- trunk/libgtk-java/debian/patches/02_dont_install_jar.diff	2007-04-17 20:31:28 UTC (rev 3261)
+++ trunk/libgtk-java/debian/patches/02_dont_install_jar.diff	2007-04-17 20:39:07 UTC (rev 3262)
@@ -1,32 +0,0 @@
-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 \

Modified: trunk/libgtk-java/debian/patches/series
===================================================================
--- trunk/libgtk-java/debian/patches/series	2007-04-17 20:31:28 UTC (rev 3261)
+++ trunk/libgtk-java/debian/patches/series	2007-04-17 20:39:07 UTC (rev 3262)
@@ -1,5 +1,4 @@
 01_late_javadoc.diff
-02_dont_install_jar.diff
 03_reduce_distclean.diff
 04_pkgconfig_for_jni.diff
 05_link_libgtkjava_libcairojava.diff