[xml/sgml-commit] r1155 - in /packages/sgml-base/branches/experimental: ./ MAKE/ catalogs/ debian/ tools/

dleidert-guest at users.alioth.debian.org dleidert-guest at users.alioth.debian.org
Tue Sep 2 13:21:49 UTC 2008 

Author: dleidert-guest
Date: Tue Sep  2 13:21:49 2008
New Revision: 1155

URL: http://svn.debian.org/wsvn/debian-xml-sgml/?sc=1&rev=1155
Log:
* Makefile: Dropped build system. debian/rules and debhelper are enough.
* MAKE/include: Ditto.
* tools/Makefile: Ditto.
* tools/catalog.centralized: Moved to catalogs/.
* tools/catalog.super: Likewise.
* tools/transitional.cat: Likewise.
* 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.
  (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.lintian-overrides: Added to override for intentional
  package-contains-empty-directory warning.
* debian/sgml-base.preinst: Dropped. Directories are created by
  dh_installdirs.

Added:
    packages/sgml-base/branches/experimental/catalogs/
    packages/sgml-base/branches/experimental/catalogs/catalog.centralized   (props changed)
      - copied unchanged from r1152, packages/sgml-base/branches/experimental/tools/catalog.centralized
    packages/sgml-base/branches/experimental/catalogs/catalog.super   (props changed)
      - copied unchanged from r1152, packages/sgml-base/branches/experimental/tools/catalog.super
    packages/sgml-base/branches/experimental/catalogs/transitional.cat   (props changed)
      - copied unchanged from r1152, packages/sgml-base/branches/experimental/tools/transitional.cat
    packages/sgml-base/branches/experimental/debian/sgml-base.dirs
    packages/sgml-base/branches/experimental/debian/sgml-base.lintian-overrides
Removed:
    packages/sgml-base/branches/experimental/MAKE/
    packages/sgml-base/branches/experimental/Makefile
    packages/sgml-base/branches/experimental/debian/sgml-base.preinst
    packages/sgml-base/branches/experimental/tools/Makefile
    packages/sgml-base/branches/experimental/tools/catalog.centralized
    packages/sgml-base/branches/experimental/tools/catalog.super
    packages/sgml-base/branches/experimental/tools/transitional.cat
Modified:
    packages/sgml-base/branches/experimental/debian/changelog
    packages/sgml-base/branches/experimental/debian/compat
    packages/sgml-base/branches/experimental/debian/control
    packages/sgml-base/branches/experimental/debian/copyright
    packages/sgml-base/branches/experimental/debian/rules
    packages/sgml-base/branches/experimental/debian/sgml-base.install

Propchange: packages/sgml-base/branches/experimental/catalogs/catalog.centralized
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: packages/sgml-base/branches/experimental/catalogs/catalog.super
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: packages/sgml-base/branches/experimental/catalogs/transitional.cat
------------------------------------------------------------------------------
    svn:mergeinfo = 

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=1155&op=diff
==============================================================================
--- packages/sgml-base/branches/experimental/debian/changelog (original)
+++ packages/sgml-base/branches/experimental/debian/changelog Tue Sep  2 13:21:49 2008
@@ -1,6 +1,26 @@
 sgml-base (1.26.1) UNRELEASED; urgency=low
 
-  * 
+  * Makefile: Dropped build system. debian/rules and debhelper are enough.
+  * MAKE/include: Ditto.
+  * tools/Makefile: Ditto.
+  * tools/catalog.centralized: Moved to catalogs/.
+  * tools/catalog.super: Likewise.
+  * tools/transitional.cat: Likewise.
+
+  * 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.
+    (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.lintian-overrides: Added to override for intentional
+    package-contains-empty-directory warning.
+  * debian/sgml-base.preinst: Dropped. Directories are created by
+    dh_installdirs.
 
  -- Daniel Leidert (dale) <daniel.leidert at wgdd.de>  Tue, 02 Sep 2008 14:23:41 +0200
 

Modified: packages/sgml-base/branches/experimental/debian/compat
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/sgml-base/branches/experimental/debian/compat?rev=1155&op=diff
==============================================================================
--- packages/sgml-base/branches/experimental/debian/compat (original)
+++ packages/sgml-base/branches/experimental/debian/compat Tue Sep  2 13:21:49 2008
@@ -1,1 +1,1 @@
-4
+6

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=1155&op=diff
==============================================================================
--- packages/sgml-base/branches/experimental/debian/control (original)
+++ packages/sgml-base/branches/experimental/debian/control Tue Sep  2 13:21:49 2008
@@ -2,13 +2,15 @@
 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: debhelper (>= 4.1)
+Uploaders: Ardo van Rangelrooij <ardo at debian.org>,
+ Daniel Leidert (dale) <daniel.leidert at wgdd.de>
+Standards-Version: 3.8.0
+Build-Depends: debhelper (>= 6.0.7)
+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
 
 Package: sgml-base
-Section: text
-Priority: optional
 Architecture: all
 Conflicts: sgml-data (<= 0.02), sgmltools-2 (<= 2.0.2-4)
 Depends: ${perl:Depends}

Modified: packages/sgml-base/branches/experimental/debian/copyright
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/sgml-base/branches/experimental/debian/copyright?rev=1155&op=diff
==============================================================================
--- packages/sgml-base/branches/experimental/debian/copyright (original)
+++ packages/sgml-base/branches/experimental/debian/copyright Tue Sep  2 13:21:49 2008
@@ -1,11 +1,15 @@
 This the Debian package of sgml-base.  It was assembled by Christian
 Schwarz <schwarz at debian.org>.  It is currently maintained by Ardo van
-Rangelrooij <ardo at debian.org>.
+Rangelrooij <ardo at debian.org> and the Debian XML/SGML Group
+<debian-xml-sgml-pkgs at lists.alioth.debian.org>.
 
 Copyright:
 
-Copyright (C) 1997 Christian Schwarz <schwarz at debian.org>.
-Copyright (C) 2001-2004 Ardo van Rangelrooij <ardo at debian.org>
+  Copyright (C) 1997 Christian Schwarz <schwarz at debian.org>.
+  Copyright (C) 2001-2004 Ardo van Rangelrooij <ardo at debian.org>.
+  Copyright (C) 2008 Daniel Leidert <daniel.leidert at wgdd.de>.
+
+License: GNU GPL v2 or later
 
 This is free software; you may redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free

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=1155&op=diff
==============================================================================
--- packages/sgml-base/branches/experimental/debian/rules (original)
+++ packages/sgml-base/branches/experimental/debian/rules Tue Sep  2 13:21:49 2008
@@ -1,59 +1,47 @@
 #!/usr/bin/make -f
-## ----------------------------------------------------------------------
-## debian/rules : package script for sgml-base
-## ----------------------------------------------------------------------
-
-## ----------------------------------------------------------------------
-## uncomment this to turn on verbose mode
 #export DH_VERBOSE=1
 
-## ----------------------------------------------------------------------
-TMP_DIR		= debian/tmp
+PACKAGE  = sgml-base
+MANPAGES = tools/install-sgmlcatalog.8 tools/update-catalog.8
 
-## ----------------------------------------------------------------------
-## targets
 
 clean:
-		dh_testdir
-		dh_testroot
-		dh_clean
-		rm -f build-stamp install-stamp
+	dh_testdir
+	dh_testroot
+	dh_clean build-stamp install-stamp        
 
-build:		build-stamp
-build-stamp:
-		dh_testdir
-		$(MAKE)
-		touch build-stamp
+build: build-stamp
+build-stamp: $(MANPAGES)
+	dh_testdir
+	touch $@
 
-install:	install-stamp
-install-stamp:	build
-		dh_testdir
-		dh_testroot
-		dh_clean -k
-		dh_installdirs
-		$(MAKE) install prefix=$(PWD)/$(TMP_DIR)/usr
-		touch install-stamp
+%.8: %
+	pod2man --section 8 --center $(PACKAGE) ${<} ${@}
 
-binary-indep:	build install
-		dh_testdir
-		dh_testroot
-		dh_install --sourcedir=$(TMP_DIR)
-		dh_installdocs
-		dh_installexamples
-		dh_installchangelogs
-		dh_usrlocal
-		dh_compress
-		dh_fixperms
-		dh_installdeb
-		dh_perl
-		dh_gencontrol
-		dh_md5sums
-		dh_builddeb
+install: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
 
-binary-arch:
+binary: binary-indep binary-arch
+binary-arch: build install
+binary-indep: build install
+	dh_testdir
+	dh_testroot
+	dh_installchangelogs
+	dh_install
+	dh_installdocs
+	dh_installexamples
+	dh_installman $(MANPAGES)
+	dh_usrlocal
+	dh_lintian
+	dh_compress
+	dh_fixperms
+	dh_installdeb
+	dh_perl
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
 
-binary:		binary-indep binary-arch
-
-.PHONY:		clean build install binary-indep binary-arch binary
-
-## ----------------------------------------------------------------------
+.PHONY: binary binary-arch binary-indep build clean install

Added: packages/sgml-base/branches/experimental/debian/sgml-base.dirs
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/sgml-base/branches/experimental/debian/sgml-base.dirs?rev=1155&op=file
==============================================================================
--- packages/sgml-base/branches/experimental/debian/sgml-base.dirs (added)
+++ packages/sgml-base/branches/experimental/debian/sgml-base.dirs Tue Sep  2 13:21:49 2008
@@ -1,0 +1,13 @@
+etc/sgml
+usr/sbin
+usr/share/declaration
+usr/share/dtd
+usr/share/entities
+usr/share/misc
+usr/share/stylesheet
+usr/local/share/declaration                
+usr/local/share/dtd      
+usr/local/share/entities      
+usr/local/share/misc      
+usr/local/share/stylesheet
+var/lib/sgml-base

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=1155&op=diff
==============================================================================
--- packages/sgml-base/branches/experimental/debian/sgml-base.install (original)
+++ packages/sgml-base/branches/experimental/debian/sgml-base.install Tue Sep  2 13:21:49 2008
@@ -1,1 +1,6 @@
-usr
+tools/install-sgmlcatalog usr/sbin
+tools/update-catalog      usr/sbin
+
+catalogs/catalog.centralized usr/share/sgml-base
+catalogs/catalog.super       usr/share/sgml-base
+catalogs/transitional.cat    usr/share/sgml-base

Added: packages/sgml-base/branches/experimental/debian/sgml-base.lintian-overrides
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/sgml-base/branches/experimental/debian/sgml-base.lintian-overrides?rev=1155&op=file
==============================================================================
--- packages/sgml-base/branches/experimental/debian/sgml-base.lintian-overrides (added)
+++ packages/sgml-base/branches/experimental/debian/sgml-base.lintian-overrides Tue Sep  2 13:21:49 2008
@@ -1,0 +1,7 @@
+## The sgml-base package creates/provides the core SGML infrastructure,
+## including these empty directories.
+sgml-base: package-contains-empty-directory usr/share/declaration/
+sgml-base: package-contains-empty-directory usr/share/dtd/
+sgml-base: package-contains-empty-directory usr/share/entities/
+sgml-base: package-contains-empty-directory usr/share/misc/
+sgml-base: package-contains-empty-directory usr/share/stylesheet/

More information about the debian-xml-sgml-commit mailing list