[Cdd-commits] r546 - in cdd: tags/cdd/0.4.6 tags/cdd/0.4.6/debian tags/cdd/0.4.6/devtools tags/cdd/0.4.6/templates trunk/cdd/debian trunk/cdd/devtools trunk/cdd/templates
CDD Subversion Commit
noreply at alioth.debian.org
Thu Feb 14 17:16:30 UTC 2008
Author: tille
Date: Thu Feb 14 17:16:30 2008
New Revision: 546
Added:
cdd/tags/cdd/0.4.6/
- copied from r545, cdd/trunk/cdd/
Modified:
cdd/tags/cdd/0.4.6/debian/changelog
cdd/tags/cdd/0.4.6/devtools/cdd-gen-control
cdd/tags/cdd/0.4.6/templates/postinst
cdd/tags/cdd/0.4.6/templates/postrm
cdd/trunk/cdd/debian/changelog
cdd/trunk/cdd/devtools/cdd-gen-control
cdd/trunk/cdd/templates/postinst
cdd/trunk/cdd/templates/postrm
Log:
Tagged 0.4.6 which fixes a problem that causes broken meta packages in case user-menus are not used by the CDD
Modified: cdd/tags/cdd/0.4.6/debian/changelog
==============================================================================
--- cdd/trunk/cdd/debian/changelog (original)
+++ cdd/tags/cdd/0.4.6/debian/changelog Thu Feb 14 17:16:30 2008
@@ -1,9 +1,11 @@
-cdd (0.4.6) UNRELEASED; urgency=low
+cdd (0.4.6) unstable; urgency=low
* Fixed Vcs-Browser, Vcs-Svn (Thanks to Thijs Kinkhorst
<thijs at debian.org>)
+ * Fix templates/post{inst,rm} to check for files from
+ cdd-common before accessing them
- -- Andreas Tille <tille at debian.org> Sun, 03 Feb 2008 11:14:51 +0100
+ -- Andreas Tille <tille at debian.org> Thu, 14 Feb 2008 18:08:57 +0100
cdd (0.4.5.1) unstable; urgency=low
Modified: cdd/tags/cdd/0.4.6/devtools/cdd-gen-control
==============================================================================
--- cdd/trunk/cdd/devtools/cdd-gen-control (original)
+++ cdd/tags/cdd/0.4.6/devtools/cdd-gen-control Thu Feb 14 17:16:30 2008
@@ -45,7 +45,7 @@
sub usage() {
print STDERR << "EOF";
-gen-control help screen
+cdd-gen-control help screen
usage: $0 [options]
-a : print wanted packages
Modified: cdd/tags/cdd/0.4.6/templates/postinst
==============================================================================
--- cdd/trunk/cdd/templates/postinst (original)
+++ cdd/tags/cdd/0.4.6/templates/postinst Thu Feb 14 17:16:30 2008
@@ -8,38 +8,44 @@
# You should not insert the _DEBHELPER_ template in the special postscript
# file because it is in the end of this template anyway.
-test -x /usr/sbin/cdd-update-menus && /usr/sbin/cdd-update-menus -d #CDD#
-
-# Initialize debconf if not yet done
-if [ _"$DEBCONF_REDIR" = _"" ]; then
- . /usr/share/debconf/confmodule
- db_version 2.0
-fi
-
-. /etc/cdd/cdd.conf
-if [ -s /etc/cdd/#CDD#/#CDD#.conf ] ; then . /etc/cdd/#CDD#/#CDD#.conf ; fi
-
-case "$1" in
- abort-deconfigure|abort-remove|abort-upgrade)
- ;;
- configure|upgrade)
- db_get "shared/#CDD#-config/usermenus" || true
- case "$RET" in
- "Each package installation")
- /usr/sbin/cdd-update-usermenus #CDD#
- ;;
- "End of installation")
- touch /var/run/#CDD#-config.usermenu
+###########################################################################
+# If the user menus are not needed/wished for a CDD (like for instance
+# Debian-Edu there is no need to install cdd-common package. Thus we
+# have to make sure that postinst does not try to include the menu stuff
+if [ -d /etc/cdd -a -f /etc/cdd/cdd.conf ] ; then
+ test -x /usr/sbin/cdd-update-menus && /usr/sbin/cdd-update-menus -d #CDD#
+
+ # Initialize debconf if not yet done
+ if [ _"$DEBCONF_REDIR" = _"" ]; then
+ . /usr/share/debconf/confmodule
+ db_version 2.0
+ fi
+
+ . /etc/cdd/cdd.conf
+ if [ -s /etc/cdd/#CDD#/#CDD#.conf ] ; then . /etc/cdd/#CDD#/#CDD#.conf ; fi
+
+ case "$1" in
+ abort-deconfigure|abort-remove|abort-upgrade)
+ ;;
+ configure|upgrade)
+ db_get "shared/#CDD#-config/usermenus" || true
+ case "$RET" in
+ "Each package installation")
+ /usr/sbin/cdd-update-usermenus #CDD#
+ ;;
+ "End of installation")
+ touch /var/run/#CDD#-config.usermenu
;;
- esac
- ;;
- *)
- echo "postinst called with unknown argument \`$1'" >&2
- exit 1
- ;;
-esac
+ esac
+ ;;
+ *)
+ echo "postinst called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
+ esac
-db_stop
+ db_stop
+fi
#DEBHELPER#
Modified: cdd/tags/cdd/0.4.6/templates/postrm
==============================================================================
--- cdd/trunk/cdd/templates/postrm (original)
+++ cdd/tags/cdd/0.4.6/templates/postrm Thu Feb 14 17:16:30 2008
@@ -8,41 +8,46 @@
# You should not insert the _DEBHELPER_ template in the special postscript
# file because it is in the end of this template anyway.
-test -x /usr/sbin/cdd-update-menus && /usr/sbin/cdd-update-menus -d #CDD#
-
-test -s /etc/cdd/cdd.conf && . /etc/cdd/cdd.conf
-test -s /etc/cdd/#CDD#/#CDD#.conf && . /etc/cdd/#CDD#/#CDD#.conf
-
-if [ -x /usr/sbin/cdd-update-usermenus ] ; then
- # Initialize debconf if not yet done
- if [ _"$DEBCONF_REDIR" = _"" ]; then
- . /usr/share/debconf/confmodule
- db_version 2.0
- fi
-
- . /etc/cdd/cdd.conf
- if [ -s /etc/cdd/#CDD#/#CDD#.conf ] ; then . /etc/cdd/#CDD#/#CDD#.conf ; fi
-
- case "$1" in
- abort-install|abort-upgrade|failed-upgrade|upgrade)
- ;;
- remove|purge)
- db_get "shared/#CDD#-config/usermenus" || true
- case "$RET" in
- "Each package installation")
- /usr/sbin/cdd-update-usermenus #CDD#
+###########################################################################
+# If the user menus are not needed/wished for a CDD (like for instance
+# Debian-Edu there is no need to install cdd-common package. Thus we
+# have to make sure that postinst does not try to include the menu stuff
+if [ -d /etc/cdd -a -f /etc/cdd/cdd.conf ] ; then
+ test -x /usr/sbin/cdd-update-menus && /usr/sbin/cdd-update-menus -d #CDD#
+
+ test -s /etc/cdd/cdd.conf && . /etc/cdd/cdd.conf
+ test -s /etc/cdd/#CDD#/#CDD#.conf && . /etc/cdd/#CDD#/#CDD#.conf
+
+ if [ -x /usr/sbin/cdd-update-usermenus ] ; then
+ # Initialize debconf if not yet done
+ if [ _"$DEBCONF_REDIR" = _"" ]; then
+ . /usr/share/debconf/confmodule
+ db_version 2.0
+ fi
+
+ . /etc/cdd/cdd.conf
+ if [ -s /etc/cdd/#CDD#/#CDD#.conf ] ; then . /etc/cdd/#CDD#/#CDD#.conf ; fi
+
+ case "$1" in
+ abort-install|abort-upgrade|failed-upgrade|upgrade)
+ ;;
+ remove|purge)
+ db_get "shared/#CDD#-config/usermenus" || true
+ case "$RET" in
+ "Each package installation")
+ /usr/sbin/cdd-update-usermenus #CDD#
;;
- "End of installation")
- touch /var/run/#CDD#-config.usermenu
+ "End of installation")
+ touch /var/run/#CDD#-config.usermenu
;;
- esac
- ;;
- *)
- echo "postrm called with unknown argument \`$1'" >&2
- exit 1
- ;;
- esac
+ esac
+ ;;
+ *)
+ echo "postrm called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
+ esac
+ fi
fi
-
#DEBHELPER#
Modified: cdd/trunk/cdd/debian/changelog
==============================================================================
--- cdd/trunk/cdd/debian/changelog (original)
+++ cdd/trunk/cdd/debian/changelog Thu Feb 14 17:16:30 2008
@@ -1,9 +1,11 @@
-cdd (0.4.6) UNRELEASED; urgency=low
+cdd (0.4.6) unstable; urgency=low
* Fixed Vcs-Browser, Vcs-Svn (Thanks to Thijs Kinkhorst
<thijs at debian.org>)
+ * Fix templates/post{inst,rm} to check for files from
+ cdd-common before accessing them
- -- Andreas Tille <tille at debian.org> Sun, 03 Feb 2008 11:14:51 +0100
+ -- Andreas Tille <tille at debian.org> Thu, 14 Feb 2008 18:08:57 +0100
cdd (0.4.5.1) unstable; urgency=low
Modified: cdd/trunk/cdd/devtools/cdd-gen-control
==============================================================================
--- cdd/trunk/cdd/devtools/cdd-gen-control (original)
+++ cdd/trunk/cdd/devtools/cdd-gen-control Thu Feb 14 17:16:30 2008
@@ -45,7 +45,7 @@
sub usage() {
print STDERR << "EOF";
-gen-control help screen
+cdd-gen-control help screen
usage: $0 [options]
-a : print wanted packages
Modified: cdd/trunk/cdd/templates/postinst
==============================================================================
--- cdd/trunk/cdd/templates/postinst (original)
+++ cdd/trunk/cdd/templates/postinst Thu Feb 14 17:16:30 2008
@@ -8,38 +8,44 @@
# You should not insert the _DEBHELPER_ template in the special postscript
# file because it is in the end of this template anyway.
-test -x /usr/sbin/cdd-update-menus && /usr/sbin/cdd-update-menus -d #CDD#
-
-# Initialize debconf if not yet done
-if [ _"$DEBCONF_REDIR" = _"" ]; then
- . /usr/share/debconf/confmodule
- db_version 2.0
-fi
-
-. /etc/cdd/cdd.conf
-if [ -s /etc/cdd/#CDD#/#CDD#.conf ] ; then . /etc/cdd/#CDD#/#CDD#.conf ; fi
-
-case "$1" in
- abort-deconfigure|abort-remove|abort-upgrade)
- ;;
- configure|upgrade)
- db_get "shared/#CDD#-config/usermenus" || true
- case "$RET" in
- "Each package installation")
- /usr/sbin/cdd-update-usermenus #CDD#
- ;;
- "End of installation")
- touch /var/run/#CDD#-config.usermenu
+###########################################################################
+# If the user menus are not needed/wished for a CDD (like for instance
+# Debian-Edu there is no need to install cdd-common package. Thus we
+# have to make sure that postinst does not try to include the menu stuff
+if [ -d /etc/cdd -a -f /etc/cdd/cdd.conf ] ; then
+ test -x /usr/sbin/cdd-update-menus && /usr/sbin/cdd-update-menus -d #CDD#
+
+ # Initialize debconf if not yet done
+ if [ _"$DEBCONF_REDIR" = _"" ]; then
+ . /usr/share/debconf/confmodule
+ db_version 2.0
+ fi
+
+ . /etc/cdd/cdd.conf
+ if [ -s /etc/cdd/#CDD#/#CDD#.conf ] ; then . /etc/cdd/#CDD#/#CDD#.conf ; fi
+
+ case "$1" in
+ abort-deconfigure|abort-remove|abort-upgrade)
+ ;;
+ configure|upgrade)
+ db_get "shared/#CDD#-config/usermenus" || true
+ case "$RET" in
+ "Each package installation")
+ /usr/sbin/cdd-update-usermenus #CDD#
+ ;;
+ "End of installation")
+ touch /var/run/#CDD#-config.usermenu
;;
- esac
- ;;
- *)
- echo "postinst called with unknown argument \`$1'" >&2
- exit 1
- ;;
-esac
+ esac
+ ;;
+ *)
+ echo "postinst called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
+ esac
-db_stop
+ db_stop
+fi
#DEBHELPER#
Modified: cdd/trunk/cdd/templates/postrm
==============================================================================
--- cdd/trunk/cdd/templates/postrm (original)
+++ cdd/trunk/cdd/templates/postrm Thu Feb 14 17:16:30 2008
@@ -8,41 +8,46 @@
# You should not insert the _DEBHELPER_ template in the special postscript
# file because it is in the end of this template anyway.
-test -x /usr/sbin/cdd-update-menus && /usr/sbin/cdd-update-menus -d #CDD#
-
-test -s /etc/cdd/cdd.conf && . /etc/cdd/cdd.conf
-test -s /etc/cdd/#CDD#/#CDD#.conf && . /etc/cdd/#CDD#/#CDD#.conf
-
-if [ -x /usr/sbin/cdd-update-usermenus ] ; then
- # Initialize debconf if not yet done
- if [ _"$DEBCONF_REDIR" = _"" ]; then
- . /usr/share/debconf/confmodule
- db_version 2.0
- fi
-
- . /etc/cdd/cdd.conf
- if [ -s /etc/cdd/#CDD#/#CDD#.conf ] ; then . /etc/cdd/#CDD#/#CDD#.conf ; fi
-
- case "$1" in
- abort-install|abort-upgrade|failed-upgrade|upgrade)
- ;;
- remove|purge)
- db_get "shared/#CDD#-config/usermenus" || true
- case "$RET" in
- "Each package installation")
- /usr/sbin/cdd-update-usermenus #CDD#
+###########################################################################
+# If the user menus are not needed/wished for a CDD (like for instance
+# Debian-Edu there is no need to install cdd-common package. Thus we
+# have to make sure that postinst does not try to include the menu stuff
+if [ -d /etc/cdd -a -f /etc/cdd/cdd.conf ] ; then
+ test -x /usr/sbin/cdd-update-menus && /usr/sbin/cdd-update-menus -d #CDD#
+
+ test -s /etc/cdd/cdd.conf && . /etc/cdd/cdd.conf
+ test -s /etc/cdd/#CDD#/#CDD#.conf && . /etc/cdd/#CDD#/#CDD#.conf
+
+ if [ -x /usr/sbin/cdd-update-usermenus ] ; then
+ # Initialize debconf if not yet done
+ if [ _"$DEBCONF_REDIR" = _"" ]; then
+ . /usr/share/debconf/confmodule
+ db_version 2.0
+ fi
+
+ . /etc/cdd/cdd.conf
+ if [ -s /etc/cdd/#CDD#/#CDD#.conf ] ; then . /etc/cdd/#CDD#/#CDD#.conf ; fi
+
+ case "$1" in
+ abort-install|abort-upgrade|failed-upgrade|upgrade)
+ ;;
+ remove|purge)
+ db_get "shared/#CDD#-config/usermenus" || true
+ case "$RET" in
+ "Each package installation")
+ /usr/sbin/cdd-update-usermenus #CDD#
;;
- "End of installation")
- touch /var/run/#CDD#-config.usermenu
+ "End of installation")
+ touch /var/run/#CDD#-config.usermenu
;;
- esac
- ;;
- *)
- echo "postrm called with unknown argument \`$1'" >&2
- exit 1
- ;;
- esac
+ esac
+ ;;
+ *)
+ echo "postrm called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
+ esac
+ fi
fi
-
#DEBHELPER#
More information about the Cdd-commits
mailing list