[xml/sgml-commit] r1825 - in /packages/html-xml-utils/trunk/debian: changelog control patches/585451_fix_ftbfs.patch patches/series rules source/

[dleidert-guest at users.alioth.debian.org]

Author: dleidert-guest
Date: Tue Feb  8 00:02:29 2011
New Revision: 1825

URL: http://svn.debian.org/wsvn/debian-xml-sgml/?sc=1&rev=1825
Log:
Merge experimental back into trunk.


Added:
    packages/html-xml-utils/trunk/debian/source/
      - copied from r1824, packages/html-xml-utils/branches/experimental/debian/source/
Removed:
    packages/html-xml-utils/trunk/debian/patches/585451_fix_ftbfs.patch
Modified:
    packages/html-xml-utils/trunk/debian/changelog
    packages/html-xml-utils/trunk/debian/control
    packages/html-xml-utils/trunk/debian/patches/series
    packages/html-xml-utils/trunk/debian/rules

Modified: packages/html-xml-utils/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/html-xml-utils/trunk/debian/changelog?rev=1825&op=diff
==============================================================================
--- packages/html-xml-utils/trunk/debian/changelog (original)
+++ packages/html-xml-utils/trunk/debian/changelog Tue Feb  8 00:02:29 2011
@@ -1,8 +1,22 @@
-html-xml-utils (5.7-3) UNRELEASED; urgency=low
+html-xml-utils (5.8-2) UNRELEASED; urgency=low
 
   * NOT RELEASED YET
 
- -- Daniel Leidert (dale) <daniel.leidert at wgdd.de>  Mon, 14 Jun 2010 23:13:47 +0200
+ -- Daniel Leidert (dale) <daniel.leidert at wgdd.de>  Fri, 26 Nov 2010 16:19:07 +0100
+
+html-xml-utils (5.8-1) experimental; urgency=low
+
+  * New upstream release.
+  * debian/control (Standards-Version): Bumped to 3.9.1 without changes.
+    (Vcs-Browser, Vcs-Svn): Adjusted to point to experimental branch.
+    (Build-Depends): Dropped quilt.
+    (Description): Added new tool hxnsxml including short description.
+  * debian/rules: Fixed parallel building.
+  * debian/patches/585451_fix_ftbfs.patch: Dropped (applied upstream).
+  * debian/patches/series: Adjusted.
+  * debian/source/format: Change to format 3.0 (quilt).
+
+ -- Daniel Leidert (dale) <daniel.leidert at wgdd.de>  Fri, 26 Nov 2010 16:14:09 +0100
 
 html-xml-utils (5.7-2) unstable; urgency=low
 

Modified: packages/html-xml-utils/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/html-xml-utils/trunk/debian/control?rev=1825&op=diff
==============================================================================
--- packages/html-xml-utils/trunk/debian/control (original)
+++ packages/html-xml-utils/trunk/debian/control Tue Feb  8 00:02:29 2011
@@ -3,11 +3,11 @@
 Priority: extra
 Maintainer: Debian XML/SGML Group <debian-xml-sgml-pkgs at lists.alioth.debian.org>
 Uploaders: Daniel Leidert (dale) <daniel.leidert at wgdd.de>
-Build-Depends: debhelper (>> 7), quilt (>= 0.46-7~), bison, flex, gperf, man2html
-Standards-Version: 3.8.4
+Build-Depends: debhelper (>> 7), bison, flex, gperf, man2html
+Standards-Version: 3.9.1
 Homepage: http://www.w3.org/Tools/HTML-XML-utils/
-Vcs-Browser: http://svn.debian.org/wsvn/debian-xml-sgml/packages/html-xml-utils/
-Vcs-Svn: svn://svn.debian.org/svn/debian-xml-sgml/packages/html-xml-utils/trunk/
+Vcs-Browser: http://svn.debian.org/wsvn/debian-xml-sgml/packages/html-xml-utils/branches/experimental/
+Vcs-Svn: svn://svn.debian.org/svn/debian-xml-sgml/packages/html-xml-utils/branches/experimental/
 DM-Upload-Allowed: yes
 
 Package: html-xml-utils
@@ -33,12 +33,13 @@
   hxmultitoc   -  create a table of contents for a set of HTML files
   hxname2id    -  move some ID= or NAME= from A elements to their parents
   hxnormalize  -  pretty-print an HTML file
+  hxnsxml      -  convert output of hxxmlns back to normal XML
   hxnum        -  number section headings in an HTML file
   hxpipe       -  convert XML to a format easier to parse with Perl or AWK
   hxprintlinks -  number links & add table of URLs at end of an HTML file
   hxprune      -  remove marked elements from an HTML file
+  hxref        -  generate cross-references
   hxselect     -  extract elements that match a (CSS) selector
-  hxref        -  generate cross-references
   hxtoc        -  insert a table of contents in an HTML file
   hxuncdata    -  replace CDATA sections by character entities
   hxunent      -  replace HTML predefined character entities to UTF-8

Modified: packages/html-xml-utils/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/html-xml-utils/trunk/debian/patches/series?rev=1825&op=diff
==============================================================================
--- packages/html-xml-utils/trunk/debian/patches/series (original)
+++ packages/html-xml-utils/trunk/debian/patches/series Tue Feb  8 00:02:29 2011
@@ -1,1 +1,0 @@
-585451_fix_ftbfs.patch

Modified: packages/html-xml-utils/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/html-xml-utils/trunk/debian/rules?rev=1825&op=diff
==============================================================================
--- packages/html-xml-utils/trunk/debian/rules (original)
+++ packages/html-xml-utils/trunk/debian/rules Tue Feb  8 00:02:29 2011
@@ -6,4 +6,4 @@
 LDFLAGS = -Wl,-z,defs
 
 %:
-	dh --with quilt --parallel $@
+	dh $@ --parallel