[pkg-java] r3065 - trunk/javatar/debian

[Paul Cager]

Author: paulcager-guest
Date: 2007-03-12 13:29:57 +0000 (Mon, 12 Mar 2007)
New Revision: 3065

Modified:
   trunk/javatar/debian/changelog
   trunk/javatar/debian/rules
Log:
Remove non-dbsg binary Jars (including tidy.jar itself)

Modified: trunk/javatar/debian/changelog
===================================================================
--- trunk/javatar/debian/changelog	2007-03-12 12:46:49 UTC (rev 3064)
+++ trunk/javatar/debian/changelog	2007-03-12 13:29:57 UTC (rev 3065)
@@ -1,6 +1,7 @@
-javatar (2.5-1) unstable; urgency=low
+javatar (2.5+dfsg-1) unstable; urgency=low
 
   * Initial release
-    (Closes #408584)
+      (Closes: #408584)
 
- -- Paul Cager <paul-debian at home.paulcager.org>  Sat, 13 Jan 2007 23:04:12 +0000
+ -- Paul Cager <paul-debian at home.paulcager.org>  Mon, 12 Mar 2007 13:13:51 +0000
+

Modified: trunk/javatar/debian/rules
===================================================================
--- trunk/javatar/debian/rules	2007-03-12 12:46:49 UTC (rev 3064)
+++ trunk/javatar/debian/rules	2007-03-12 13:29:57 UTC (rev 3065)
@@ -6,7 +6,7 @@
 include /usr/share/cdbs/1/class/ant.mk
 
 LIBRARY              := $(shell dpkg-parsechangelog | egrep '^Source:' | cut -f2 -d' ')
-VERSION              := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f2 -d' ' | cut -f1 -d-)
+VERSION              := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f2 -d' ' | cut -f1 -d- | cut -f1 -d+)
 API_DOCS             := tar-$(VERSION)/doc/api
 JAVA_HOME            := /usr/lib/jvm/java-gcj
 ANT_HOME             := /usr/share/ant
@@ -15,6 +15,18 @@
 DEB_ANT_INVOKE       := ant -f $(BUILD_FILE)
 DEB_ANT_BUILD_TARGET := deploy
 
+# Remove "lib" jars (dfsg checks)
+get-orig-source:
+	rm -rf orig_tmp
+	mkdir orig_tmp
+	cd orig_tmp && \
+		wget http://www.gjt.org/download/time/java/tar/javatar-$(VERSION).tar.gz && \
+		tar xf javatar-$(VERSION).tar.gz && \
+		mv  javatar-$(VERSION) javatar-$(VERSION)+dfsg.orig && \
+		rm javatar-$(VERSION)+dfsg.orig/jars/*.jar && \
+		tar czf ../../javatar_$(VERSION)+dfsg.orig.tar.gz javatar-$(VERSION)+dfsg.orig
+	rm -rf orig_tmp
+	
 makebuilddir/javatar::
 	dos2unix $(BUILD_FILE)