[xml/sgml-commit] [xml-core] 02/07: Import Debian version 0.10
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 a23ec3d462d8ac0cb4307e535e03ea40683f99a4
Author: Daniel Leidert (dale) <daniel.leidert at wgdd.de>
Date: Sat Apr 14 21:51:53 2007 +0200
Import Debian version 0.10
---
debhelper/dh_installxmlcatalogs | 7 ++++++-
debian/TODO | 1 -
debian/changelog | 41 +++++++++++++++++++++++++++++++++++++++++
debian/control | 11 +++++++----
debian/copyright | 38 ++++++++++++++++++++++----------------
debian/rules | 5 ++---
debian/xml-core.dirs | 2 ++
debian/xml-core.install | 1 -
debian/xml-core.postinst | 15 ---------------
debian/xml-core.postrm | 12 +++---------
debian/xml-core.preinst | 24 +-----------------------
debian/xml-core.prerm | 15 ---------------
tools/update-xmlcatalog | 27 ++++++++-------------------
13 files changed, 92 insertions(+), 107 deletions(-)
diff --git a/debhelper/dh_installxmlcatalogs b/debhelper/dh_installxmlcatalogs
index ca28d97..4d08dcf 100755
--- a/debhelper/dh_installxmlcatalogs
+++ b/debhelper/dh_installxmlcatalogs
@@ -70,7 +70,7 @@ for the registration and unregistration of the listed XML entities in
the XML catalog system (unless B<-n> is used). A dependency on the
B<xml-core> package will be added to C<${misc:Depends}>, so be sure to
use that variable in the file F<debian/control>. See
-L<dh_installdeb(1)> for an explantion of Debhelper maintainer script
+L<dh_installdeb(1)> for an explanation of Debhelper maintainer script
snippets.
=head1 OPTIONS
@@ -288,6 +288,11 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
addsubstvar( $package,
"misc:Depends", "xml-core", ">= $xmlcorever" );
+ # Make sure /etc/xml exists (see http://bugs.debian.org/411770).
+ if (! -d "$tmpdir/etc/xml") {
+ doit("install","-d","-m755","$tmpdir/etc/xml");
+ }
+
}
}
}
diff --git a/debian/TODO b/debian/TODO
index 02b5ffa..e2c2695 100644
--- a/debian/TODO
+++ b/debian/TODO
@@ -18,7 +18,6 @@ VARIOUS:
------------------------------------------------------------------------------
Description
------------------------------------------------------------------------------
-* public CVS repository (Alioth?)
* support regenerate CLI to regenerate the root XML catalog files and
package XML catalog files
* install and register all versions of the XML catalog schema
diff --git a/debian/changelog b/debian/changelog
index ab513fc..0b6d956 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,44 @@
+xml-core (0.10) unstable; urgency=low
+
+ [ Daniel Leidert ]
+ * debian/control: Added XS-Vcs-Browser and XS-Vcs-Svn fields.
+ (Uploaders): Added myself.
+ (Build-Depends-Indep): Moved debhelper to Build-Depends, where it belongs.
+ (Standards-Version): Bump to standards version 3.7.2.
+ (Depends): Added versioned dependency to Sarges sed (closes: #248910). I
+ think, this should clear the situation and we are already near to Sarge =
+ oldstable).
+ * debian/copyright: Updated FSF address and package information.
+ * debian/rules (install-stamp, binary-indep): Directly install the files
+ into the package directory.
+ * debian/xml-core.dirs: Added. We better include the directories in the
+ package.
+ * debian/xml-core.install: Removed. Obsoleted by the change in debian/rules.
+ * debian/xml-core.postinst: Removed empty debhelper script.
+ * debian/xml-core.prerm: Likewise.
+ * debian/xml-core.preinst: The /etc/xml and /var/lib/xml-core directories
+ are shipped with the package. No need to generate them in the debhelper
+ script.
+ * debhelper/dh_installxmlcatalogs: Fixed typo in dh_installxmlcatalogs
+ manpage (closes: #306719). Thanks to A Costa for the report.
+ * debhelper/dh_installxmlcatalogs: Added a small code snippet to add the
+ /etc/xml directory to avoid failing installations, if /etc/xml is missing
+ (closes: #411770). Thanks to Dmitry Rutsky for the report. The patch is
+ based on the the solution used by dh_installcatalogs.
+ * tools/update-xmlcatalog: Removed dead code in the type-value evaluation
+ (closes: #315759).
+
+ -- Daniel Leidert (dale) <daniel.leidert at wgdd.de> Sat, 14 Apr 2007 21:51:53 +0200
+
+xml-core (0.09-0.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * debian/xml-core.postrm, debian/xml-core.preinst: Use absolute path
+ names for files instead of doing a "cd /foo; mv plim plom; cd -" dance
+ (especially since the dance if fragile, too). Closes: #358364.
+
+ -- Lars Wirzenius <liw at iki.fi> Thu, 13 Apr 2006 20:25:34 +0000
+
xml-core (0.09) unstable; urgency=low
* schemas/catalog: added official FPI for XML catalog DTD
diff --git a/debian/control b/debian/control
index 005657a..039f9c8 100644
--- a/debian/control
+++ b/debian/control
@@ -2,15 +2,18 @@ Source: xml-core
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>
-Standards-Version: 3.6.1
-Build-Depends-Indep: perl, debhelper (>= 4.1.75)
+Uploaders: Ardo van Rangelrooij <ardo at debian.org>, Daniel Leidert (dale) <daniel.leidert at wgdd.de>
+Build-Depends: debhelper (>= 4.1.75)
+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/
Package: xml-core
Section: text
Priority: optional
Architecture: all
-Depends: ${perl:Depends}, sgml-base (>= 1.17)
+Depends: ${perl:Depends}, sgml-base (>= 1.17), sed (>= 4.1.2-8)
Suggests: debhelper (>= 4.1.75)
Description: XML infrastructure and XML catalog file support
This package creates the XML infrastructure directories and provides
diff --git a/debian/copyright b/debian/copyright
index bf14d00..bc50159 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,26 +1,32 @@
This is the Debian package of xml-core. It is assembled and maintained
-by Ardo van Rangelrooij <ardo at debian.org>.
+by Ardo van Rangelrooij <ardo at debian.org> and the Debian XML/SGML group.
-Authors: Ardo van Rangelrooij <ardo at debian.org>
+Author:
-Copyright:
+ Ardo van Rangelrooij <ardo at debian.org>
+ Daniel Leidert <daniel.leidert at wgdd.de>
-Copyright (c) 2003 Ardo van Rangelrooij
+Copyright:
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
+ Copyright (c) 2003,2004 Ardo van Rangelrooij
+ Copyright (c) 2004 Adam Di Carlo
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
+License and warranty:
-You should have received a copy of the GNU General Public License with
-the Debian GNU/Linux distribution in file /usr/share/common-licenses/GPL;
-if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-Suite 330, Boston, MA 02111-1307 USA
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License with
+ the Debian GNU/Linux distribution in file /usr/share/common-licenses/GPL;
+ if not, write to the Free Software Foundation, Inc., 51 Franklin Street,
+ Fifth Floor, Boston, MA 02110-1301, USA.
On a Debian system a copy of the GNU General Public Licence can be
found in the file '/usr/share/common-licenses/GPL'.
diff --git a/debian/rules b/debian/rules
index ec73592..648d74c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,7 +8,7 @@
#export DH_VERBOSE=1
## ----------------------------------------------------------------------
-TMP_DIR = debian/tmp
+PACKAGE = xml-core
## ----------------------------------------------------------------------
## targets
@@ -31,13 +31,12 @@ install-stamp: build
dh_testroot
dh_clean -k
dh_installdirs
- $(MAKE) install prefix=$(CURDIR)/$(TMP_DIR)/usr
+ $(MAKE) install prefix=$(CURDIR)/debian/$(PACKAGE)/usr
touch install-stamp
binary-indep: build install
dh_testdir
dh_testroot
- dh_install --sourcedir=$(TMP_DIR)
dh_installdocs
dh_installexamples
dh_installchangelogs
diff --git a/debian/xml-core.dirs b/debian/xml-core.dirs
new file mode 100644
index 0000000..3ed5276
--- /dev/null
+++ b/debian/xml-core.dirs
@@ -0,0 +1,2 @@
+etc/xml
+var/lib/xml-core
diff --git a/debian/xml-core.install b/debian/xml-core.install
deleted file mode 100644
index 73752c9..0000000
--- a/debian/xml-core.install
+++ /dev/null
@@ -1 +0,0 @@
-usr
diff --git a/debian/xml-core.postinst b/debian/xml-core.postinst
deleted file mode 100644
index 27c4c16..0000000
--- a/debian/xml-core.postinst
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-## ----------------------------------------------------------------------
-## debian/postinst : postinstallation script for xml-core
-## ----------------------------------------------------------------------
-
-## ----------------------------------------------------------------------
-set -e
-
-## ----------------------------------------------------------------------
-## automatically generated debhelper commands
-#DEBHELPER#
-
-exit 0
-
-## ----------------------------------------------------------------------
diff --git a/debian/xml-core.postrm b/debian/xml-core.postrm
index 61c6c90..351f26e 100644
--- a/debian/xml-core.postrm
+++ b/debian/xml-core.postrm
@@ -16,9 +16,7 @@ then
## ------------------------------------------------------------------
## remove /var/lib/xml-core
- cd /var/lib
- rmdir --ignore-fail-on-non-empty xml-core
- cd - >/dev/null
+ rmdir --ignore-fail-on-non-empty /var/lib/xml-core
## ------------------------------------------------------------------
## remove root XML catalog
@@ -27,17 +25,13 @@ then
## ------------------------------------------------------------------
## remove /etc/xml
- cd /etc
- rmdir --ignore-fail-on-non-empty xml
- cd - >/dev/null
+ rmdir --ignore-fail-on-non-empty /etc/xml
## ------------------------------------------------------------------
## restore legacy /etc/xml/catalog
if [ -f /etc/xml/catalog.legacy ]
then
- cd /etc/xml
- mv catalog.legacy catalog
- cd - >/dev/null
+ mv /etc/xml/catalog.legacy /etc/xml/catalog
fi
fi
diff --git a/debian/xml-core.preinst b/debian/xml-core.preinst
index 28a2c8d..b670cb4 100644
--- a/debian/xml-core.preinst
+++ b/debian/xml-core.preinst
@@ -7,26 +7,6 @@
set -e
## ----------------------------------------------------------------------
-if [ "$1" = "install" -o "$1" = "upgrade" ]
-then
-
- ## ------------------------------------------------------------------
- ## create /var/lib/xml-core
- if [ ! -d /var/lib/xml-core ]
- then
- mkdir /var/lib/xml-core 2>/dev/null
- fi
-
- ## ------------------------------------------------------------------
- ## create /etc/xml
- if [ ! -d /etc/xml ]
- then
- mkdir /etc/xml 2>/dev/null
- fi
-
-fi
-
-## ----------------------------------------------------------------------
if [ "$1" = "install" ]
then
@@ -34,9 +14,7 @@ then
## preserve legacy /etc/xml/catalog
if [ -f /etc/xml/catalog ]
then
- cd /etc/xml
- mv catalog catalog.legacy
- cd - >/dev/null
+ mv /etc/xml/catalog /etc/xml/catalog.legacy
fi
fi
diff --git a/debian/xml-core.prerm b/debian/xml-core.prerm
deleted file mode 100644
index 62fd97b..0000000
--- a/debian/xml-core.prerm
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-## ----------------------------------------------------------------------
-## debian/prerm : preremoval script for xml-core
-## ----------------------------------------------------------------------
-
-## ----------------------------------------------------------------------
-set -e
-
-## ----------------------------------------------------------------------
-## automatically generated debhelper commands
-#DEBHELPER#
-
-exit 0
-
-## ----------------------------------------------------------------------
diff --git a/tools/update-xmlcatalog b/tools/update-xmlcatalog
index 5b68e5f..aa4a71c 100755
--- a/tools/update-xmlcatalog
+++ b/tools/update-xmlcatalog
@@ -56,19 +56,19 @@ Deletes the entry from the root XML catalog file, the package XML
catalog file or the local XML catalog file. A resulting empty XML
catalog is not automatically deleted from the filesystem.
-=item B<--file>
+=item B<--file> I<file>
Indicates a local filename.
-=item B<--id>
+=item B<--id> I<id>
Indicates the XML catalog file entry identifier.
-=item B<--local>
+=item B<--local> I<local>
Indicates a local XML catalog file.
-=item B<--package>
+=item B<--package> I<package>
Indicates a package XML catalog file.
@@ -76,7 +76,7 @@ Indicates a package XML catalog file.
Indicates the root XML catalog file.
-=item B<--type>
+=item B<--type> I<type>
Indicates the XML catalog file entry type (public, system, uri).
@@ -310,21 +310,10 @@ elsif ( defined( $del ) )
## ----------------------------------------------------------------------
if ( defined( $type ) )
{
- if ( defined( $package ) && defined( $file ) )
+ if ( $type !~ /^(public|system|uri)$/ )
{
- if ( $type !~ /^(system|uri)$/ )
- {
- print STDERR "$name: error: wrong type\n";
- exit 1;
- }
- }
- else
- {
- if ( $type !~ /^(public|system|uri)$/ )
- {
- print STDERR "$name: error: wrong type\n";
- exit 1;
- }
+ print STDERR "$name: error: wrong type\n";
+ exit 1;
}
}
else
--
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