[xml/sgml-commit] r2244 - in /packages/xml-core/trunk: debhelper/dh_installxmlcatalogs debian/changelog debian/control

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

Author: aerostitch-guest
Date: Mon Mar  3 18:59:25 2014
New Revision: 2244

URL: http://svn.debian.org/wsvn/debian-xml-sgml/?sc=1&rev=2244
Log:
Moving from nmu to maintainer version.
Also correcting a potential Debian Policy violation.


Modified:
    packages/xml-core/trunk/debhelper/dh_installxmlcatalogs
    packages/xml-core/trunk/debian/changelog
    packages/xml-core/trunk/debian/control

Modified: packages/xml-core/trunk/debhelper/dh_installxmlcatalogs
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/xml-core/trunk/debhelper/dh_installxmlcatalogs?rev=2244&op=diff
==============================================================================
--- packages/xml-core/trunk/debhelper/dh_installxmlcatalogs	(original)
+++ packages/xml-core/trunk/debhelper/dh_installxmlcatalogs	Mon Mar  3 18:59:25 2014
@@ -142,7 +142,9 @@
 sub add_xmlcat_cmd ($$$;$) {
     my ($pkg, $type, $id, $local) = @_;
     my $cmd = 'update-xmlcatalog';
-    $cmd .= ' --sort'; # Adding auto-sort on catalog installation see #626036
+    if ( $local ) { # Adding auto-sort on non-root catalog install see #626036
+      $cmd .= ' --sort';
+    }
     $cmd .= ' --add';
     $cmd .= " --type $type";
     $cmd .= " --id \"$id\"";

Modified: packages/xml-core/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/xml-core/trunk/debian/changelog?rev=2244&op=diff
==============================================================================
--- packages/xml-core/trunk/debian/changelog	(original)
+++ packages/xml-core/trunk/debian/changelog	Mon Mar  3 18:59:25 2014
@@ -1,4 +1,4 @@
-xml-core (0.13+nmu3) unstable; urgency=medium
+xml-core (0.14) unstable; urgency=medium
 
   * Non-maintainer upload.
   * Adding an optional sorting switch to sort the catalog entries 

Modified: packages/xml-core/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/xml-core/trunk/debian/control?rev=2244&op=diff
==============================================================================
--- packages/xml-core/trunk/debian/control	(original)
+++ packages/xml-core/trunk/debian/control	Mon Mar  3 18:59:25 2014
@@ -2,7 +2,7 @@
 Section: text
 Priority: optional
 Maintainer: Debian XML/SGML Group <debian-xml-sgml-pkgs at lists.alioth.debian.org>
-Uploaders: Ardo van Rangelrooij <ardo at debian.org>, Daniel Leidert (dale) <daniel.leidert at wgdd.de>
+Uploaders: Ardo van Rangelrooij <ardo at debian.org>, Daniel Leidert (dale) <daniel.leidert at wgdd.de>, Joseph Herlant <herlantj at gmail.com>
 Build-Depends: debhelper (>= 9.20120909)
 Build-Depends-Indep: perl
 Standards-Version: 3.9.5