[pkg-java] r4180 - trunk/libcommons-validator-java/debian

varun-guest at alioth.debian.org varun-guest at alioth.debian.org
Sat Sep 15 17:40:17 UTC 2007 

Author: varun-guest
Date: 2007-09-15 17:40:17 +0000 (Sat, 15 Sep 2007)
New Revision: 4180

Added:
   trunk/libcommons-validator-java/debian/orig-tar.sh
Removed:
   trunk/libcommons-validator-java/debian/conf/
   trunk/libcommons-validator-java/debian/patches/
Modified:
   trunk/libcommons-validator-java/debian/ant.properties
   trunk/libcommons-validator-java/debian/changelog
   trunk/libcommons-validator-java/debian/compat
   trunk/libcommons-validator-java/debian/control
   trunk/libcommons-validator-java/debian/rules
   trunk/libcommons-validator-java/debian/watch
Log:
* New upstream release.
* New uploaders: Varun Hiremath and Kumar Appaiah, removed Wolfgang Baer
* Use upstream's conf directory for configuration and DTDs.
* Use a custom ant.properties to avoid downloads.
* Use DEB_UPSTREAM_VERSION in rules instead of versions in rules for symlinking.
* debian/control:
  + Add rhino to Build-Depends-Indep and Depends.
  + Add XS-Vcs-{Svn, Browser} headers.
* debian/compat: switch to 5
* Remove debian/patches and remove RELEASE-NOTES.txt in debian/rules.
* Add debian/orig-tar.sh to remove CRLF line terminators from upstream files.
* debian/rules: implement get-orig-source
* debian/watch: switch to version 3 and call debian/orig-tar.sh

Modified: trunk/libcommons-validator-java/debian/ant.properties
===================================================================
--- trunk/libcommons-validator-java/debian/ant.properties	2007-09-15 07:57:39 UTC (rev 4179)
+++ trunk/libcommons-validator-java/debian/ant.properties	2007-09-15 17:40:17 UTC (rev 4180)
@@ -1,3 +1,9 @@
 build.sysclasspath=only
 compile.target=1.3
-conf.home=debian/conf/share
+dojo_custom_rhino.jar=/usr/share/java/js.jar
+commons-beanutils.jar=/usr/share/java/commons-beanutils.jar
+commons-digester.jar=/usr/share/java/commons-digester.jar
+commons-logging.jar=/usr/share/java/commons-logging.jar
+oro.jar=/usr/share/java/oro.jar
+junit.jar=/usr/share/java/junit.jar
+xerces.jar=/usr/share/java/xercesImpl.jar

Modified: trunk/libcommons-validator-java/debian/changelog
===================================================================
--- trunk/libcommons-validator-java/debian/changelog	2007-09-15 07:57:39 UTC (rev 4179)
+++ trunk/libcommons-validator-java/debian/changelog	2007-09-15 17:40:17 UTC (rev 4180)
@@ -1,3 +1,24 @@
+libcommons-validator-java (1:1.3.1-1) unstable; urgency=low
+
+  [ Kumar Appaiah ]
+  * New upstream release.
+  * New uploaders: Varun Hiremath and Kumar Appaiah, removed Wolfgang Baer
+  * Use upstream's conf directory for configuration and DTDs.
+  * Use a custom ant.properties to avoid downloads.
+  * Use DEB_UPSTREAM_VERSION in rules instead of versions in rules for symlinking.
+
+  [ Varun Hiremath ]
+  * debian/control:
+    + Add rhino to Build-Depends-Indep and Depends.
+    + Add XS-Vcs-{Svn, Browser} headers.
+  * debian/compat: switch to 5
+  * Remove debian/patches and remove RELEASE-NOTES.txt in debian/rules.
+  * Add debian/orig-tar.sh to remove CRLF line terminators from upstream files.
+  * debian/rules: implement get-orig-source
+  * debian/watch: switch to version 3 and call debian/orig-tar.sh
+
+ -- Varun Hiremath <varunhiremath at gmail.com>  Sat, 15 Sep 2007 23:14:16 +0530
+
 libcommons-validator-java (1:1.1.4a-1) unstable; urgency=low
 
   * build with java-gcj-compat-dev

Modified: trunk/libcommons-validator-java/debian/compat
===================================================================
--- trunk/libcommons-validator-java/debian/compat	2007-09-15 07:57:39 UTC (rev 4179)
+++ trunk/libcommons-validator-java/debian/compat	2007-09-15 17:40:17 UTC (rev 4180)
@@ -1 +1 @@
-4
+5

Modified: trunk/libcommons-validator-java/debian/control
===================================================================
--- trunk/libcommons-validator-java/debian/control	2007-09-15 07:57:39 UTC (rev 4179)
+++ trunk/libcommons-validator-java/debian/control	2007-09-15 17:40:17 UTC (rev 4180)
@@ -2,14 +2,16 @@
 Section: libs
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Arnaud Vandyck <avdyk at debian.org>, Wolfgang Baer <WBaer at gmx.de>
-Build-Depends: debhelper (>= 4.2.30), cdbs
-Build-Depends-Indep: java-gcj-compat-dev, ant, junit (>= 3.8.1), libcommons-beanutils-java (>= 1.5), libcommons-collections-java (>= 2.1), libcommons-digester-java (>= 1.4), libcommons-logging-java (>= 1.0.3), liboro-java (>= 2.0.6), sgml-base
+Uploaders: Arnaud Vandyck <avdyk at debian.org>, Kumar Appaiah <akumar at ee.iitm.ac.in>, Varun Hiremath <varunhiremath at gmail.com>
+Build-Depends: debhelper (>= 5), cdbs
+Build-Depends-Indep: java-gcj-compat-dev, ant, junit (>= 3.8.1), libcommons-beanutils-java (>= 1.5), libcommons-collections-java (>= 2.1), libcommons-digester-java (>= 1.4), libcommons-logging-java (>= 1.0.3), liboro-java (>= 2.0.6), sgml-base, rhino
 Standards-Version: 3.7.2
+XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libcommons-validator-java
+XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libcommons-validator-java
 
 Package: libcommons-validator-java
 Architecture: all
-Depends: kaffe | java1-runtime | java2-runtime, libcommons-beanutils-java (>= 1.5), libcommons-collections-java (>= 2.1), libcommons-digester-java (>= 1.4), libcommons-logging-java (>= 1.0.3), liboro-java (>= 2.0.6), sgml-base
+Depends: kaffe | java1-runtime | java2-runtime, libcommons-beanutils-java (>= 1.5), libcommons-collections-java (>= 2.1), libcommons-digester-java (>= 1.4), libcommons-logging-java (>= 1.0.3), liboro-java (>= 2.0.6), sgml-base, rhino
 Description: ease and speed development and maintenance of validation rules
  The Commons Validator is a basic validation framework
  that lets you define validation rules for a JavaBean
@@ -19,4 +21,5 @@
  keeps them abstracted from JavaBean you are validating.
  .
  This is a part of the Apache Jakarta Project.
- Home: <http://jakarta.apache.org/commons/validator/>
+ .
+  Homepage: http://jakarta.apache.org/commons/validator/

Added: trunk/libcommons-validator-java/debian/orig-tar.sh
===================================================================
--- trunk/libcommons-validator-java/debian/orig-tar.sh	                        (rev 0)
+++ trunk/libcommons-validator-java/debian/orig-tar.sh	2007-09-15 17:40:17 UTC (rev 4180)
@@ -0,0 +1,21 @@
+#!/bin/sh -e
+
+# called by uscan with '--upstream-version' <version> <file>
+UDIR=commons-validator-$2-src
+DDIR=libcommons-validator-java-$2
+
+# Remove ^M CRLF line terminators
+tar -z -x -f $3
+mv $UDIR $DDIR
+(cd $DDIR; find -type f|xargs perl -pi -e 's/\r$//g')
+GZIP=--best tar -c -z -f $3 $DDIR
+rm -rf $DDIR $UDIR
+
+# 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/libcommons-validator-java/debian/orig-tar.sh
___________________________________________________________________
Name: svn:executable
   + *

Modified: trunk/libcommons-validator-java/debian/rules
===================================================================
--- trunk/libcommons-validator-java/debian/rules	2007-09-15 07:57:39 UTC (rev 4179)
+++ trunk/libcommons-validator-java/debian/rules	2007-09-15 17:40:17 UTC (rev 4180)
@@ -6,9 +6,8 @@
 
 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
+JAVA_HOME            := /usr/lib/jvm/java-gcj
 DEB_JARS             := junit commons-beanutils commons-collections commons-digester commons-logging oro
 DEB_ANT_BUILD_TARGET := dist
 
@@ -16,16 +15,17 @@
 DEB_INSTALL_DOCS_ALL := NOTICE.txt dist/docs/*
 
 LIBRARY=commons-validator
-VERSION=1.1.4
 
 clean:: 
-#	-rm dist/${LIBRARY}*.jar dist/commons-validator_1_0_1.dtd
-	-rm debian/install debian/links debian/sgmlcatalogs
+	$(RM) debian/install debian/links debian/sgmlcatalogs
 
 install/lib${LIBRARY}-java::
-	mv dist/${LIBRARY}.jar dist/${LIBRARY}-${VERSION}.jar
-	cp debian/conf/share/*.dtd dist/
-	echo "dist/${LIBRARY}-${VERSION}.jar usr/share/java" > debian/install
+	cp conf/share/*.dtd dist/
+	$(RM) dist/RELEASE-NOTES.txt
+	echo "dist/${LIBRARY}-${DEB_UPSTREAM_VERSION}.jar usr/share/java" > debian/install
 	echo "dist/*.dtd usr/share/sgml/apache/jakarta/validator" >> debian/install
-	echo "usr/share/java/${LIBRARY}-${VERSION}.jar usr/share/java/${LIBRARY}.jar" > debian/links
+	echo "usr/share/java/${LIBRARY}-${DEB_UPSTREAM_VERSION}.jar usr/share/java/${LIBRARY}.jar" > debian/links
 	echo "debian/commons-validator_1_0_1.cat /usr/share/sgml/apache/jakarta/validator/catalog" > debian/sgmlcatalogs
+
+get-orig-source:
+	-uscan --upstream-version 0 --rename

Modified: trunk/libcommons-validator-java/debian/watch
===================================================================
--- trunk/libcommons-validator-java/debian/watch	2007-09-15 07:57:39 UTC (rev 4179)
+++ trunk/libcommons-validator-java/debian/watch	2007-09-15 17:40:17 UTC (rev 4180)
@@ -1,2 +1,3 @@
-version=2
-http://www.apache.org/dist/jakarta/commons/validator/source/commons-validator-(.*)-src\.tar\.gz debian uupdate
+version=3
+http://www.apache.org/dist/jakarta/commons/validator/source/ \
+     commons-validator-(.*)-src\.tar\.gz debian debian/orig-tar.sh

More information about the pkg-java-commits mailing list