[xml/sgml-commit] r719 - packages/xml-core/trunk/debian
Daniel Leidert
dleidert-guest at alioth.debian.org
Sat Apr 14 19:40:30 UTC 2007
Author: dleidert-guest
Date: 2007-04-14 19:40:30 +0000 (Sat, 14 Apr 2007)
New Revision: 719
Added:
packages/xml-core/trunk/debian/xml-core.dirs
Removed:
packages/xml-core/trunk/debian/xml-core.install
packages/xml-core/trunk/debian/xml-core.postinst
packages/xml-core/trunk/debian/xml-core.prerm
Modified:
packages/xml-core/trunk/debian/changelog
packages/xml-core/trunk/debian/rules
packages/xml-core/trunk/debian/xml-core.preinst
Log:
* 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.
Modified: packages/xml-core/trunk/debian/changelog
===================================================================
--- packages/xml-core/trunk/debian/changelog 2007-04-14 19:34:00 UTC (rev 718)
+++ packages/xml-core/trunk/debian/changelog 2007-04-14 19:40:30 UTC (rev 719)
@@ -3,8 +3,6 @@
* NOT RELEASED YET
[ Daniel Leidert ]
- * tools/update-xmlcatalog: Removed dead code in the type-value evaluation
- (closes: #315759).
* 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.
@@ -12,12 +10,24 @@
(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/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> Sun, 11 Mar 2007 05:34:09 +0100
Modified: packages/xml-core/trunk/debian/rules
===================================================================
--- packages/xml-core/trunk/debian/rules 2007-04-14 19:34:00 UTC (rev 718)
+++ packages/xml-core/trunk/debian/rules 2007-04-14 19:40:30 UTC (rev 719)
@@ -8,7 +8,7 @@
#export DH_VERBOSE=1
## ----------------------------------------------------------------------
-TMP_DIR = debian/tmp
+PACKAGE = xml-core
## ----------------------------------------------------------------------
## targets
@@ -31,13 +31,12 @@
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
Added: packages/xml-core/trunk/debian/xml-core.dirs
===================================================================
--- packages/xml-core/trunk/debian/xml-core.dirs 2007-04-14 19:34:00 UTC (rev 718)
+++ packages/xml-core/trunk/debian/xml-core.dirs 2007-04-14 19:40:30 UTC (rev 719)
@@ -0,0 +1,2 @@
+etc/xml
+var/lib/xml-core
Deleted: packages/xml-core/trunk/debian/xml-core.install
===================================================================
--- packages/xml-core/trunk/debian/xml-core.install 2007-04-14 19:34:00 UTC (rev 718)
+++ packages/xml-core/trunk/debian/xml-core.install 2007-04-14 19:40:30 UTC (rev 719)
@@ -1 +0,0 @@
-usr
Deleted: packages/xml-core/trunk/debian/xml-core.postinst
===================================================================
--- packages/xml-core/trunk/debian/xml-core.postinst 2007-04-14 19:34:00 UTC (rev 718)
+++ packages/xml-core/trunk/debian/xml-core.postinst 2007-04-14 19:40:30 UTC (rev 719)
@@ -1,15 +0,0 @@
-#!/bin/sh
-## ----------------------------------------------------------------------
-## debian/postinst : postinstallation script for xml-core
-## ----------------------------------------------------------------------
-
-## ----------------------------------------------------------------------
-set -e
-
-## ----------------------------------------------------------------------
-## automatically generated debhelper commands
-#DEBHELPER#
-
-exit 0
-
-## ----------------------------------------------------------------------
Modified: packages/xml-core/trunk/debian/xml-core.preinst
===================================================================
--- packages/xml-core/trunk/debian/xml-core.preinst 2007-04-14 19:34:00 UTC (rev 718)
+++ packages/xml-core/trunk/debian/xml-core.preinst 2007-04-14 19:40:30 UTC (rev 719)
@@ -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
Deleted: packages/xml-core/trunk/debian/xml-core.prerm
===================================================================
--- packages/xml-core/trunk/debian/xml-core.prerm 2007-04-14 19:34:00 UTC (rev 718)
+++ packages/xml-core/trunk/debian/xml-core.prerm 2007-04-14 19:40:30 UTC (rev 719)
@@ -1,15 +0,0 @@
-#!/bin/sh
-## ----------------------------------------------------------------------
-## debian/prerm : preremoval script for xml-core
-## ----------------------------------------------------------------------
-
-## ----------------------------------------------------------------------
-set -e
-
-## ----------------------------------------------------------------------
-## automatically generated debhelper commands
-#DEBHELPER#
-
-exit 0
-
-## ----------------------------------------------------------------------
More information about the debian-xml-sgml-commit
mailing list