[xml/sgml-commit] [xml-core] 04/07: Import Debian version 0.12
Mattia Rizzolo
mattia at debian.org
Fri Sep 30 16:12:45 UTC 2016
This is an automated email from the git hooks/post-receive script.
mattia pushed a commit to branch master
in repository xml-core.
commit ad7f4dc449b0d249a6ff2a6530f0ecf2bc7973cc
Author: Daniel Leidert (dale) <daniel.leidert at wgdd.de>
Date: Sun Oct 26 15:14:39 2008 +0100
Import Debian version 0.12
---
debhelper/dh_installxmlcatalogs | 17 +++--------------
debian/changelog | 27 ++++++++++++++++++++++++++-
debian/compat | 2 +-
debian/control | 11 ++++++-----
debian/lintian-overrides/xml-core | 5 +++++
debian/rules | 9 ++++++---
debian/xml-core.install | 1 +
tools/update-xmlcatalog | 32 +++++++++++++++-----------------
8 files changed, 63 insertions(+), 41 deletions(-)
diff --git a/debhelper/dh_installxmlcatalogs b/debhelper/dh_installxmlcatalogs
index 4d08dcf..9d16502 100755
--- a/debhelper/dh_installxmlcatalogs
+++ b/debhelper/dh_installxmlcatalogs
@@ -93,24 +93,13 @@ multiple instances of the same text to be added to maintainer scripts.
L<debhelper(7)>
-=over 0
-
-=item
F</usr/share/doc/xml-core/>
-=back
-
=head1 AUTHOR
-=over 0
+B<Ardo van Rangelrooij> E<lt>ardo at debian.orgE<gt>
-=item
-Ardo van Rangelrooij <ardo at debian.org>
-
-=item
-Adam Di Carlo <aph at debian.org>
-
-=back
+B<Adam Di Carlo> E<lt>aph at debian.orgE<gt>
=cut
@@ -121,7 +110,7 @@ use strict;
use Debian::Debhelper::Dh_Lib;
## ----------------------------------------------------------------------
-my $xmlcorever = "0.05";
+my $xmlcorever = "0.12";
## ----------------------------------------------------------------------
my $debug_update_xmlcatalog = 0;
diff --git a/debian/changelog b/debian/changelog
index b7dccac..8e593b5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,33 @@
+xml-core (0.12) unstable; urgency=low
+
+ * debhelper/dh_installxmlcatalogs: Fixed pod2man errors.
+ (xmlcorever): Increased to 0.12 (#482140).
+ * tools/update-xmlcatalog: Use File::Spec instead of File::Spec::Functions
+ for catfile (#482140). Thanks to Agustin Martin Domingo. Fixed pod2man
+ errors.
+ (add_entry): Be more verbose in case an entity is already registered.
+
+ * Fixed Kurt Roeckx name in the 0.11 changelog entry. Sorry Kurt.
+ * debian/compat: Raised to v5.
+ * debian/control: Vcs fields transition. Added DM-Upload-Allowed.
+ (Vcs-Svn): Fixed location.
+ (Build-Depends): Raised debhelper to v5.
+ (Standards-Version): Raised to 3.7.3.
+ (Description): Fixed reference to directories in /usr/local.
+ * debian/lintian-overrides/xml-core: Added. The empty directories are
+ shipped by intention.
+ * debian/rules (clean): Remove the created manual pages.
+ (binary-indep): Added call to dh_install. Only depend on perl-base
+ (#482140).
+ * debian/xml-core.install: Added to install lintian override.
+
+ -- Daniel Leidert (dale) <daniel.leidert at wgdd.de> Sun, 26 Oct 2008 15:14:39 +0100
+
xml-core (0.11) unstable; urgency=low
[ Daniel Leidert ]
* debian/xml-core.postrm: Only try to remove /var/lib/xml-core, if it
- exists (closes: #358364). Thanks to Kurt Roecks, who catched this issue.
+ exists (closes: #358364). Thanks to Kurt Roeckx, who catched this issue.
-- Daniel Leidert (dale) <daniel.leidert at wgdd.de> Mon, 16 Apr 2007 19:17:50 +0200
diff --git a/debian/compat b/debian/compat
index b8626c4..7ed6ff8 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-4
+5
diff --git a/debian/control b/debian/control
index 039f9c8..cb00ca8 100644
--- a/debian/control
+++ b/debian/control
@@ -3,11 +3,12 @@ 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>
-Build-Depends: debhelper (>= 4.1.75)
+Build-Depends: debhelper (>= 5)
Build-Depends-Indep: perl
-Standards-Version: 3.7.2
-XS-Vcs-Browser: http://svn.debian.org/wsvn/debian-xml-sgml/packages/xml-core/trunk/
-XS-Vcs-Svn: svn://svn.debian.org/svn/debian-xml-sgml/packages/xml-core/
+Standards-Version: 3.7.3
+Vcs-Browser: http://svn.debian.org/wsvn/debian-xml-sgml/packages/xml-core/trunk/
+Vcs-Svn: svn://svn.debian.org/svn/debian-xml-sgml/packages/xml-core/trunk/
+DM-Upload-Allowed: yes
Package: xml-core
Section: text
@@ -23,7 +24,7 @@ Description: XML infrastructure and XML catalog file support
* infrastructure directories:
- /etc/xml
- /usr/share/xml/{declaration,entities,misc,schema}
- - /usr/share/local/xml/{declaration,entities,misc,schema}
+ - /usr/local/share/xml/{declaration,entities,misc,schema}
.
* XML catalog schema: OASIS XML Catalog Committee Specification 1.0
.
diff --git a/debian/lintian-overrides/xml-core b/debian/lintian-overrides/xml-core
new file mode 100644
index 0000000..6fdc6f3
--- /dev/null
+++ b/debian/lintian-overrides/xml-core
@@ -0,0 +1,5 @@
+## The xml-core package creates/provides the core XML infrastructure,
+## including these empty directories.
+xml-core binary: package-contains-empty-directory usr/share/xml/misc/
+xml-core binary: package-contains-empty-directory usr/share/xml/entities/
+xml-core binary: package-contains-empty-directory usr/share/xml/declaration/
diff --git a/debian/rules b/debian/rules
index 648d74c..a53a851 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,8 +16,10 @@ PACKAGE = xml-core
clean:
dh_testdir
dh_testroot
- dh_clean
- rm -f build-stamp install-stamp
+ rm -f tools/update-xmlcatalog.8 debhelper/dh_installxmlcatalogs.1
+ dh_clean tools/update-xmlcatalog.8 \
+ debhelper/dh_installxmlcatalogs.1 \
+ build-stamp install-stamp
build: build-stamp
build-stamp:
@@ -40,6 +42,7 @@ binary-indep: build install
dh_installdocs
dh_installexamples
dh_installchangelogs
+ dh_install
DH_AUTOSCRIPTDIR=debhelper debhelper/dh_installxmlcatalogs
dh_installcatalogs
dh_link
@@ -47,7 +50,7 @@ binary-indep: build install
dh_compress
dh_fixperms
dh_installdeb
- dh_perl
+ dh_perl -d
dh_gencontrol
dh_md5sums
dh_builddeb
diff --git a/debian/xml-core.install b/debian/xml-core.install
new file mode 100644
index 0000000..3d5fc85
--- /dev/null
+++ b/debian/xml-core.install
@@ -0,0 +1 @@
+debian/lintian-overrides/xml-core usr/share/lintian/overrides/
diff --git a/tools/update-xmlcatalog b/tools/update-xmlcatalog
index aa4a71c..293cea0 100755
--- a/tools/update-xmlcatalog
+++ b/tools/update-xmlcatalog
@@ -108,12 +108,7 @@ F</usr/share/doc/xml-core/README.Debian>
=head1 AUTHOR
-=over 0
-
-=item
-Ardo van Rangelrooij <ardo at debian.org>
-
-=back
+B<Ardo van Rangelrooij> E<lt>ardo at debian.orgE<gt>
=cut
@@ -121,7 +116,7 @@ Ardo van Rangelrooij <ardo at debian.org>
use strict;
## ----------------------------------------------------------------------
-use File::Spec::Functions;
+use File::Spec;
use Getopt::Long;
## ----------------------------------------------------------------------
@@ -196,7 +191,7 @@ if ( defined( $add ) )
{
if ( defined( $package ) )
{
- my $catalog = catfile( $catalog_dir, "$package.xml" );
+ my $catalog = File::Spec->catfile( $catalog_dir, "$package.xml" );
if ( ! -f $catalog )
{
print STDERR "$name: error: package catalog $catalog not found\n";
@@ -261,7 +256,7 @@ elsif ( defined( $del ) )
{
if ( defined( $root ) )
{
- my $catalog = catfile( $catalog_dir, 'catalog' );
+ my $catalog = File::Spec->catfile( $catalog_dir, 'catalog' );
if ( ! -f $catalog )
{
print STDERR "$name: error: root catalog $catalog not found\n";
@@ -275,7 +270,7 @@ elsif ( defined( $del ) )
}
elsif ( defined( $package ) )
{
- my $catalog = catfile( $catalog_dir, "$package.xml" );
+ my $catalog = File::Spec->catfile( $catalog_dir, "$package.xml" );
if ( ! -f $catalog )
{
print STDERR "$name: error: package catalog $catalog not found\n";
@@ -333,8 +328,8 @@ if ( ! defined( $id ) )
if ( defined( $root ) )
{
$catalog = 'catalog';
- $catalog_data = catfile( $catalog_data_dir, $catalog );
- $catalog = catfile( $catalog_dir, $catalog );
+ $catalog_data = File::Spec->catfile( $catalog_data_dir, $catalog );
+ $catalog = File::Spec->catfile( $catalog_dir, $catalog );
my $start = $type;
$start .= 'Id' unless $type eq 'uri';
$start .= 'StartString';
@@ -347,8 +342,8 @@ if ( defined( $root ) )
}
elsif ( defined( $package ) )
{
- $catalog_data = catfile( $catalog_data_dir, $package );
- $catalog = catfile( $catalog_dir, "$package.xml" );
+ $catalog_data = File::Spec->catfile( $catalog_data_dir, $package );
+ $catalog = File::Spec->catfile( $catalog_dir, "$package.xml" );
my $start = $type;
$start .= 'Id' unless $type eq 'uri';
$start .= 'StartString';
@@ -364,7 +359,7 @@ elsif ( defined( $local ) )
$catalog = $local;
$catalog_data = $local;
$catalog_data =~ tr|/|_|;
- $catalog_data = catfile( $catalog_data_dir, $catalog_data );
+ $catalog_data = File::Spec->catfile( $catalog_data_dir, $catalog_data );
my $start = ( $type eq 'uri' ) ? 'name' : $type;
$start .= 'Id' unless $type eq 'uri';
$id = "$start=\"$id\"";
@@ -415,7 +410,10 @@ sub add_entry
{
if ( $catalog{ $key } ne $entry )
{
- print STDERR "$name: error: entity already registered\n";
+ print STDERR "$name: error: entity already registered with a different value\n";
+ print STDERR " Entity : [$key]\n";
+ print STDERR " Old value: [$catalog{$key}]\n";
+ print STDERR " New value: [$entry]\n";
return;
}
else
@@ -427,7 +425,7 @@ sub add_entry
}
else
{
- print "$name: adding entity to catalog data $catalog_data\n"
+ print "$name: adding entity to catalog data $catalog_data with the same value\n"
if $verbose;
$catalog{ $key } = $entry;
return 1;
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-xml-sgml/xml-core.git
More information about the debian-xml-sgml-commit
mailing list