[xml/sgml-commit] r1160 - in /packages/sgml-base/branches/experimental: catalogs/ debian/ examples/ tools/
dleidert-guest at users.alioth.debian.org
dleidert-guest at users.alioth.debian.org
Tue Sep 2 18:36:27 UTC 2008
Author: dleidert-guest
Date: Tue Sep 2 18:36:27 2008
New Revision: 1160
URL: http://svn.debian.org/wsvn/debian-xml-sgml/?sc=1&rev=1160
Log:
* tools/catalog.centralized: Fixed comment to point to update-sgmlcatalog.
* tools/catalog.super: Likewise.
* tools/transitional.cat: Likewise.
* tools/install-sgmlcatalog: Use POD to document the script.
* tools/update-catalog: Documented with POD. Renamed to
tools/update-sgmlcatalog (closes: #88008). Further changes:
- Enable Perl warnings.
- If called as update-catalog (compatibility), print a warning.
- Do not exit with an error using --help/--version (closes: #391609).
- Fixed --version to print the version and not the help.
* tools/install-sgmlcatalog.8: Removed. Manual pages are now created during
build process from the POD documentation.
* tools/update-catalog.8: Ditto.
* debian/control (Build-Depends): Added perl for pod2man.
* debian/sgml-base.links: Added compatibility links to provide
update-catalog for the moment to not break existing systems.
* debian/sgml-base.postinst: update-catalog -> update-sgmlcatalog change.
* debian/sgml-base.prerm: Ditto.
* examples/postinst: Ditto.
* examples/prerm: Ditto.
Added:
packages/sgml-base/branches/experimental/debian/sgml-base.links
packages/sgml-base/branches/experimental/tools/update-sgmlcatalog (contents, props changed)
- copied, changed from r1152, packages/sgml-base/branches/experimental/tools/update-catalog
Removed:
packages/sgml-base/branches/experimental/tools/install-sgmlcatalog.8
packages/sgml-base/branches/experimental/tools/update-catalog
packages/sgml-base/branches/experimental/tools/update-catalog.8
Modified:
packages/sgml-base/branches/experimental/catalogs/catalog.centralized
packages/sgml-base/branches/experimental/catalogs/catalog.super
packages/sgml-base/branches/experimental/debian/changelog
packages/sgml-base/branches/experimental/debian/control
packages/sgml-base/branches/experimental/debian/rules
packages/sgml-base/branches/experimental/debian/sgml-base.install
packages/sgml-base/branches/experimental/debian/sgml-base.postinst
packages/sgml-base/branches/experimental/debian/sgml-base.prerm
packages/sgml-base/branches/experimental/examples/postinst
packages/sgml-base/branches/experimental/examples/prerm
packages/sgml-base/branches/experimental/tools/install-sgmlcatalog
Modified: packages/sgml-base/branches/experimental/catalogs/catalog.centralized
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/sgml-base/branches/experimental/catalogs/catalog.centralized?rev=1160&op=diff
==============================================================================
--- packages/sgml-base/branches/experimental/catalogs/catalog.centralized (original)
+++ packages/sgml-base/branches/experimental/catalogs/catalog.centralized Tue Sep 2 18:36:27 2008
@@ -2,6 +2,6 @@
## ======================================================================
## CATALOG : SGML Open Style centralized catalog
## ======================================================================
-## Please use update-catalog(8) to modify this file.
+## Please use update-sgmlcatalog(8) to modify this file.
## ======================================================================
--
Modified: packages/sgml-base/branches/experimental/catalogs/catalog.super
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/sgml-base/branches/experimental/catalogs/catalog.super?rev=1160&op=diff
==============================================================================
--- packages/sgml-base/branches/experimental/catalogs/catalog.super (original)
+++ packages/sgml-base/branches/experimental/catalogs/catalog.super Tue Sep 2 18:36:27 2008
@@ -2,6 +2,6 @@
## ======================================================================
## /etc/sgml/catalog : SGML Open Style super catalog
## ======================================================================
-## Please use update-catalog(8) to modify this file.
+## Please use update-sgmlcatalog(8) to modify this file.
## ======================================================================
--
Modified: packages/sgml-base/branches/experimental/debian/changelog
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/sgml-base/branches/experimental/debian/changelog?rev=1160&op=diff
==============================================================================
--- packages/sgml-base/branches/experimental/debian/changelog (original)
+++ packages/sgml-base/branches/experimental/debian/changelog Tue Sep 2 18:36:27 2008
@@ -3,24 +3,42 @@
* Makefile: Dropped build system. debian/rules and debhelper are enough.
* MAKE/include: Ditto.
* tools/Makefile: Ditto.
- * tools/catalog.centralized: Moved to catalogs/.
+ * tools/catalog.centralized: Moved to catalogs/. Fixed comment to point to
+ update-sgmlcatalog.
* tools/catalog.super: Likewise.
* tools/transitional.cat: Likewise.
+ * tools/install-sgmlcatalog: Use POD to document the script.
+ * tools/update-catalog: Documented with POD. Renamed to
+ tools/update-sgmlcatalog (closes: #88008). Further changes:
+ - Enable Perl warnings.
+ - If called as update-catalog (compatibility), print a warning.
+ - Do not exit with an error using --help/--version (closes: #391609).
+ - Fixed --version to print the version and not the help.
+ * tools/install-sgmlcatalog.8: Removed. Manual pages are now created during
+ build process from the POD documentation.
+ * tools/update-catalog.8: Ditto.
* debian/compat: Increased debhelper compatibility level to 6.
* debian/control: Added Vcs-Browser, Vcs-Svn and DM-Upload-Allowed fields.
(Uploaders): Added myself.
(Build-Depends-Indep): Moved debhelper to Build-Depends and increased
dependency to have dh_lintian available.
+ (Build-Depends): Added perl for pod2man.
(Standards-Version): Bumped to 3.8.0.
* debian/copyright: Updated a bit.
* debian/rules: Rewritten in parts. Added target for manual pages.
* debian/sgml-base.dirs: Added to create necessary directories.
* debian/sgml-base.install: Everything is installed from here.
+ * debian/sgml-base.links: Added compatibility links to provide
+ update-catalog for the moment to not break existing systems.
* debian/sgml-base.lintian-overrides: Added to override for intentional
package-contains-empty-directory warning.
* debian/sgml-base.preinst: Dropped. Directories are created by
dh_installdirs.
+ * debian/sgml-base.postinst: update-catalog -> update-sgmlcatalog change.
+ * debian/sgml-base.prerm: Ditto.
+ * examples/postinst: Ditto.
+ * examples/prerm: Ditto.
-- Daniel Leidert (dale) <daniel.leidert at wgdd.de> Tue, 02 Sep 2008 14:23:41 +0200
Modified: packages/sgml-base/branches/experimental/debian/control
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/sgml-base/branches/experimental/debian/control?rev=1160&op=diff
==============================================================================
--- packages/sgml-base/branches/experimental/debian/control (original)
+++ packages/sgml-base/branches/experimental/debian/control Tue Sep 2 18:36:27 2008
@@ -6,6 +6,7 @@
Daniel Leidert (dale) <daniel.leidert at wgdd.de>
Standards-Version: 3.8.0
Build-Depends: debhelper (>= 6.0.7)
+Build-Depends-Indep: perl
Vcs-Browser: http://svn.debian.org/wsvn/debian-xml-sgml/packages/sgml-base/trunk/
Vcs-Svn: svn://svn.debian.org/svn/debian-xml-sgml/packages/sgml-base/trunk/
DM-Upload-Allowed: yes
@@ -25,5 +26,5 @@
- /usr/share/sgml/{declaration,dtd,entities,misc,stylesheet}
- /usr/share/local/sgml/{declaration,dtd,entities,misc,stylesheet}
.
- * update-catalog(8): tool for maintaining the root SGML catalog
+ * update-sgmlcatalog(8): tool for maintaining the root SGML catalog
file and the package SGML catalog files in the '/etc/sgml' directory
Modified: packages/sgml-base/branches/experimental/debian/rules
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/sgml-base/branches/experimental/debian/rules?rev=1160&op=diff
==============================================================================
--- packages/sgml-base/branches/experimental/debian/rules (original)
+++ packages/sgml-base/branches/experimental/debian/rules Tue Sep 2 18:36:27 2008
@@ -2,17 +2,18 @@
#export DH_VERBOSE=1
PACKAGE = sgml-base
-MANPAGES = tools/install-sgmlcatalog.8 tools/update-catalog.8
+MANPAGES = tools/install-sgmlcatalog.8 tools/update-sgmlcatalog.8
+VERSION = $(shell dpkg-parsechangelog | grep ^Version: | sed 's/^Version: *//')
%.8: %
- pod2man --section 8 --center $(PACKAGE) ${<} ${@}
+ pod2man --section 8 -c "Debian SGML system tools" -r "$(PACKAGE) $(VERSION)" ${<} ${@}
clean:
dh_testdir
dh_testroot
- dh_clean build-stamp
+ dh_clean build-stamp $(MANPAGES)
build: build-stamp
build-stamp: $(MANPAGES)
@@ -35,6 +36,7 @@
dh_installdocs
dh_installexamples
dh_installman $(MANPAGES)
+ dh_link
dh_usrlocal
dh_lintian
dh_compress
Modified: packages/sgml-base/branches/experimental/debian/sgml-base.install
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/sgml-base/branches/experimental/debian/sgml-base.install?rev=1160&op=diff
==============================================================================
--- packages/sgml-base/branches/experimental/debian/sgml-base.install (original)
+++ packages/sgml-base/branches/experimental/debian/sgml-base.install Tue Sep 2 18:36:27 2008
@@ -1,5 +1,5 @@
tools/install-sgmlcatalog usr/sbin
-tools/update-catalog usr/sbin
+tools/update-sgmlcatalog usr/sbin
catalogs/catalog.centralized usr/share/sgml-base
catalogs/catalog.super usr/share/sgml-base
Added: packages/sgml-base/branches/experimental/debian/sgml-base.links
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/sgml-base/branches/experimental/debian/sgml-base.links?rev=1160&op=file
==============================================================================
--- packages/sgml-base/branches/experimental/debian/sgml-base.links (added)
+++ packages/sgml-base/branches/experimental/debian/sgml-base.links Tue Sep 2 18:36:27 2008
@@ -1,0 +1,2 @@
+usr/sbin/update-sgmlcatalog usr/sbin/update-catalog
+usr/share/man/man8/update-sgmlcatalog.8.gz usr/share/man/man8/update-catalog.8.gz
Modified: packages/sgml-base/branches/experimental/debian/sgml-base.postinst
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/sgml-base/branches/experimental/debian/sgml-base.postinst?rev=1160&op=diff
==============================================================================
--- packages/sgml-base/branches/experimental/debian/sgml-base.postinst (original)
+++ packages/sgml-base/branches/experimental/debian/sgml-base.postinst Tue Sep 2 18:36:27 2008
@@ -22,7 +22,7 @@
## --------------------------------------------------------------
## remove nasty old circular catalog
- update-catalog --remove --super /usr/lib/sgml/catalog || true
+ update-sgmlcatalog --remove --super /usr/lib/sgml/catalog || true
## --------------------------------------------------------------
## remove symlink to /etc/sgml/catalog
@@ -33,7 +33,7 @@
TRANSCAT=transitional.cat
if [ -f /usr/lib/sgml/${TRANSCAT} ]
then
- update-catalog --remove --super /usr/lib/sgml/${TRANSCAT} || true
+ update-sgmlcatalog --remove --super /usr/lib/sgml/${TRANSCAT} || true
mv -f /usr/lib/sgml/${TRANSCAT} /etc/sgml/${TRANSCAT}
if [ -f /usr/lib/sgml/${TRANSCAT}.old ]
then
@@ -74,7 +74,7 @@
TRANSCAT=/etc/sgml/transitional.cat
if [ -f ${TRANSCAT} ]
then
- update-catalog --add --super ${TRANSCAT}
+ update-sgmlcatalog --add --super ${TRANSCAT}
fi
fi
Modified: packages/sgml-base/branches/experimental/debian/sgml-base.prerm
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/sgml-base/branches/experimental/debian/sgml-base.prerm?rev=1160&op=diff
==============================================================================
--- packages/sgml-base/branches/experimental/debian/sgml-base.prerm (original)
+++ packages/sgml-base/branches/experimental/debian/sgml-base.prerm Tue Sep 2 18:36:27 2008
@@ -14,7 +14,7 @@
TRANSCAT=/etc/sgml/transitional.cat
if [ -f ${TRANSCAT} ]
then
- update-catalog --remove --super ${TRANSCAT} || true
+ update-sgmlcatalog --remove --super ${TRANSCAT} || true
rm -f ${TRANSCAT} ${TRANSCAT}.old
fi
Modified: packages/sgml-base/branches/experimental/examples/postinst
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/sgml-base/branches/experimental/examples/postinst?rev=1160&op=diff
==============================================================================
--- packages/sgml-base/branches/experimental/examples/postinst (original)
+++ packages/sgml-base/branches/experimental/examples/postinst Tue Sep 2 18:36:27 2008
@@ -17,9 +17,9 @@
install-sgmlcatalog --quiet --remove ${PACKAGE} || true
for ordcat in ${ORDCATS}
do
- update-catalog --quiet --add ${CENTRALCAT} /usr/share/sgml/${ordcat}
+ update-sgmlcatalog --quiet --add ${CENTRALCAT} /usr/share/sgml/${ordcat}
done
- update-catalog --quiet --add --super ${CENTRALCAT}
+ update-sgmlcatalog --quiet --add --super ${CENTRALCAT}
fi
## ----------------------------------------------------------------------
Modified: packages/sgml-base/branches/experimental/examples/prerm
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/sgml-base/branches/experimental/examples/prerm?rev=1160&op=diff
==============================================================================
--- packages/sgml-base/branches/experimental/examples/prerm (original)
+++ packages/sgml-base/branches/experimental/examples/prerm Tue Sep 2 18:36:27 2008
@@ -13,7 +13,7 @@
CENTRALCAT="/etc/sgml/${PACKAGE}.cat"
if [ "$1" = "remove" ] || [ "$1" = "upgrade" ]
then
- update-catalog --quiet --remove --super ${CENTRALCAT}
+ update-sgmlcatalog --quiet --remove --super ${CENTRALCAT}
fi
## ----------------------------------------------------------------------
Modified: packages/sgml-base/branches/experimental/tools/install-sgmlcatalog
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/sgml-base/branches/experimental/tools/install-sgmlcatalog?rev=1160&op=diff
==============================================================================
--- packages/sgml-base/branches/experimental/tools/install-sgmlcatalog (original)
+++ packages/sgml-base/branches/experimental/tools/install-sgmlcatalog Tue Sep 2 18:36:27 2008
@@ -9,11 +9,54 @@
## or later for copying conditions. There is NO warranty.
## ----------------------------------------------------------------------
+=pod
+
+=head1 NAME
+
+install-sgmlcatalog - maintain transitional SGML catalog
+
+=cut
+
## ----------------------------------------------------------------------
use strict;
use warnings;
## ----------------------------------------------------------------------
+
+=pod
+
+=head1 SYNOPSIS
+
+B<install-sgmlcatalog> B<--remove> I<package>
+
+=head1 DESCRIPTION
+
+B<install-sgmlcatalog> removes entries from the transitional SGML catalog file
+F</etc/sgml/transitional.cat>.
+
+=head1 OPTIONS
+
+=over 8
+
+=item B<--remove> I<package>
+
+Indicates to remove the entry for the package I<package>.
+
+=back
+
+=head1 FILES
+
+=over 8
+
+=item F</etc/sgml/transitional.cat>
+
+Transitional SGML catalog file.
+
+=back
+
+=cut
+
+### ----------------------------------------------------------------------
use Getopt::Long qw( &GetOptions );
## ----------------------------------------------------------------------
@@ -155,3 +198,15 @@
} ## error
## ----------------------------------------------------------------------
+
+=pod
+
+=head1 AUTHOR
+
+B<Ardo van Rangelrooij> E<lt>ardo at debian.orgE<gt>
+
+B<Christian Schwarz> (original version)
+
+=cut
+
+## ----------------------------------------------------------------------
Copied: packages/sgml-base/branches/experimental/tools/update-sgmlcatalog (from r1152, packages/sgml-base/branches/experimental/tools/update-catalog)
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/sgml-base/branches/experimental/tools/update-sgmlcatalog?rev=1160&op=diff
==============================================================================
--- packages/sgml-base/branches/experimental/tools/update-catalog (original)
+++ packages/sgml-base/branches/experimental/tools/update-sgmlcatalog Tue Sep 2 18:36:27 2008
@@ -1,6 +1,6 @@
#!/usr/bin/perl
## ----------------------------------------------------------------------
-## Debian GNU/Linux update-catalog version 0.2
+## Debian GNU/Linux update-sgmlcatalog version 0.3
## ----------------------------------------------------------------------
## Copyright (c) 2001-2004 Ardo van Rangelrooij
##
@@ -8,8 +8,83 @@
## or later for copying conditions. There is NO warranty.
## ----------------------------------------------------------------------
+=pod
+
+=head1 NAME
+
+update-sgmlcatalog - create or update entry in SGML catalog file
+
+=cut
+
## ----------------------------------------------------------------------
use strict;
+use warnings;
+
+## ----------------------------------------------------------------------
+
+=pod
+
+=head1 SYNOPSIS
+
+B<update-sgmlcatalog> [B<options>] B<--add> B<--super> I<centralized_catalog>
+
+B<update-sgmlcatalog> [B<options>] B<--add> I<centralized_catalog> I<ordinary_catalog>
+
+B<update-sgmlcatalog> [B<options>] B<-remove> B<--super> I<centralized_catalog>
+
+B<update-sgmlcatalog> [B<options>] B<-remove> I<centralized_catalog> I<ordinary_catalog>
+
+=head1 DESCRIPTION
+
+B<update-sgmlcatalog> inserts, updates or removes entries in the SGML super catalog
+F</etc/sgml/catalog> and the SGML centralized catalogs located in F</etc/sgml>.
+
+=head1 OPTIONS
+
+=over 8
+
+=item B<--add>
+
+Adds an entry for the I<centralized_catalog> in the super catalog
+F</etc/sgml/catalog>, or an entry for the I<ordinary_catalog> in the
+I<centralized_catalog>.
+
+=item B<--remove>
+
+Removes the entry for the I<centralized_catalog> from the super catalog
+F</etc/sgml/catalog>, or the entry for the I<ordinary_catalog> from the
+I<centralized_catalog>.
+
+=item B<--quiet>
+
+Prevents the usual diagnostic output.
+
+=item B<--test>
+
+Prevents the update of the catalog and writes the resulting SGML catalog to
+standard output.
+
+=item B<--version>
+
+Displays the version information and exits.
+
+=item B<--help>
+
+Displays the usage information and exits.
+
+=back
+
+=head1 FILES
+
+=over 8
+
+=item F</etc/sgml/catalog>
+
+The system SGML super catalog.
+
+=back
+
+=cut
## ----------------------------------------------------------------------
$0 =~ m|[^/]+$|;
@@ -17,6 +92,18 @@
## ----------------------------------------------------------------------
use vars qw( $name );
$name = $&;
+
+## http://bugs.debian.org/88008
+if ( $name eq 'update-catalog')
+{
+ print STDERR <<END;
+
+WARNING: You are using the compatibility symlink `$name'.
+WARNING: This command will disappear in the future (see #88008).
+WARNING: The command is now named `update-sgmlcatalog'.
+
+END
+}
## ----------------------------------------------------------------------
use vars qw( $add );
@@ -59,12 +146,12 @@
elsif ( $_ eq '--help' )
{
&help;
- exit -1;
+ exit 0;
}
elsif ( $_ eq '--version' )
{
- &help;
- exit -1;
+ &version;
+ exit 0;
}
else
{
@@ -220,7 +307,7 @@
## ----------------------------------------------------------------------
sub help
{
- print STDERR <<END;
+ print <<END;
Usage:
$name <options> --add --super <centralized_catalog>
$name <options> --add <centralized_catalog> <ordinary_catalog>
@@ -239,7 +326,17 @@
## ----------------------------------------------------------------------
sub version
{
- print "Debian $name version 0.2\n";
-}
-
-## ----------------------------------------------------------------------
+ print "Debian $name version 0.3\n";
+}
+
+## ----------------------------------------------------------------------
+
+=pod
+
+=head1 AUTHOR
+
+B<Ardo van Rangelrooij> E<lt>ardo at debian.orgE<gt>
+
+=cut
+
+## ----------------------------------------------------------------------
Propchange: packages/sgml-base/branches/experimental/tools/update-sgmlcatalog
------------------------------------------------------------------------------
svn:executable =
Propchange: packages/sgml-base/branches/experimental/tools/update-sgmlcatalog
------------------------------------------------------------------------------
svn:mergeinfo =
More information about the debian-xml-sgml-commit
mailing list