[pkg-java] r3261 - in trunk/cairo-java/debian: . patches

[Thomas Girard]

Author: tgg
Date: 2007-04-17 20:31:28 +0000 (Tue, 17 Apr 2007)
New Revision: 3261

Removed:
   trunk/cairo-java/debian/patches/02_dont_install_jar.diff
Modified:
   trunk/cairo-java/debian/changelog
   trunk/cairo-java/debian/patches/series
   trunk/cairo-java/debian/rules
Log:
drop unneeded patch


Modified: trunk/cairo-java/debian/changelog
===================================================================
--- trunk/cairo-java/debian/changelog	2007-04-17 19:22:01 UTC (rev 3260)
+++ trunk/cairo-java/debian/changelog	2007-04-17 20:31:28 UTC (rev 3261)
@@ -1,8 +1,11 @@
 cairo-java (1.0.8-3) experimental; urgency=low
 
-  * Fix the libcairo-java-gcj dependency on libcairo-java.
+  * Make libcairo-java-gcj binNMU clean.
+  * Ensure libcairo-java-gcj is built after libcairo-java.
+  * 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 15:57:22 +0000
+ -- Thomas Girard <thomas.g.girard at free.fr>  Tue, 17 Apr 2007 10:44:30 +0000
 
 cairo-java (1.0.8-2) experimental; urgency=low
 

Deleted: trunk/cairo-java/debian/patches/02_dont_install_jar.diff
===================================================================
--- trunk/cairo-java/debian/patches/02_dont_install_jar.diff	2007-04-17 19:22:01 UTC (rev 3260)
+++ trunk/cairo-java/debian/patches/02_dont_install_jar.diff	2007-04-17 20:31:28 UTC (rev 3261)
@@ -1,30 +0,0 @@
-Index: cairo-java-1.0.8/Makefile.am
-===================================================================
---- cairo-java-1.0.8.orig/Makefile.am	2007-04-14 13:18:35.000000000 +0000
-+++ cairo-java-1.0.8/Makefile.am	2007-04-14 13:19:50.000000000 +0000
-@@ -150,10 +150,6 @@
- dest_cairo_javadoc_dirs = $(patsubst doc/api/%,%,$(shell cd doc/api; find . -type d))
- 
- install-data-hook:
--	cd $(DESTDIR)$(jardir) && \
--		mv -f cairo$(apiversion).jar cairo$(apiversion)-$(VERSION).jar && \
--		$(LN_S) cairo$(apiversion)-$(VERSION).jar cairo$(apiversion).jar
--
- # install examples
- 	@for dir in $(examples); \
- 	do \
-Index: cairo-java-1.0.8/Makefile.in
-===================================================================
---- cairo-java-1.0.8.orig/Makefile.in	2007-04-14 13:17:14.000000000 +0000
-+++ cairo-java-1.0.8/Makefile.in	2007-04-14 13:19:12.000000000 +0000
-@@ -1631,10 +1631,6 @@
- all-local: $(ALL_LOCAL_DEPS)
- 
- install-data-hook:
--	cd $(DESTDIR)$(jardir) && \
--		mv -f cairo$(apiversion).jar cairo$(apiversion)-$(VERSION).jar && \
--		$(LN_S) cairo$(apiversion)-$(VERSION).jar cairo$(apiversion).jar
--
- # install examples
- 	@for dir in $(examples); \
- 	do \

Modified: trunk/cairo-java/debian/patches/series
===================================================================
--- trunk/cairo-java/debian/patches/series	2007-04-17 19:22:01 UTC (rev 3260)
+++ trunk/cairo-java/debian/patches/series	2007-04-17 20:31:28 UTC (rev 3261)
@@ -1,4 +1,3 @@
 01_late_javadoc.diff
-02_dont_install_jar.diff
 03_reduce_distclean.diff
 04_pkgconfig_for_jni.diff

Modified: trunk/cairo-java/debian/rules
===================================================================
--- trunk/cairo-java/debian/rules	2007-04-17 19:22:01 UTC (rev 3260)
+++ trunk/cairo-java/debian/rules	2007-04-17 20:31:28 UTC (rev 3261)
@@ -49,7 +49,7 @@
 	mkdir -p debian/$(cni)/usr/share/lintian/overrides
 	cp debian/$(cni).lintian debian/$(cni)/usr/share/lintian/overrides/$(cni)
 
-binary-post-install/$(base)-gcj::
+binary-post-install/$(base)-gcj:: binary-post-install/$(base)
 	rm -rf debian/$(base)-gcj/usr/share/doc/$(base)-gcj
 	ln -s $(base) \
 	    debian/$(base)-gcj/usr/share/doc/$(base)-gcj