[pkg-java] r4268 - in trunk/libjfreechart-java/debian: . patches

kumanna-guest at alioth.debian.org kumanna-guest at alioth.debian.org
Tue Sep 25 19:16:01 UTC 2007 

Author: kumanna-guest
Date: 2007-09-25 19:16:01 +0000 (Tue, 25 Sep 2007)
New Revision: 4268

Added:
   trunk/libjfreechart-java/debian/orig-tar.sh
   trunk/libjfreechart-java/debian/watch
Removed:
   trunk/libjfreechart-java/debian/patches/00_BuildXml_Manifest.patch
Modified:
   trunk/libjfreechart-java/debian/changelog
   trunk/libjfreechart-java/debian/control
   trunk/libjfreechart-java/debian/rules
Log:
* New upstream release.
  + Add Varun Hiremath and Kumar Appaiah to Uploaders.
* debian/rules:
  + Use DEB_UPSTREAM_VERSION in place of version.
  + Add get-orig-source for fetching clean upstream source.
* debian/watch: Added file.
* debian/orig-tar.sh: Automate repackaging.
* debian/patches: Remove 00_BuildXml_Manifest.patch, as upstream
  build.xml doesn't need manifest check.

Modified: trunk/libjfreechart-java/debian/changelog
===================================================================
--- trunk/libjfreechart-java/debian/changelog	2007-09-25 18:45:37 UTC (rev 4267)
+++ trunk/libjfreechart-java/debian/changelog	2007-09-25 19:16:01 UTC (rev 4268)
@@ -1,12 +1,21 @@
-libjfreechart-java (1.0.2-4) UNRELEASED; urgency=low
+libjfreechart-java (1.0.6-1) unstable; urgency=low
 
+  * New upstream release.
   * debian/control
     + Move every Build-Depend other than cdbs and debhelper to Build-Depends-Indep.
     + Add Homepage, XS-Vcs-Svn and XS-Vcs-Browser fields.
+    + Add Varun Hiremath and Kumar Appaiah to Uploaders.
+  * debian/rules:
+    + Use DEB_UPSTREAM_VERSION in place of version.
+    + Add get-orig-source for fetching clean upstream source.
   * debian/compat: bump to 5.
-  
- -- Kumar Appaiah <akumar at ee.iitm.ac.in>  Wed, 26 Sep 2007 00:21:33 +0530
+  * debian/watch: Added file.
+  * debian/orig-tar.sh: Automate repackaging.
+  * debian/patches: Remove 00_BuildXml_Manifest.patch, as upstream
+    build.xml doesn't need manifest check.
 
+ -- Kumar Appaiah <akumar at ee.iitm.ac.in>  Wed, 26 Sep 2007 00:45:41 +0530
+
 libjfreechart-java (1.0.2-3) unstable; urgency=low
 
   * Merged from Ubuntu.

Modified: trunk/libjfreechart-java/debian/control
===================================================================
--- trunk/libjfreechart-java/debian/control	2007-09-25 18:45:37 UTC (rev 4267)
+++ trunk/libjfreechart-java/debian/control	2007-09-25 19:16:01 UTC (rev 4268)
@@ -2,7 +2,7 @@
 Section: libs
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Christian Bayle <bayle at debian.org>, Michael Koch <konqueror at gmx.de>
+Uploaders: Christian Bayle <bayle at debian.org>, Michael Koch <konqueror at gmx.de>, Varun Hiremath <varunhiremath at gmail.com>, Kumar Appaiah <akumar at ee.iitm.ac.in>
 Build-Depends: debhelper (>= 5), cdbs
 Build-Depends-Indep: java-gcj-compat-dev, ant, libjcommon-java (>= 1.0.6), libservlet2.4-java
 Standards-Version: 3.7.2

Added: trunk/libjfreechart-java/debian/orig-tar.sh
===================================================================
--- trunk/libjfreechart-java/debian/orig-tar.sh	                        (rev 0)
+++ trunk/libjfreechart-java/debian/orig-tar.sh	2007-09-25 19:16:01 UTC (rev 4268)
@@ -0,0 +1,21 @@
+#!/bin/sh -e
+
+# called by uscan with '--upstream-version' <version> <file>
+TAR=../jfreechart-$2.tar.gz
+DIR=libjfreechart-java-$2.orig
+
+# clean up the upstream tarball
+mv $TAR $3
+tar zxf $3
+mv jfreechart-$2 $DIR
+GZIP=--best tar czf $3 --exclude '*jar' --exclude 'lib/*' $DIR
+rm -rf $TAR $DIR
+
+# move to directory 'tarballs'
+if [ -r .svn/deb-layout ]; then
+    . .svn/deb-layout
+    mv $3 $origDir
+    echo "moved $3 to $origDir"
+fi
+
+exit 0


Property changes on: trunk/libjfreechart-java/debian/orig-tar.sh
___________________________________________________________________
Name: svn:executable
   + *

Deleted: trunk/libjfreechart-java/debian/patches/00_BuildXml_Manifest.patch
===================================================================
--- trunk/libjfreechart-java/debian/patches/00_BuildXml_Manifest.patch	2007-09-25 18:45:37 UTC (rev 4267)
+++ trunk/libjfreechart-java/debian/patches/00_BuildXml_Manifest.patch	2007-09-25 19:16:01 UTC (rev 4268)
@@ -1,12 +0,0 @@
---- ant/build.xml.orig	2006-02-02 15:44:24.000000000 +0100
-+++ ant/build.xml	2006-02-02 19:42:50.000000000 +0100
-@@ -82,9 +82,6 @@
-         <!-- make the jar -->
-         <jar jarfile="${basedir}/${jfreechart.name}-${jfreechart.version}.jar"
-              basedir="${basedir}/build" >
--	      <manifest>
--    	    <attribute name="Class-Path" value="lib/${jcommon.name}-${jcommon.version}.jar"/>
--	      </manifest>
- 		</jar>
- 
-         <!-- delete the temp directory -->

Modified: trunk/libjfreechart-java/debian/rules
===================================================================
--- trunk/libjfreechart-java/debian/rules	2007-09-25 18:45:37 UTC (rev 4267)
+++ trunk/libjfreechart-java/debian/rules	2007-09-25 19:16:01 UTC (rev 4268)
@@ -1,8 +1,6 @@
 #!/usr/bin/make -f
 # debian/rules file for jfreechart (uses cdbs)
 
-export VERSION = $(shell head -1 debian/changelog | cut -f2 -d\( | cut -f1 -d\) | cut -f1 -d\-)
-
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/ant.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
@@ -23,8 +21,11 @@
 clean::
 	-rm -rf build
 	-rm -rf javadoc
-	-rm -f jfreechart-$(VERSION).jar
+	-rm -f jfreechart-$(DEB_UPSTREAM_VERSION).jar
 
 install/libjfreechart-java::
-	install -m 644 jfreechart-$(VERSION).jar debian/libjfreechart-java/usr/share/java/jfreechart-$(VERSION).jar
-	ln -s jfreechart-$(VERSION).jar debian/libjfreechart-java/usr/share/java/jfreechart.jar
+	dh_install jfreechart-$(DEB_UPSTREAM_VERSION).jar usr/share/java
+	dh_link usr/share/java/jfreechart-$(DEB_UPSTREAM_VERSION).jar usr/share/java/jfreechart.jar
+
+get-orig-source:
+	-uscan --upstream-version 0

Added: trunk/libjfreechart-java/debian/watch
===================================================================
--- trunk/libjfreechart-java/debian/watch	                        (rev 0)
+++ trunk/libjfreechart-java/debian/watch	2007-09-25 19:16:01 UTC (rev 4268)
@@ -0,0 +1,2 @@
+version=3
+http://heanet.dl.sourceforge.net/sourceforge/jfreechart/ jfreechart-([\d\.]+)\.tar\.gz debian orog-tar.sh

More information about the pkg-java-commits mailing list