[pkg-java] r4187 - trunk/ehcache/debian

varun-guest at alioth.debian.org varun-guest at alioth.debian.org
Sun Sep 16 19:24:00 UTC 2007 

Author: varun-guest
Date: 2007-09-16 19:23:59 +0000 (Sun, 16 Sep 2007)
New Revision: 4187

Added:
   trunk/ehcache/debian/README.Debian-source
   trunk/ehcache/debian/orig-tar.sh
Removed:
   trunk/ehcache/debian/libehcache-java.dirs
Modified:
   trunk/ehcache/debian/build.xml
   trunk/ehcache/debian/changelog
   trunk/ehcache/debian/compat
   trunk/ehcache/debian/control
   trunk/ehcache/debian/rules
   trunk/ehcache/debian/watch
Log:
* New upstream release
* debian/build.xml:
  + Add clean target (Closes: #442557)
  + Remove hard coded version from build.xml and install versioned jar from debian/rules.
* debian/control:
  + Add myself and Kumar Appaiah to Uploaders.
  + Move cdbs abd debhelper to Build-Depends.
  + Add libcommons-collections3-java to Build-Depends-Indep and Depends
  + Add XS-Vcs-{Svn, Browser} headers.
* Add debian/orig-tar.sh
* Add debian/README.Debian-source
* Update debian/watch to call debian/orig-tar.sh
* debian/rules:
  + Add commons-collection3 to DEB_JARS
  + implement get-orig-source

Added: trunk/ehcache/debian/README.Debian-source
===================================================================
--- trunk/ehcache/debian/README.Debian-source	                        (rev 0)
+++ trunk/ehcache/debian/README.Debian-source	2007-09-16 19:23:59 UTC (rev 4187)
@@ -0,0 +1,14 @@
+ehcahce
+=======
+
+The upstream supplied source package contains binary jar files.
+Currently no clean source distribution exists. Therefore, the upstream
+sources were modified to comply with the Debian Free Software
+Guidelines.
+
+Use the rules/get-orig-source target to create the orig.tar.gz.
+For more details on repackaging of upstream sources please see the
+debian/orig-tar.sh file.
+
+-- Varun Hiremath <varunhiremath at gmail.com>  Mon, 17 Sep 2007 00:37:50 +0530
+

Modified: trunk/ehcache/debian/build.xml
===================================================================
--- trunk/ehcache/debian/build.xml	2007-09-16 13:44:39 UTC (rev 4186)
+++ trunk/ehcache/debian/build.xml	2007-09-16 19:23:59 UTC (rev 4187)
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project basedir=".." name="ehcache" default="jar">
 
-  <property name="version" value="1.3.0~beta" />
   <property name="target" value="${basedir}/target" />
   <property name="build" value="${target}/classes" />
 
@@ -10,11 +9,11 @@
   </path>
 
   <target name="clean">
-    <!-- delete dir="${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/ehcache/debian/changelog
===================================================================
--- trunk/ehcache/debian/changelog	2007-09-16 13:44:39 UTC (rev 4186)
+++ trunk/ehcache/debian/changelog	2007-09-16 19:23:59 UTC (rev 4187)
@@ -1,3 +1,23 @@
+ehcache (1.4.0~beta-1) unstable; urgency=low
+
+  * New upstream release
+  * debian/build.xml:
+    + Add clean target (Closes: #442557)
+    + Remove hard coded version from build.xml and install versioned jar from debian/rules.
+  * debian/control:
+    + Add myself and Kumar Appaiah to Uploaders.
+    + Move cdbs abd debhelper to Build-Depends.
+    + Add libcommons-collections3-java to Build-Depends-Indep and Depends
+    + Add XS-Vcs-{Svn, Browser} headers.
+  * Add debian/orig-tar.sh
+  * Add debian/README.Debian-source
+  * Update debian/watch to call debian/orig-tar.sh
+  * debian/rules:
+    + Add commons-collection3 to DEB_JARS
+    + implement get-orig-source
+
+ -- Varun Hiremath <varunhiremath at gmail.com>  Mon, 17 Sep 2007 00:18:23 +0530
+
 ehcache (1.3.0~beta.dfsg.1-1) unstable; urgency=low
 
   * Initial Release (closes: #386103).

Modified: trunk/ehcache/debian/compat
===================================================================
--- trunk/ehcache/debian/compat	2007-09-16 13:44:39 UTC (rev 4186)
+++ trunk/ehcache/debian/compat	2007-09-16 19:23:59 UTC (rev 4187)
@@ -1 +1 @@
-4
+5

Modified: trunk/ehcache/debian/control
===================================================================
--- trunk/ehcache/debian/control	2007-09-16 13:44:39 UTC (rev 4186)
+++ trunk/ehcache/debian/control	2007-09-16 19:23:59 UTC (rev 4187)
@@ -2,24 +2,21 @@
 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, libcommons-logging-java, libservlet2.4-java, libbackport-util-concurrent-java, libjsr107cache-java
+Uploaders: Arnaud Vandyck <avdyk at debian.org>, 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 (>= 1.0.69-2), ant, libcommons-logging-java, libcommons-collections3-java, libservlet2.4-java, libbackport-util-concurrent-java, libjsr107cache-java
 Standards-Version: 3.7.2
+XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/ehcache
+XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/ehcache
 
 Package: libehcache-java
 Section: libs
 Architecture: all
-Depends: java-gcj-compat | java2-runtime, libcommons-logging-java, libservlet2.4-java, libbackport-util-concurrent-java, libjsr107cache-java
+Depends: java-gcj-compat | java2-runtime, libcommons-logging-java, libcommons-collections3-java, libservlet2.4-java, libbackport-util-concurrent-java, libjsr107cache-java
 Description: distributed cache library
  Ehcache is a distributed cache for general purpose caching in Java,
  J2EE and light-weight containers. It features memory and disk stores,
  replicate by copy and invalidate, listeners, a gzip caching servlet
  filter and much more.
-
-#Package: libehcache-java-doc
-#Section: doc
-#Architecture: all
-#Suggests: libehcache-java
-#Description:
-# .
-# This package includes the documentation.
+ .
+  Homepage: http://ehcache.sourceforge.net/

Deleted: trunk/ehcache/debian/libehcache-java.dirs
===================================================================
--- trunk/ehcache/debian/libehcache-java.dirs	2007-09-16 13:44:39 UTC (rev 4186)
+++ trunk/ehcache/debian/libehcache-java.dirs	2007-09-16 19:23:59 UTC (rev 4187)
@@ -1 +0,0 @@
-usr/share/java/

Added: trunk/ehcache/debian/orig-tar.sh
===================================================================
--- trunk/ehcache/debian/orig-tar.sh	                        (rev 0)
+++ trunk/ehcache/debian/orig-tar.sh	2007-09-16 19:23:59 UTC (rev 4187)
@@ -0,0 +1,20 @@
+#!/bin/sh -e
+
+# called by uscan with '--upstream-version' <version> <file>
+DIR=ehcache-$2.orig
+
+# clean up the upstream tarball
+tar zxf $3
+mv ehcache-* $DIR
+(cd $DIR; jar xf ehcache-*-sources.jar)
+GZIP=--best tar czf $3 --exclude '*.jar' --exclude '*.zip' $DIR
+rm -rf $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/ehcache/debian/orig-tar.sh
___________________________________________________________________
Name: svn:executable
   + *

Modified: trunk/ehcache/debian/rules
===================================================================
--- trunk/ehcache/debian/rules	2007-09-16 13:44:39 UTC (rev 4186)
+++ trunk/ehcache/debian/rules	2007-09-16 19:23:59 UTC (rev 4187)
@@ -1,22 +1,19 @@
 #!/usr/bin/make -f
 # debian/rules file for ehcache (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
 
 JAVA_HOME := /usr/lib/jvm/java-gcj/
 
-DEB_JARS := commons-logging servlet-api-2.4 backport-util-concurrent jsr107cache hibernate
+DEB_JARS := commons-logging servlet-api-2.4 backport-util-concurrent jsr107cache hibernate commons-collections3
 # hibernate is needed if you wanna build net.sf.ehcache.hibernate.* package
 DEB_ANT_BUILD_TARGET := jar # javadocs
 DEB_ANT_BUILDFILE := debian/build.xml
 
-#Remove this when dfsg.1 will be removed from the package version
-VERSION = 1.3.0~beta
-
 install/libehcache-java::
-	install -m 644 target/ehcache-${VERSION}.jar debian/libehcache-java/usr/share/java/ehcache-${VERSION}.jar
-	dh_link -plibehcache-java usr/share/java/ehcache-${VERSION}.jar usr/share/java/ehcache.jar
+	install -D -m 644 target/ehcache.jar $(DEB_DESTDIR)/usr/share/java/ehcache-${DEB_UPSTREAM_VERSION}.jar
+	dh_link -plibehcache-java usr/share/java/ehcache-${DEB_UPSTREAM_VERSION}.jar usr/share/java/ehcache.jar
+
+get-orig-source:
+	-uscan --upstream-version 0 --rename

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

More information about the pkg-java-commits mailing list