This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository libcommons-digester-java.
commit 5e161b9421763aab60e057b3fbd8f06fd4315052
Author: Varun Hiremath <va...@debian.org>
Date: Thu Sep 20 16:30:02 2007 +0000
* 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
---
debian/changelog | 20 ++++++++++++++++--
debian/compat | 3 ++-
debian/control | 10 +++++----
debian/dirs | 1 -
debian/libcommons-digester-java.links | 1 -
debian/orig-tar.sh | 21 +++++++++++++++++++
.../01_Tomcat4_Digester1_7_Workaround.patch | 24 +++++++---------------
debian/rules | 3 +++
debian/watch | 3 ++-
9 files changed, 59 insertions(+), 27 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index d9ff986..adedaaf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,27 @@
-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 <aku...@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 <varunhirem...@gmail.com> Thu, 20 Sep 2007 22:02:53 +0530
libcommons-digester-java (1.7-3) unstable; urgency=low
diff --git a/debian/compat b/debian/compat
index b8626c4..51d7b8d 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1,2 @@
-4
+5
+
diff --git a/debian/control b/debian/control
index 0e53fcb..8431153 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,9 @@ Source: libcommons-digester-java
Section: libs
Priority: optional
Maintainer: Debian Java Maintainers
<pkg-java-maintainers@lists.alioth.debian.org>
-Uploaders: Michael Koch <konque...@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 <konque...@gmx.de>, Varun Hiremath
<varunhirem...@gmail.com>, Kumar Appaiah <aku...@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 @@ Package: libcommons-digester-java
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.
diff --git a/debian/dirs b/debian/dirs
deleted file mode 100644
index 13c9f03..0000000
--- a/debian/dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/java
diff --git a/debian/libcommons-digester-java.links
b/debian/libcommons-digester-java.links
deleted file mode 100644
index 3df9480..0000000
--- a/debian/libcommons-digester-java.links
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/java/commons-digester-1.7.jar usr/share/java/commons-digester.jar
diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh
new file mode 100755
index 0000000..68f689c
--- /dev/null
+++ b/debian/orig-tar.sh
@@ -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
diff --git a/debian/patches/01_Tomcat4_Digester1_7_Workaround.patch
b/debian/patches/01_Tomcat4_Digester1_7_Workaround.patch
index 94145ad..f0b27f4 100644
--- a/debian/patches/01_Tomcat4_Digester1_7_Workaround.patch
+++ b/debian/patches/01_Tomcat4_Digester1_7_Workaround.patch
@@ -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);
diff --git a/debian/rules b/debian/rules
old mode 100644
new mode 100755
index e44ad2f..40b7ada
--- a/debian/rules
+++ b/debian/rules
@@ -18,3 +18,6 @@ DEB_ANT_BUILD_TARGET := dist
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
diff --git a/debian/watch b/debian/watch
index a6afcf4..38b2391 100644
--- a/debian/watch
+++ b/debian/watch
@@ -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
+
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-java/libcommons-digester-java.git
_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
