[xml/sgml-commit] r2136 - in /packages/herold/trunk/debian: CHANGES changelog conf/ control icons/ patches/fixclasspath.patch profiles/ rules

[malat at users.alioth.debian.org]

Author: malat
Date: Tue Jan  1 15:26:36 2013
New Revision: 2136

URL: http://svn.debian.org/wsvn/debian-xml-sgml/?sc=1&rev=2136
Log:
Prepare 6.0.4

Removed:
    packages/herold/trunk/debian/conf/
    packages/herold/trunk/debian/icons/
    packages/herold/trunk/debian/profiles/
Modified:
    packages/herold/trunk/debian/CHANGES
    packages/herold/trunk/debian/changelog
    packages/herold/trunk/debian/control
    packages/herold/trunk/debian/patches/fixclasspath.patch
    packages/herold/trunk/debian/rules

Modified: packages/herold/trunk/debian/CHANGES
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/herold/trunk/debian/CHANGES?rev=2136&op=diff
==============================================================================
--- packages/herold/trunk/debian/CHANGES (original)
+++ packages/herold/trunk/debian/CHANGES Tue Jan  1 15:26:36 2013
@@ -1,3 +1,9 @@
+
+   [2012-12-20] herold Release 6.0.4
+              * Fixed invalid section nesting, when parameter
+                create-remap-attribute is false.
+              * Processing of more meta elements.
+              * Minor fixes.
 
    [2012-11-29] herold Release 6.0.3
               * Preserving of the attribute lang of pre elements.

Modified: packages/herold/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/herold/trunk/debian/changelog?rev=2136&op=diff
==============================================================================
--- packages/herold/trunk/debian/changelog (original)
+++ packages/herold/trunk/debian/changelog Tue Jan  1 15:26:36 2013
@@ -1,3 +1,11 @@
+herold (6.0.4-1) unstable; urgency=low
+
+  * New upstream. Closes: #695014, #693305
+  * Remove d/conf, d/icons and d/profiles. Closes: #693306
+  * Bump Std-Vers to 3.9.4, no changes needed
+
+ -- Mathieu Malaterre <malat at debian.org>  Tue, 01 Jan 2013 16:25:03 +0100
+
 herold (6.0.3-1) unstable; urgency=low
 
   * New upstream. Closes: #692544

Modified: packages/herold/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/herold/trunk/debian/control?rev=2136&op=diff
==============================================================================
--- packages/herold/trunk/debian/control (original)
+++ packages/herold/trunk/debian/control Tue Jan  1 15:26:36 2013
@@ -3,7 +3,7 @@
 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, libcommons-logging-java, docbook-xsl-ns, xsltproc
-Standards-Version: 3.9.3
+Standards-Version: 3.9.4
 Section: java
 Homepage: http://www.dbdoclet.org/
 Vcs-Browser: http://anonscm.debian.org/viewvc/debian-xml-sgml/packages/herold/

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=2136&op=diff
==============================================================================
--- packages/herold/trunk/debian/patches/fixclasspath.patch (original)
+++ packages/herold/trunk/debian/patches/fixclasspath.patch Tue Jan  1 15:26:36 2013
@@ -4,12 +4,12 @@
 
 Index: src/java/META-INF/MANIFEST.MF
 ===================================================================
---- src.orig/java/META-INF/MANIFEST.MF	2012-11-29 12:24:33.000000000 +0100
-+++ src/java/META-INF/MANIFEST.MF	2012-11-29 12:28:19.969986890 +0100
+--- src.orig/java/META-INF/MANIFEST.MF	2012-12-20 08:13:32.000000000 +0100
++++ src/java/META-INF/MANIFEST.MF	2013-01-01 16:19:38.194997702 +0100
 @@ -4,7 +4,4 @@
  Main-Class: org.dbdoclet.herold.Herold
- Specification-Version: 6.0.3
- Implementation-Version: 6.0.3
+ Specification-Version: 6.0.4
+ Implementation-Version: 6.0.4
 -Class-Path: ../conf/       org.antlr.runtime.jar       org.apache.comm
 - ons.jxpath.jar      org.apache.commons.logging.jar      org.apache.lo
 - g4j.jar

Modified: packages/herold/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/herold/trunk/debian/rules?rev=2136&op=diff
==============================================================================
--- packages/herold/trunk/debian/rules (original)
+++ packages/herold/trunk/debian/rules Tue Jan  1 15:26:36 2013
@@ -25,9 +25,9 @@
 	dh_clean manpage.html
 
 override_dh_install:
-	dh_install -X .svn debian/conf     usr/share/herold
-	dh_install -X .svn debian/icons    usr/share/herold
-	dh_install -X .svn debian/profiles usr/share/herold
+	dh_install conf     usr/share/herold
+	dh_install icons    usr/share/herold
+	dh_install profiles usr/share/herold
 	dh_install debian/herold.sh usr/bin
 	mv debian/herold/usr/bin/herold.sh debian/herold/usr/bin/herold