[pkg-java] r4188 - trunk/jsr107cache/debian

kumanna-guest at alioth.debian.org kumanna-guest at alioth.debian.org
Sun Sep 16 19:24:15 UTC 2007 

Author: kumanna-guest
Date: 2007-09-16 19:24:15 +0000 (Sun, 16 Sep 2007)
New Revision: 4188

Added:
   trunk/jsr107cache/debian/orig-tar.sh
Removed:
   trunk/jsr107cache/debian/libjsr107cache-java.dirs
   trunk/jsr107cache/debian/libjsr107cache-java.install
   trunk/jsr107cache/debian/libjsr107cache-java.links
Modified:
   trunk/jsr107cache/debian/build.xml
   trunk/jsr107cache/debian/changelog
   trunk/jsr107cache/debian/control
   trunk/jsr107cache/debian/rules
   trunk/jsr107cache/debian/watch
Log:
* Add the clean target to build.xml (Closes: #442607)
* Add Kumar Appaiah and Varun Hiremath to uploaders.
* Add orig-tar.sh to automate repackaging.
* Move debhelper and cdbs to Build-Depends from Build-Depends-Indep.
* Ensure that the versioned symlink to the jar is installed.
* Remove unnecessary dirs, links and install files from debian/
* Ensure build.xml does not use hard coded version.


Modified: trunk/jsr107cache/debian/build.xml
===================================================================
--- trunk/jsr107cache/debian/build.xml	2007-09-16 19:23:59 UTC (rev 4187)
+++ trunk/jsr107cache/debian/build.xml	2007-09-16 19:24:15 UTC (rev 4188)
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project basedir=".." name="jsr107cache" default="jar">
 
-  <property name="version" value="1.0" />
   <property name="target" value="${basedir}/target" />
   <property name="build" value="${target}/classes" />
 
@@ -10,11 +9,11 @@
   </path>
 
   <target name="clean">
-    <!-- delete dir="${target}"/ -->
-  </target>
+    <delete dir="${target}"/>
+   </target>
 
   <target name="jar" depends="compile">
-    <jar basedir="${build}" jarfile="${target}/${ant.project.name}-${version}.jar">
+    <jar basedir="${build}" jarfile="${target}/${ant.project.name}.jar">
       <include name="**/*"/>
     </jar> 
   </target>

Modified: trunk/jsr107cache/debian/changelog
===================================================================
--- trunk/jsr107cache/debian/changelog	2007-09-16 19:23:59 UTC (rev 4187)
+++ trunk/jsr107cache/debian/changelog	2007-09-16 19:24:15 UTC (rev 4188)
@@ -1,3 +1,15 @@
+jsr107cache (1.0.dfsg.1-2) unstable; urgency=low
+
+  * Add the clean target to build.xml (Closes: #442607)
+  * Add Kumar Appaiah and Varun Hiremath to uploaders.
+  * Add orig-tar.sh to automate repackaging.
+  * Move debhelper and cdbs to Build-Depends from Build-Depends-Indep.
+  * Ensure that the versioned symlink to the jar is installed.
+  * Remove unnecessary dirs, links and install files from debian/
+  * Ensure build.xml does not use hard coded version.
+  
+ -- Kumar Appaiah <akumar at ee.iitm.ac.in>  Mon, 17 Sep 2007 00:57:07 +0530
+
 jsr107cache (1.0.dfsg.1-1) unstable; urgency=low
 
   * Initial Release (closes: #422601).

Modified: trunk/jsr107cache/debian/control
===================================================================
--- trunk/jsr107cache/debian/control	2007-09-16 19:23:59 UTC (rev 4187)
+++ trunk/jsr107cache/debian/control	2007-09-16 19:24:15 UTC (rev 4188)
@@ -2,8 +2,9 @@
 Section: libs
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Arnaud Vandyck <avdyk at debian.org>
-Build-Depends-Indep: debhelper (>= 4.2.30), java-gcj-compat-dev (>= 1.0.69-2), ant, cdbs
+Uploaders: Arnaud Vandyck <avdyk at debian.org>, Kumar Appaiah <akumar at ee.iitm.ac.in>, Varun Hiremath <varunhiremath at gmail.com>
+Build-Depends-Indep: java-gcj-compat-dev (>= 1.0.69-2), ant
+Build-Depends: debhelper (>= 4.2.30), cdbs
 Standards-Version: 3.7.2
 
 Package: libjsr107cache-java

Deleted: trunk/jsr107cache/debian/libjsr107cache-java.dirs
===================================================================
--- trunk/jsr107cache/debian/libjsr107cache-java.dirs	2007-09-16 19:23:59 UTC (rev 4187)
+++ trunk/jsr107cache/debian/libjsr107cache-java.dirs	2007-09-16 19:24:15 UTC (rev 4188)
@@ -1 +0,0 @@
-usr/share/java

Deleted: trunk/jsr107cache/debian/libjsr107cache-java.install
===================================================================
--- trunk/jsr107cache/debian/libjsr107cache-java.install	2007-09-16 19:23:59 UTC (rev 4187)
+++ trunk/jsr107cache/debian/libjsr107cache-java.install	2007-09-16 19:24:15 UTC (rev 4188)
@@ -1 +0,0 @@
-target/jsr107cache-1.0.jar			/usr/share/java/

Deleted: trunk/jsr107cache/debian/libjsr107cache-java.links
===================================================================
--- trunk/jsr107cache/debian/libjsr107cache-java.links	2007-09-16 19:23:59 UTC (rev 4187)
+++ trunk/jsr107cache/debian/libjsr107cache-java.links	2007-09-16 19:24:15 UTC (rev 4188)
@@ -1 +0,0 @@
-/usr/share/java/jsr107cache-1.0.jar	/usr/share/java/jsr107cache.jar

Added: trunk/jsr107cache/debian/orig-tar.sh
===================================================================
--- trunk/jsr107cache/debian/orig-tar.sh	                        (rev 0)
+++ trunk/jsr107cache/debian/orig-tar.sh	2007-09-16 19:24:15 UTC (rev 4188)
@@ -0,0 +1,23 @@
+#!/bin/sh -e
+
+# called by uscan with '--upstream-version' <version> <file>
+DIR=jsr107cache-$2.dfsg.1.orig
+
+# clean up the upstream tarball
+mkdir $DIR
+cd $DIR
+jar xf ../../jsr107cache-$2-bundle.jar
+jar xf jsr107cache-$2-sources.jar
+cd ..
+TAR="jsr107cache_$2.dfsg.1.orig.tar.gz"
+GZIP=--best tar czf $TAR --exclude '*.jar' $DIR
+rm -rf $DIR $3
+
+# move to directory 'tarballs'
+if [ -r .svn/deb-layout ]; then
+    . .svn/deb-layout
+    mv $TAR $origDir
+    echo "moved $TAR to $origDir"
+fi
+
+exit 0


Property changes on: trunk/jsr107cache/debian/orig-tar.sh
___________________________________________________________________
Name: executable
   + 1

Modified: trunk/jsr107cache/debian/rules
===================================================================
--- trunk/jsr107cache/debian/rules	2007-09-16 19:23:59 UTC (rev 4187)
+++ trunk/jsr107cache/debian/rules	2007-09-16 19:24:15 UTC (rev 4188)
@@ -12,3 +12,11 @@
 DEB_JARS := 
 DEB_ANT_BUILD_TARGET := jar # javadocs
 DEB_ANT_BUILDFILE := debian/build.xml
+
+install/libjsr107cache-java::
+	install -m 644 -D target/jsr107cache.jar $(DEB_DESTDIR)/usr/share/java/jsr107cache-$(DEB_UPSTREAM_VERSION).jar
+	dh_link /usr/share/java/jsr107cache-$(DEB_UPSTREAM_VERSION).jar \
+	  /usr/share/java/jsr107cache.jar
+
+get-orig-source:
+	-uscan --upstream-version 0 --rename

Modified: trunk/jsr107cache/debian/watch
===================================================================
--- trunk/jsr107cache/debian/watch	2007-09-16 19:23:59 UTC (rev 4187)
+++ trunk/jsr107cache/debian/watch	2007-09-16 19:24:15 UTC (rev 4188)
@@ -1,7 +1,6 @@
 # watch control file for uscan
-version=2
+version=3
 # Options
-
+opts="uversionmangle=s/$/.dfsg.1/"
 # Site Version Script
-opts=dversionmangle=s/\.dfsg\.\d+$// \
-  http://heanet.dl.sourceforge.net/sourceforge/jsr107cache/jsr107cache-(.*)\.tgz debian uupdate
+http://heanet.dl.sourceforge.net/sourceforge/jsr107cache/ jsr107cache-(.*)-bundle\.jar debian debian/orig-tar.sh

More information about the pkg-java-commits mailing list