[Blends-commit] r2442 - in /blends/trunk/blends: debian/changelog devtools/Makefile devtools/rules templates/postinst templates/postrm templates/preinst templates/prerm
tille at users.alioth.debian.org
tille at users.alioth.debian.org
Wed Nov 10 20:17:47 UTC 2010
Author: tille
Date: Wed Nov 10 20:17:33 2010
New Revision: 2442
URL: http://svn.debian.org/wsvn/blends/?sc=1&rev=2442
Log:
Revert a broken change in obtaining the version number which creates useless directories; provide postrm and preinst scripts to handle possible upgrade changes
Added:
blends/trunk/blends/templates/postrm (with props)
blends/trunk/blends/templates/preinst (with props)
Modified:
blends/trunk/blends/debian/changelog
blends/trunk/blends/devtools/Makefile
blends/trunk/blends/devtools/rules
blends/trunk/blends/templates/postinst
blends/trunk/blends/templates/prerm
Modified: blends/trunk/blends/debian/changelog
URL: http://svn.debian.org/wsvn/blends/blends/trunk/blends/debian/changelog?rev=2442&op=diff
==============================================================================
--- blends/trunk/blends/debian/changelog (original)
+++ blends/trunk/blends/debian/changelog Wed Nov 10 20:17:33 2010
@@ -1,18 +1,21 @@
blends (0.6.15) UNRELEASED; urgency=low
- [Georges Khaznadar]
- * Convert doc to docbook-xml
- * Provide French translation for doc
-
- [Andreas Tille]
- * doc/en: Update about existing Blends
- * devtools/rules: use dpkg-parsechangelog to obtain version number
- * examples/control.stub:
- - Updated debhelper version, Standards-Version
- - Removed two useless lines at the end
+ * Documentation changes:
+ - doc/en: Update about existing Blends
+ - examples/control.stub:
+ + Updated debhelper version, Standards-Version
+ + Removed two useless lines at the end
* devtools/rules: ignore .git directories when creating orig.tar.gz
-
- -- Andreas Tille <tille at debian.org> Sun, 31 Oct 2010 10:45:28 +0100
+ * templates/{postinst,prerm}: use /bin/sh instead of /bin/bash to
+ be sure that the requested shell is really available (there is
+ no explicite bash dependency enforced
+ * templates/postrm: Provide code for failed-upgrade to enable
+ smooth upgrades from Lenny
+ * templates/preinst: Provide this template for completeness
+ * devtools/{rules,Makefile}: clean targets will remove also postrm
+ and preinst if existant
+
+ -- Andreas Tille <tille at debian.org> Wed, 10 Nov 2010 20:32:31 +0100
blends (0.6.14) unstable; urgency=low
Modified: blends/trunk/blends/devtools/Makefile
URL: http://svn.debian.org/wsvn/blends/blends/trunk/blends/devtools/Makefile?rev=2442&op=diff
==============================================================================
--- blends/trunk/blends/devtools/Makefile (original)
+++ blends/trunk/blends/devtools/Makefile Wed Nov 10 20:17:33 2010
@@ -49,7 +49,7 @@
rm -f tasks/*~
rm -rf tasksel
rm -f packages.txt by_vote packages-sorted.txt
- rm -f debian/*-config.postinst debian/*-config.preinst
+ rm -f debian/*-config.postinst debian/*-config.preinst debian/*-config.postrm debian/*-config.prerm
distclean: clean
Modified: blends/trunk/blends/devtools/rules
URL: http://svn.debian.org/wsvn/blends/blends/trunk/blends/devtools/rules?rev=2442&op=diff
==============================================================================
--- blends/trunk/blends/devtools/rules (original)
+++ blends/trunk/blends/devtools/rules Wed Nov 10 20:17:33 2010
@@ -15,8 +15,7 @@
BLEND := $(shell /usr/share/blends-dev/blend-get-names blendname)
GENCONTROL := /usr/share/blends-dev/blend-gen-control
-# VERSION := $(shell grep '^$(BLENDNAME) *(.\+)' debian/changelog | head -n 1 | sed 's/^$(BLENDNAME) \+(\(.\+\)) .*/\1/' )
-VERSION := $(shell dpkg-parsechangelog | awk '/^Version/ { print $2 }' )
+VERSION := $(shell grep '^$(BLENDNAME) *(.\+)' debian/changelog | head -n 1 | sed 's/^$(BLENDNAME) \+(\(.\+\)) .*/\1/' )
DISTDIR := $(BLENDNAME)-$(VERSION)
all:
@@ -57,7 +56,7 @@
# Remove backup files from source tarball
rm -f tasks/*~
# Remove auto generated post{inst,rm} scripts
- rm -f debian/$(PREFIX)-*.postinst debian/$(PREFIX)-*.prerm
+ rm -f debian/$(PREFIX)-*.postinst debian/$(PREFIX)-*.prerm debian/$(PREFIX)-*.postrm debian/$(PREFIX)-*.preinst
# remove auto generated files for config package
rm -f debian/$(PREFIX)-config.templates debian/$(PREFIX)-config.config \
debian/$(PREFIX)-config.install debian/$(PREFIX)-config.links \
Modified: blends/trunk/blends/templates/postinst
URL: http://svn.debian.org/wsvn/blends/blends/trunk/blends/templates/postinst?rev=2442&op=diff
==============================================================================
--- blends/trunk/blends/templates/postinst (original)
+++ blends/trunk/blends/templates/postinst Wed Nov 10 20:17:33 2010
@@ -1,4 +1,5 @@
-#!/bin/bash -e
+#!/bin/sh
+set -e
# This is the default postinst file from the blends-dev package which is used
# in all meta packages. If there is a certain need to provide extra
@@ -7,6 +8,18 @@
#
# You should not insert the _DEBHELPER_ template in the special postscript
# file because it is in the end of this template anyway.
+
+# summary of how this script can be called:
+# * <postinst> `configure' <most-recently-configured-version>
+# * <old-postinst> `abort-upgrade' <new version>
+# * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+# <new-version>
+# * <postinst> `abort-remove'
+# * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+# <failed-install-package> <version> `removing'
+# <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
###########################################################################
# If the user menus are not needed/wished for a Blend (like for instance
Added: blends/trunk/blends/templates/postrm
URL: http://svn.debian.org/wsvn/blends/blends/trunk/blends/templates/postrm?rev=2442&op=file
==============================================================================
--- blends/trunk/blends/templates/postrm (added)
+++ blends/trunk/blends/templates/postrm Wed Nov 10 20:17:33 2010
@@ -1,0 +1,42 @@
+#!/bin/sh
+set -e
+
+# This is the default postinst file from the blends-dev package which is used
+# in all meta packages. If there is a certain need to provide extra
+# postinst files for some meta packages this template will be appended. Thus
+# it will be checked whether debconf was just initialized.
+#
+# You should not insert the _DEBHELPER_ template in the special postscript
+# file because it is in the end of this template anyway.
+
+# summary of how this script can be called:
+# * <postrm> `remove'
+# * <postrm> `purge'
+# * <old-postrm> `upgrade' <new-version>
+# * <new-postrm> `failed-upgrade' <old-version>
+# * <new-postrm> `abort-install'
+# * <new-postrm> `abort-install' <old-version>
+# * <new-postrm> `abort-upgrade' <old-version>
+# * <disappearer's-postrm> `disappear' <overwriter>
+# <overwriter-version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+case "$1" in
+ purge|remove|upgrade|abort-install|abort-upgrade|disappear)
+ ;;
+
+ failed-upgrade)
+ # There is basically nothing to do - just care for a clean upgrade
+ echo "Warning: postrm from version $2 of package #PKG# failed."
+ ;;
+
+ *)
+ echo "postrm called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
+esac
+
+#DEBHELPER#
+
+exit 0
Propchange: blends/trunk/blends/templates/postrm
------------------------------------------------------------------------------
svn:executable = *
Added: blends/trunk/blends/templates/preinst
URL: http://svn.debian.org/wsvn/blends/blends/trunk/blends/templates/preinst?rev=2442&op=file
==============================================================================
--- blends/trunk/blends/templates/preinst (added)
+++ blends/trunk/blends/templates/preinst Wed Nov 10 20:17:33 2010
@@ -1,0 +1,39 @@
+#!/bin/sh
+set -e
+
+# This is the default postinst file from the blends-dev package which is used
+# in all meta packages. If there is a certain need to provide extra
+# postinst files for some meta packages this template will be appended. Thus
+# it will be checked whether debconf was just initialized.
+#
+# You should not insert the _DEBHELPER_ template in the special postscript
+# file because it is in the end of this template anyway.
+
+# summary of how this script can be called:
+# * <new-preinst> `install'
+# * <new-preinst> `install' <old-version>
+# * <new-preinst> `upgrade' <old-version>
+# * <old-preinst> `abort-upgrade' <new-version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+ install|upgrade)
+ ;;
+
+ abort-upgrade)
+ ;;
+
+ *)
+ echo "preinst called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
Propchange: blends/trunk/blends/templates/preinst
------------------------------------------------------------------------------
svn:executable = *
Modified: blends/trunk/blends/templates/prerm
URL: http://svn.debian.org/wsvn/blends/blends/trunk/blends/templates/prerm?rev=2442&op=diff
==============================================================================
--- blends/trunk/blends/templates/prerm (original)
+++ blends/trunk/blends/templates/prerm Wed Nov 10 20:17:33 2010
@@ -1,4 +1,5 @@
-#!/bin/bash -e
+#!/bin/sh
+set -e
# This is the default prerm file from the blends-dev package which is used
# in all meta packages. If there is a certain need to provide extra
@@ -28,7 +29,7 @@
fi
case "$1" in
- abort-install|abort-upgrade|failed-upgrade|upgrade)
+ deconfigure|failed-upgrade|upgrade)
;;
remove|purge)
db_get "shared/#BLEND#-config/usermenus" || true
@@ -51,3 +52,5 @@
fi
#DEBHELPER#
+
+exit 0
More information about the Blends-commit
mailing list