[pkg-java] r4238 - in trunk/commons-digester/debian: . patches

varun-guest at alioth.debian.org varun-guest at alioth.debian.org
Thu Sep 20 16:30:02 UTC 2007 

Author: varun-guest
Date: 2007-09-20 16:30:02 +0000 (Thu, 20 Sep 2007)
New Revision: 4238

Added:
   trunk/commons-digester/debian/orig-tar.sh
Removed:
   trunk/commons-digester/debian/dirs
   trunk/commons-digester/debian/libcommons-digester-java.links
Modified:
   trunk/commons-digester/debian/changelog
   trunk/commons-digester/debian/compat
   trunk/commons-digester/debian/control
   trunk/commons-digester/debian/patches/01_Tomcat4_Digester1_7_Workaround.patch
   trunk/commons-digester/debian/rules
   trunk/commons-digester/debian/watch
Log:
* New upstream release
* debian/control:
  + Add myself and Kumar Appaiah to Uploaders.
  + move cdbs and debhelper to Build-Depends.
  + modify Description.
* debian/compat: switch to 5
* remove links file from debian/
* debian/rules:
  + Use DEB_UPSTREAM_VERSION to install jar
  + Create a versioned symbolic link to the jar.
  + implement get-orig-source
* Add debian/orig-tar.sh to remove CRLF line terminators from upstream files.
* Update debian/watch to call debian/orig-tar.sh

Modified: trunk/commons-digester/debian/changelog
===================================================================
--- trunk/commons-digester/debian/changelog	2007-09-20 16:02:39 UTC (rev 4237)
+++ trunk/commons-digester/debian/changelog	2007-09-20 16:30:02 UTC (rev 4238)
@@ -1,12 +1,28 @@
-libcommons-digester-java (1.7-4) UNRELEASED; urgency=low
+libcommons-digester-java (1.8-1) unstable; urgency=low
 
+  [ Kumar Appaiah ]
   * debian/control:
     + Add XS-Vcs-{Svn,Browser}.
     + Add Homepage field.
   * Add watch file.
 
- -- Kumar Appaiah <akumar at ee.iitm.ac.in>  Thu, 20 Sep 2007 20:11:18 +0530
+  [ Varun Hiremath ]
+  * New upstream release
+  * debian/control:
+    + Add myself and Kumar Appaiah to Uploaders.
+    + move cdbs and debhelper to Build-Depends.
+    + modify Description.
+  * debian/compat: switch to 5
+  * remove links file from debian/
+  * debian/rules:
+    + Use DEB_UPSTREAM_VERSION to install jar
+    + Create a versioned symbolic link to the jar.
+    + implement get-orig-source
+  * Add debian/orig-tar.sh to remove CRLF line terminators from upstream files.
+  * Update debian/watch to call debian/orig-tar.sh
 
+ -- Varun Hiremath <varunhiremath at gmail.com>  Thu, 20 Sep 2007 22:02:53 +0530
+
 libcommons-digester-java (1.7-3) unstable; urgency=low
 
   * Use java-gcj-compat instead of kaffe

Modified: trunk/commons-digester/debian/compat
===================================================================
--- trunk/commons-digester/debian/compat	2007-09-20 16:02:39 UTC (rev 4237)
+++ trunk/commons-digester/debian/compat	2007-09-20 16:30:02 UTC (rev 4238)
@@ -1 +1,2 @@
-4
+5
+

Modified: trunk/commons-digester/debian/control
===================================================================
--- trunk/commons-digester/debian/control	2007-09-20 16:02:39 UTC (rev 4237)
+++ trunk/commons-digester/debian/control	2007-09-20 16:30:02 UTC (rev 4238)
@@ -2,8 +2,9 @@
 Section: libs
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Michael Koch <konqueror at gmx.de>
-Build-Depends: debhelper (>= 4.2.30), cdbs (>= 0.4.21), ant, java-gcj-compat-dev, libcommons-beanutils-java, libcommons-logging-java
+Uploaders: 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 (>= 0.4.21)
+Build-Depends-Indep: ant, java-gcj-compat-dev, libcommons-beanutils-java, libcommons-logging-java
 Standards-Version: 3.7.2
 XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/commons-digester
 XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/commons-digester
@@ -13,5 +14,6 @@
 Architecture: all
 Depends: java-gcj-compat | java1-runtime | java2-runtime, libcommons-beanutils-java (>= 1.7-1), libcommons-logging-java
 Description: Rule based XML Java object mapping tool
- Commons-Digester convert XML to Java object by mapping rule. A rich set of 
- predefined rules is available for your use, or you can also create your own.
+ Commons-Digester converts XML to a Java object by a set of mapping
+ rules. A rich set of predefined rules is available for your use. You
+ can also create your own rules.

Deleted: trunk/commons-digester/debian/dirs
===================================================================
--- trunk/commons-digester/debian/dirs	2007-09-20 16:02:39 UTC (rev 4237)
+++ trunk/commons-digester/debian/dirs	2007-09-20 16:30:02 UTC (rev 4238)
@@ -1 +0,0 @@
-usr/share/java

Deleted: trunk/commons-digester/debian/libcommons-digester-java.links
===================================================================
--- trunk/commons-digester/debian/libcommons-digester-java.links	2007-09-20 16:02:39 UTC (rev 4237)
+++ trunk/commons-digester/debian/libcommons-digester-java.links	2007-09-20 16:30:02 UTC (rev 4238)
@@ -1 +0,0 @@
-usr/share/java/commons-digester-1.7.jar usr/share/java/commons-digester.jar

Added: trunk/commons-digester/debian/orig-tar.sh
===================================================================
--- trunk/commons-digester/debian/orig-tar.sh	                        (rev 0)
+++ trunk/commons-digester/debian/orig-tar.sh	2007-09-20 16:30:02 UTC (rev 4238)
@@ -0,0 +1,21 @@
+#!/bin/sh -e
+
+# called by uscan with '--upstream-version' <version> <file>
+UDIR=commons-digester-$2-src
+DDIR=libcommons-digester-java-$2.orig
+
+# 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/commons-digester/debian/orig-tar.sh
___________________________________________________________________
Name: svn:executable
   + *

Modified: trunk/commons-digester/debian/patches/01_Tomcat4_Digester1_7_Workaround.patch
===================================================================
--- trunk/commons-digester/debian/patches/01_Tomcat4_Digester1_7_Workaround.patch	2007-09-20 16:02:39 UTC (rev 4237)
+++ trunk/commons-digester/debian/patches/01_Tomcat4_Digester1_7_Workaround.patch	2007-09-20 16:30:02 UTC (rev 4238)
@@ -1,32 +1,22 @@
---- src/java/org/apache/commons/digester/Digester.java.orig	2005-09-24 15:55:01.000000000 +0200
-+++ src/java/org/apache/commons/digester/Digester.java	2005-09-24 15:54:34.000000000 +0200
-@@ -194,7 +194,15 @@
-      */
+diff -Nur libcommons-digester-java-1.8/src/java/org/apache/commons/digester/Digester.java libcommons-digester-java-1.8.new/src/java/org/apache/commons/digester/Digester.java
+--- libcommons-digester-java-1.8/src/java/org/apache/commons/digester/Digester.java	2007-09-20 21:22:48.000000000 +0530
++++ libcommons-digester-java-1.8.new/src/java/org/apache/commons/digester/Digester.java	2007-09-20 21:28:43.000000000 +0530
+@@ -199,6 +199,12 @@
      protected String JAXP_SCHEMA_LANGUAGE =
          "http://java.sun.com/xml/jaxp/properties/schemaLanguage";
--    
-+
-+
+     
 +    /**
 +     * The JAXP 1.2 property required to set up the schema location.
 +     * Removed in digester 1.6 - introduced for tomcat4 backport
 +     */
 +    private static final String JAXP_SCHEMA_SOURCE =
 +        "http://java.sun.com/xml/jaxp/properties/schemaSource";
-+
      
      /**
       * The Locator associated with our parser.
-@@ -689,12 +697,37 @@
-                     properties.put("schemaLocation", schemaLocation);
-                     properties.put("schemaLanguage", schemaLanguage);
-                 }
--                parser = ParserFeatureSetterFactory.newSAXParser(properties);               } else {
-+                parser = ParserFeatureSetterFactory.newSAXParser(properties);               
-+            } else {
+@@ -714,8 +720,32 @@
                  parser = getFactory().newSAXParser();
--            }
-+            }          
+             }
          } catch (Exception e) {
 -            log.error("Digester.getParser: ", e);
 -            return (null);

Modified: trunk/commons-digester/debian/rules
===================================================================
--- trunk/commons-digester/debian/rules	2007-09-20 16:02:39 UTC (rev 4237)
+++ trunk/commons-digester/debian/rules	2007-09-20 16:30:02 UTC (rev 4238)
@@ -18,3 +18,6 @@
 install/libcommons-digester-java::
 	install -D -m 644 dist/commons-digester.jar debian/libcommons-digester-java/usr/share/java/commons-digester-$(DEB_UPSTREAM_VERSION).jar
 	dh_link usr/share/java/commons-digester-$(DEB_UPSTREAM_VERSION).jar usr/share/java/commons-digester.jar
+
+get-orig-source:
+	-uscan --upstream-version 0 --rename


Property changes on: trunk/commons-digester/debian/rules
___________________________________________________________________
Name: svn:executable
   + *

Modified: trunk/commons-digester/debian/watch
===================================================================
--- trunk/commons-digester/debian/watch	2007-09-20 16:02:39 UTC (rev 4237)
+++ trunk/commons-digester/debian/watch	2007-09-20 16:30:02 UTC (rev 4238)
@@ -1,2 +1,3 @@
 version=3
-http://www.apache.org/dist/commons/digester/source/ commons-digester-([\d\.]+)-src.tar.gz debian uupdate
+http://www.apache.org/dist/commons/digester/source/ commons-digester-([\d\.]+)-src.tar.gz debian debian/orig-tar.sh
+

More information about the pkg-java-commits mailing list