[xml/sgml-commit] r1256 - in /packages/xml-core/trunk: debhelper/dh_installxmlcatalogs debian/changelog debian/rules debian/xml-core.install tools/update-xmlcatalog
dleidert-guest at users.alioth.debian.org
dleidert-guest at users.alioth.debian.org
Tue Oct 14 12:19:49 UTC 2008
Author: dleidert-guest
Date: Tue Oct 14 12:19:48 2008
New Revision: 1256
URL: http://svn.debian.org/wsvn/debian-xml-sgml/?sc=1&rev=1256
Log:
* debhelper/dh_installxmlcatalogs (xmlcorever): Increased to 0.12 ("fixed"
version, see #482140).
* tools/update-xmlcatalog: Use File::Spec instead of File::Spec::Functions
for catfile (see #482140). Thanks to Agustin Martin Domingo.
* debian/rules (clean): Remove the created manual pages.
(binary-indep): Added call to dh_install. Only depend on perl-base
(see #482140).
* debian/xml-core.install: Added to install lintian override.
Added:
packages/xml-core/trunk/debian/xml-core.install
Modified:
packages/xml-core/trunk/debhelper/dh_installxmlcatalogs
packages/xml-core/trunk/debian/changelog
packages/xml-core/trunk/debian/rules
packages/xml-core/trunk/tools/update-xmlcatalog
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=1256&op=diff
==============================================================================
--- packages/xml-core/trunk/debhelper/dh_installxmlcatalogs (original)
+++ packages/xml-core/trunk/debhelper/dh_installxmlcatalogs Tue Oct 14 12:19:48 2008
@@ -121,7 +121,7 @@
use Debian::Debhelper::Dh_Lib;
## ----------------------------------------------------------------------
-my $xmlcorever = "0.05";
+my $xmlcorever = "0.12";
## ----------------------------------------------------------------------
my $debug_update_xmlcatalog = 0;
Modified: packages/xml-core/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/xml-core/trunk/debian/changelog?rev=1256&op=diff
==============================================================================
--- packages/xml-core/trunk/debian/changelog (original)
+++ packages/xml-core/trunk/debian/changelog Tue Oct 14 12:19:48 2008
@@ -1,6 +1,11 @@
xml-core (0.12) UNRELEASED; urgency=low
* NOT RELEASED YET
+ * debhelper/dh_installxmlcatalogs (xmlcorever): Increased to 0.12 ("fixed"
+ version, see #482140).
+ * tools/update-xmlcatalog: Use File::Spec instead of File::Spec::Functions
+ for catfile (see #482140). Thanks to Agustin Martin Domingo.
+
* 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.
@@ -10,6 +15,10 @@
(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
+ (see #482140).
+ * debian/xml-core.install: Added to install lintian override.
-- Daniel Leidert (dale) <daniel.leidert at wgdd.de> Mon, 16 Apr 2007 20:36:43 +0200
Modified: packages/xml-core/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/xml-core/trunk/debian/rules?rev=1256&op=diff
==============================================================================
--- packages/xml-core/trunk/debian/rules (original)
+++ packages/xml-core/trunk/debian/rules Tue Oct 14 12:19:48 2008
@@ -16,8 +16,10 @@
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 @@
dh_installdocs
dh_installexamples
dh_installchangelogs
+ dh_install
DH_AUTOSCRIPTDIR=debhelper debhelper/dh_installxmlcatalogs
dh_installcatalogs
dh_link
@@ -47,7 +50,7 @@
dh_compress
dh_fixperms
dh_installdeb
- dh_perl
+ dh_perl -d
dh_gencontrol
dh_md5sums
dh_builddeb
Added: packages/xml-core/trunk/debian/xml-core.install
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/xml-core/trunk/debian/xml-core.install?rev=1256&op=file
==============================================================================
--- packages/xml-core/trunk/debian/xml-core.install (added)
+++ packages/xml-core/trunk/debian/xml-core.install Tue Oct 14 12:19:48 2008
@@ -1,0 +1,1 @@
+debian/lintian-overrides/xml-core usr/share/lintian/overrides/
Modified: packages/xml-core/trunk/tools/update-xmlcatalog
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/xml-core/trunk/tools/update-xmlcatalog?rev=1256&op=diff
==============================================================================
--- packages/xml-core/trunk/tools/update-xmlcatalog (original)
+++ packages/xml-core/trunk/tools/update-xmlcatalog Tue Oct 14 12:19:48 2008
@@ -121,7 +121,7 @@
use strict;
## ----------------------------------------------------------------------
-use File::Spec::Functions;
+use File::Spec;
use Getopt::Long;
## ----------------------------------------------------------------------
@@ -196,7 +196,7 @@
{
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 +261,7 @@
{
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 +275,7 @@
}
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 +333,8 @@
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 +347,8 @@
}
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 +364,7 @@
$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\"";
More information about the debian-xml-sgml-commit
mailing list