[xml/sgml-commit] r2097 - in /packages/herold/trunk/debian: changelog control herold.sh patches/fixclasspath.patch patches/fixversion.patch patches/series rules
malat at users.alioth.debian.org
malat at users.alioth.debian.org
Wed Nov 7 11:03:53 UTC 2012
Author: malat
Date: Wed Nov 7 11:03:53 2012
New Revision: 2097
URL: http://svn.debian.org/wsvn/debian-xml-sgml/?sc=1&rev=2097
Log:
Prepare 6.0.2
Removed:
packages/herold/trunk/debian/patches/fixversion.patch
Modified:
packages/herold/trunk/debian/changelog
packages/herold/trunk/debian/control
packages/herold/trunk/debian/herold.sh
packages/herold/trunk/debian/patches/fixclasspath.patch
packages/herold/trunk/debian/patches/series
packages/herold/trunk/debian/rules
Modified: packages/herold/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/herold/trunk/debian/changelog?rev=2097&op=diff
==============================================================================
--- packages/herold/trunk/debian/changelog (original)
+++ packages/herold/trunk/debian/changelog Wed Nov 7 11:03:53 2012
@@ -1,8 +1,10 @@
-herold (6.0.2-1) UNRELEASED; urgency=low
+herold (6.0.2-1) unstable; urgency=low
- * New upstream
+ * New upstream. Closes: #691163
+ * Remove patch applied upstream:
+ - debian/patches/fixversion.patch
- -- Mathieu Malaterre <malat at debian.org> Wed, 07 Nov 2012 10:16:55 +0100
+ -- Mathieu Malaterre <malat at debian.org> Wed, 07 Nov 2012 12:03:06 +0100
herold (6.0.1-2) unstable; urgency=low
Modified: packages/herold/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/herold/trunk/debian/control?rev=2097&op=diff
==============================================================================
--- packages/herold/trunk/debian/control (original)
+++ packages/herold/trunk/debian/control Wed Nov 7 11:03:53 2012
@@ -2,7 +2,7 @@
Priority: optional
Maintainer: Debian XML/SGML Group <debian-xml-sgml-pkgs at lists.alioth.debian.org>
Uploaders: Mathieu Malaterre <malat at debian.org>
-Build-Depends: debhelper (>= 9), javahelper (>=0.25), ant-contrib, libcommons-jxpath-java, libxml-commons-resolver1.1-java, libcommons-codec-java, libxmlgraphics-commons-java, antlr3, default-jdk, ant
+Build-Depends: debhelper (>= 9), javahelper (>=0.25), ant-contrib, libcommons-jxpath-java, libxml-commons-resolver1.1-java, libcommons-codec-java, libxmlgraphics-commons-java, antlr3, default-jdk, ant, libcommons-logging-java
Standards-Version: 3.9.3
Section: java
Homepage: http://www.dbdoclet.org/
Modified: packages/herold/trunk/debian/herold.sh
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/herold/trunk/debian/herold.sh?rev=2097&op=diff
==============================================================================
--- packages/herold/trunk/debian/herold.sh (original)
+++ packages/herold/trunk/debian/herold.sh Wed Nov 7 11:03:53 2012
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright (C) 2001-2008 Michael Fuchs
+# Copyright (C) 2001-2012 Michael Fuchs
trap cleanup 1 2 3 6
cleanup() {
@@ -23,7 +23,7 @@
# echo "Program: $PROG"
-PROG=`readlink -f $PROG`
+PROG=`readlink -f "$PROG"`
# echo "Resolve symbolic links: $PROG"
BIN_DIR=`dirname "$PROG"`
@@ -32,8 +32,8 @@
HEROLD_HOME=/usr/share/java
# echo "herold home: $HEROLD_HOME"
-HEROLD_JAR=$HEROLD_HOME/herold.jar
-[ -f $HEROLD_JAR ] || fatal "Can't find jar archive '$HEROLD_JAR'!"
+HEROLD_JAR="$HEROLD_HOME/herold.jar"
+[ -f "$HEROLD_JAR" ] || fatal "Can't find jar archive '$HEROLD_JAR'!"
JAVA=`type -p -- java`
[ $? -eq 0 ] || fatal "Can't find java!"
@@ -44,5 +44,5 @@
fi
tput civis
-$JAVA -Ddesktop.session=$DESKTOP_SESSION -Dconsole.lineWidth=$lineWidth -jar $HEROLD_JAR "$@"
+"$JAVA" -Xmx1024m -Ddesktop.session=$DESKTOP_SESSION -Dconsole.lineWidth=$lineWidth -jar "$HEROLD_JAR" "$@"
tput cnorm
Modified: packages/herold/trunk/debian/patches/fixclasspath.patch
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/herold/trunk/debian/patches/fixclasspath.patch?rev=2097&op=diff
==============================================================================
--- packages/herold/trunk/debian/patches/fixclasspath.patch (original)
+++ packages/herold/trunk/debian/patches/fixclasspath.patch Wed Nov 7 11:03:53 2012
@@ -1,14 +1,16 @@
Description: User jar as provided by debian
Author: Mathieu Malaterre <malat at debian.org>
---- herold-6.0.1.orig/build.xml
-+++ herold-6.0.1/build.xml
-@@ -27,7 +27,7 @@
- <fileset dir="classes" />
- <manifest>
- <attribute name="Main-Class" value="org.dbdoclet.herold.Herold" />
-- <attribute name="Class-Path" value="../conf/ commons-jxpath-1.3.jar groovy-all-1.6.5.jar antlr-runtime-3.2.jar" />
-+ <attribute name="Class-Path" value="antlr3-runtime.jar xml-resolver.jar commons-jxpath.jar commons-codec.jar xmlgraphics-commons.jar" />
- <attribute name="Created-By" value="Michael Fuchs" />
- </manifest>
- </jar>
+Index: src/java/META-INF/MANIFEST.MF
+===================================================================
+--- src.orig/java/META-INF/MANIFEST.MF 2012-11-07 11:43:31.642685325 +0100
++++ src/java/META-INF/MANIFEST.MF 2012-11-07 11:46:04.634686231 +0100
+@@ -4,7 +4,4 @@
+ Main-Class: org.dbdoclet.herold.Herold
+ Specification-Version: 6.0.2
+ Implementation-Version: 6.0.2
+-Class-Path: ../conf/ org.antlr.runtime.jar org.apache.comm
+- ons.jxpath.jar org.apache.commons.logging.jar org.apache.lo
+- g4j.jar
+-
++Class-Path: /usr/share/herold/conf/ antlr3-runtime.jar xml-resolver.jar commons-jxpath.jar commons-codec.jar xmlgraphics-commons.jar commons-logging.jar
Modified: packages/herold/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/herold/trunk/debian/patches/series?rev=2097&op=diff
==============================================================================
--- packages/herold/trunk/debian/patches/series (original)
+++ packages/herold/trunk/debian/patches/series Wed Nov 7 11:03:53 2012
@@ -1,2 +1,3 @@
jarsdir.patch
antencoding.patch
+fixclasspath.patch
Modified: packages/herold/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/herold/trunk/debian/rules?rev=2097&op=diff
==============================================================================
--- packages/herold/trunk/debian/rules (original)
+++ packages/herold/trunk/debian/rules Wed Nov 7 11:03:53 2012
@@ -1,7 +1,7 @@
#!/usr/bin/make -f
JAVA_HOME=/usr/lib/jvm/default-java
-export CLASSPATH=/usr/share/java/antlr3-runtime.jar:/usr/share/java/xml-resolver.jar:/usr/share/java/commons-jxpath.jar:/usr/share/java/commons-codec.jar:/usr/share/java/xmlgraphics-commons.jar
+export CLASSPATH=/usr/share/java/antlr3-runtime.jar:/usr/share/java/xml-resolver.jar:/usr/share/java/commons-jxpath.jar:/usr/share/java/commons-codec.jar:/usr/share/java/xmlgraphics-commons.jar:/usr/share/java/commons-logging.jar
ANT_OPTS=-Dbuild.sysclasspath=first
%:
@@ -19,7 +19,7 @@
dh_clean jars/herold.jar
override_dh_install:
- dh_install debian/conf usr/share/herold
+ dh_install -X .svn debian/conf usr/share/herold
dh_install debian/herold.sh usr/bin
mv debian/herold/usr/bin/herold.sh debian/herold/usr/bin/herold
More information about the debian-xml-sgml-commit
mailing list