[xml/sgml-commit] r2096 - in /packages/herold/trunk/debian: changelog conf/ conf/log4j.xml patches/jarsdir.patch patches/series profiles/default.her profiles/word.her rules watch
malat at users.alioth.debian.org
malat at users.alioth.debian.org
Wed Nov 7 10:38:41 UTC 2012
Author: malat
Date: Wed Nov 7 10:38:40 2012
New Revision: 2096
URL: http://svn.debian.org/wsvn/debian-xml-sgml/?sc=1&rev=2096
Log:
Start work on 6.0.2
Added:
packages/herold/trunk/debian/conf/
packages/herold/trunk/debian/conf/log4j.xml
Modified:
packages/herold/trunk/debian/changelog
packages/herold/trunk/debian/patches/jarsdir.patch
packages/herold/trunk/debian/patches/series
packages/herold/trunk/debian/profiles/default.her
packages/herold/trunk/debian/profiles/word.her
packages/herold/trunk/debian/rules
packages/herold/trunk/debian/watch
Modified: packages/herold/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/herold/trunk/debian/changelog?rev=2096&op=diff
==============================================================================
--- packages/herold/trunk/debian/changelog (original)
+++ packages/herold/trunk/debian/changelog Wed Nov 7 10:38:40 2012
@@ -1,3 +1,9 @@
+herold (6.0.2-1) UNRELEASED; urgency=low
+
+ * New upstream
+
+ -- Mathieu Malaterre <malat at debian.org> Wed, 07 Nov 2012 10:16:55 +0100
+
herold (6.0.1-2) unstable; urgency=low
* Fix herold -V option. Closes: #689307
Added: packages/herold/trunk/debian/conf/log4j.xml
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/herold/trunk/debian/conf/log4j.xml?rev=2096&op=file
==============================================================================
--- packages/herold/trunk/debian/conf/log4j.xml (added)
+++ packages/herold/trunk/debian/conf/log4j.xml Wed Nov 7 10:38:40 2012
@@ -1,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
+ <appender name="console" class="org.apache.log4j.ConsoleAppender">
+ <param name="Target" value="System.out" />
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="[%-5p] %c %x - %m%n"/>
+ </layout>
+ <!--
+ <filter class="org.apache.log4j.varia.StringMatchFilter">
+ <param name="StringToMatch" value="logoPath"/>
+ <param name="AcceptOnMatch" value="true"/>
+ </filter>
+ <filter class="org.apache.log4j.varia.DenyAllFilter"/>
+ -->
+ </appender>
+ <logger name="org.dbdoclet.herold">
+ <level value="warn"/>
+ </logger>
+ <logger name="org.dbdoclet.trafo.html.parser">
+ <level value="warn"/>
+ </logger>
+ <logger name="org.dbdoclet.trafo.html.docbook.DocBookTransformer">
+ <level value="warn"/>
+ </logger>
+ <root>
+ <priority value="error"/>
+ <appender-ref ref="console"/>
+ </root>
+</log4j:configuration>
Modified: packages/herold/trunk/debian/patches/jarsdir.patch
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/herold/trunk/debian/patches/jarsdir.patch?rev=2096&op=diff
==============================================================================
--- packages/herold/trunk/debian/patches/jarsdir.patch (original)
+++ packages/herold/trunk/debian/patches/jarsdir.patch Wed Nov 7 10:38:40 2012
@@ -3,8 +3,10 @@
Author: Mathieu Malaterre <malat at debian.org>
Forwarded: not-needed
---- herold-6.0.1-68.orig/build.xml
-+++ herold-6.0.1-68/build.xml
+Index: src/build.xml
+===================================================================
+--- src.orig/build.xml 2012-11-07 11:14:32.000000000 +0100
++++ src/build.xml 2012-11-07 11:35:27.694682453 +0100
@@ -13,7 +13,7 @@
<include name="org/dbdoclet/trafo/tag/html/*" />
<include name="org/dbdoclet/trafo/html/docbook/editor/**" />
@@ -14,17 +16,13 @@
<include name="*.jar" />
</fileset>
</classpath>
-@@ -23,7 +23,7 @@
+@@ -23,8 +23,8 @@
<exclude name="**/*.java" />
</fileset>
</copy>
-- <jar destfile="../jars/herold.jar">
-+ <jar destfile="jars/herold.jar">
+- <jar destfile="../jars/herold.jar" manifest="java/META-INF/MANIFEST.MF">
++ <jar destfile="jars/herold.jar" manifest="java/META-INF/MANIFEST.MF">
<fileset dir="classes" />
- <manifest>
- <attribute name="Main-Class" value="org.dbdoclet.herold.Herold" />
-@@ -32,4 +32,4 @@
- </manifest>
</jar>
</target>
-</project>
Modified: packages/herold/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/herold/trunk/debian/patches/series?rev=2096&op=diff
==============================================================================
--- packages/herold/trunk/debian/patches/series (original)
+++ packages/herold/trunk/debian/patches/series Wed Nov 7 10:38:40 2012
@@ -1,4 +1,2 @@
jarsdir.patch
-fixclasspath.patch
antencoding.patch
-fixversion.patch
Modified: packages/herold/trunk/debian/profiles/default.her
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/herold/trunk/debian/profiles/default.her?rev=2096&op=diff
==============================================================================
--- packages/herold/trunk/debian/profiles/default.her (original)
+++ packages/herold/trunk/debian/profiles/default.her Wed Nov 7 10:38:40 2012
@@ -1,18 +1,11 @@
transformation html2docbook;
-input {
-}
-
-output {
-}
-
section HTML {
- source-encoding = "UTF-8";
+ encoding = "UTF-8";
}
section DocBook {
- destination-encoding = "UTF-8";
+ encoding = "UTF-8";
add-index = true;
emphasis-role-bold = "bold";
- // section-numbering-pattern = "(((\d\.)+)?\d?\.?\p{Z}*).*";
}
Modified: packages/herold/trunk/debian/profiles/word.her
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/herold/trunk/debian/profiles/word.her?rev=2096&op=diff
==============================================================================
--- packages/herold/trunk/debian/profiles/word.her (original)
+++ packages/herold/trunk/debian/profiles/word.her Wed Nov 7 10:38:40 2012
@@ -3,16 +3,10 @@
/**
* Transformation of HTML exported from Winword 2003 as filtered HTML.
*/
-input {
-}
-
-output {
-}
-
section HTML {
encoding = "windows-1252";
exclude = [ "//p[starts-with(@class, 'MsoToc')]" ];
- section-numbering-pattern = "((\d\.)+)?\d?\.?\p{Z}*";
+ section-numbering-pattern = "((\d+\.)+)?\d*\.?\p{Z}*";
}
section DocBook {
Modified: packages/herold/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/herold/trunk/debian/rules?rev=2096&op=diff
==============================================================================
--- packages/herold/trunk/debian/rules (original)
+++ packages/herold/trunk/debian/rules Wed Nov 7 10:38:40 2012
@@ -19,14 +19,17 @@
dh_clean jars/herold.jar
override_dh_install:
+ dh_install debian/conf usr/share/herold
dh_install debian/herold.sh usr/bin
mv debian/herold/usr/bin/herold.sh debian/herold/usr/bin/herold
# download missing files:
+TARGZ=herold-6.0.2-143.tar.gz
debian/dbdoclet.css:
- wget http://www.dbdoclet.org/archives/herold-6.0.1-68.tar.gz
- tar xfz herold-6.0.1-68.tar.gz
+ wget http://www.dbdoclet.org/archives/$(TARGZ)
+ tar xfz $(TARGZ)
mv ./herold/profiles debian
+ mv ./herold/conf debian
mv ./herold/doc/dbdoclet.css debian/dbdoclet.css
override_dh_installdocs:
@@ -34,7 +37,7 @@
dh_installdocs debian/dbdoclet.css
# download changelog:
-# to not automated for now (need manual checking):
+# do not automated for now (need manual checking):
#debian/herold.NEWS:
# links -dump http://www.dbdoclet.org/ | tail -n +46 > $@
Modified: packages/herold/trunk/debian/watch
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/herold/trunk/debian/watch?rev=2096&op=diff
==============================================================================
--- packages/herold/trunk/debian/watch (original)
+++ packages/herold/trunk/debian/watch Wed Nov 7 10:38:40 2012
@@ -1,2 +1,6 @@
version=3
-http://www.dbdoclet.org/archives/herold-src-([\d\.]+)-[\d]+.zip
+http://www.dbdoclet.org/archives/herold-src-([\d\.]+)-[\d+]\.zip
+# http://www.dbdoclet.org/archives/herold-src-6.0.2-143.zip
+#http://www.dbdoclet.org/archives/herold-src-([\d\.]+)-143\.zip
+#http://www.dbdoclet.org/index.html \
+# http://www.dbdoclet.org/archives/herold-src-([\d\.]+)-[\d+]\.zip
More information about the debian-xml-sgml-commit
mailing list