[Cdd-commits] r552 - in cdd/trunk/cdd: . debian devtools templates
CDD Subversion Commit
noreply at alioth.debian.org
Tue Feb 19 15:28:54 UTC 2008
Author: tille
Date: Tue Feb 19 15:28:54 2008
New Revision: 552
Modified:
cdd/trunk/cdd/VERSION
cdd/trunk/cdd/cdd-update-menus.8
cdd/trunk/cdd/debian/changelog
cdd/trunk/cdd/debian/control
cdd/trunk/cdd/devtools/rules
cdd/trunk/cdd/templates/postinst
cdd/trunk/cdd/templates/postrm
Log:
Fixes issues that were caused by enabling arch any meta packages
Modified: cdd/trunk/cdd/VERSION
==============================================================================
--- cdd/trunk/cdd/VERSION (original)
+++ cdd/trunk/cdd/VERSION Tue Feb 19 15:28:54 2008
@@ -1 +1 @@
-0.4.6
+0.4.7
Modified: cdd/trunk/cdd/cdd-update-menus.8
==============================================================================
--- cdd/trunk/cdd/cdd-update-menus.8 (original)
+++ cdd/trunk/cdd/cdd-update-menus.8 Tue Feb 19 15:28:54 2008
@@ -1,19 +1,19 @@
-.TH cdd-update-menus 8 "2004/03/24" "" "Custom Debian Distributions"
+.TH cdd\-update\-menus 8 "2004/03/24" "" "Custom Debian Distributions"
.SH NAME
-.B cdd-update-menus
+.B cdd\-update\-menus
\- add menu of meta package to all Custom Debian Distribution users
.SH SYNOPSIS
-.B cdd-update-menus
-[ --cdd|-d <
+.B cdd\-update\-menus
+[ \-\-cdd|\-d <
.B CDD
> |
---user|-u <
+\-\-user|\-u <
.B user
> ]
.SH DESCRIPTION
-cdd-update-menus behaves differently depending on who run the command:
+cdd\-update\-menus behaves differently depending on who run the command:
If it's called by a user, it adds and keeps updated menu entries for the
user who runs it.
@@ -26,7 +26,7 @@
.SH OPTIONS
.TP
.B CDD
-- one of the installed CDDs, listed in /etc/cdd/, for example (if installed):
+one of the installed CDDs, listed in /etc/cdd/, for example (if installed):
.I med
,
.I junior
@@ -39,7 +39,7 @@
.TP
.B user
-- a user present on the system and belonging to a CDD
+a user present on the system and belonging to a CDD
.SH AUTHOR
Andreas Tille <tille at debian.org>, Cosimo Alfarano <kalfa at debian.org>
Modified: cdd/trunk/cdd/debian/changelog
==============================================================================
--- cdd/trunk/cdd/debian/changelog (original)
+++ cdd/trunk/cdd/debian/changelog Tue Feb 19 15:28:54 2008
@@ -1,3 +1,18 @@
+cdd (0.4.7) unstable; urgency=low
+
+ * devtools/rules:
+ - Added '-a' / '-i' options to binary-{arch,indep} targets
+ - Added a test whether we build for arch all or any around
+ cdd-install-helper which is rather a quick hack than a
+ real solution but works. More discussion about what is
+ needed has to be done.
+ * debian/control: Build-Depends -> Build-Depends-Indep
+ * templates/post{inst,rm}: Check existence of CDD configuration
+ files before executing user menu code. If no such config
+ files exist there is no need to run this code
+
+ -- Andreas Tille <tille at debian.org> Tue, 19 Feb 2008 11:24:50 +0100
+
cdd (0.4.6) unstable; urgency=low
* Fixed Vcs-Browser, Vcs-Svn (Thanks to Thijs Kinkhorst
Modified: cdd/trunk/cdd/debian/control
==============================================================================
--- cdd/trunk/cdd/debian/control (original)
+++ cdd/trunk/cdd/debian/control Tue Feb 19 15:28:54 2008
@@ -2,8 +2,12 @@
Priority: optional
Section: devel
Maintainer: Andreas Tille <tille at debian.org>
-Uploaders: Petter Reinholdtsen <pere at debian.org>, Andreas Tille <tille at debian.org>, Cosimo Alfarano <kalfa at debian.org>
-Build-Depends: debhelper (>= 5), debiandoc-sgml, texlive-latex-base, texlive-latex-extra, texlive-latex-recommended, texlive-fonts-recommended
+Uploaders: Petter Reinholdtsen <pere at debian.org>,
+ Andreas Tille <tille at debian.org>,
+ Cosimo Alfarano <kalfa at debian.org>
+Build-Depends: debhelper (>= 5)
+Build-Depends-Indep: debiandoc-sgml, texlive-latex-base, texlive-latex-extra,
+ texlive-latex-recommended, texlive-fonts-recommended
Standards-Version: 3.7.3
Vcs-Browser: http://svn.debian.org/wsvn/cdd/cdd/trunk/cdd/
Vcs-Svn: svn://svn.debian.org/cdd/cdd/trunk/cdd/
Modified: cdd/trunk/cdd/devtools/rules
==============================================================================
--- cdd/trunk/cdd/devtools/rules (original)
+++ cdd/trunk/cdd/devtools/rules Tue Feb 19 15:28:54 2008
@@ -59,51 +59,57 @@
# to have correct Dependencies for every architecture we need
# to build also binary-arch target
binary-arch: build install
- dh_testdir
- dh_testroot
- dh_installdocs $(INSTALLREADME)
- dh_installexamples
- dh_installmenu
- dh_installcron
- dh_installman
- dh_installinfo
- $(CDD_INSTALL_HELPER)
- dh_install
- dh_installdebconf
- dh_installchangelogs
- dh_link
- dh_strip
- dh_compress
- dh_fixperms
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
+ dh_testdir -a
+ dh_testroot -a
+ dh_installdocs -a $(INSTALLREADME)
+ dh_installexamples -a
+ dh_installmenu -a
+ dh_installcron -a
+ dh_installman -a
+ dh_installinfo -a
+ if grep -q "^Architecture: \+any" debian/control ; then \
+ echo "$(CDD_INSTALL_HELPER) for architecture any" ; \
+ $(CDD_INSTALL_HELPER) ; \
+ fi
+ dh_install -a
+ dh_installdebconf -a
+ dh_installchangelogs -a
+ dh_link -a
+ dh_strip -a
+ dh_compress -a
+ dh_fixperms -a
+ dh_installdeb -a
+ dh_shlibdeps -a
+ dh_gencontrol -a
+ dh_md5sums -a
+ dh_builddeb -a
# Build architecture-independent files here.
binary-indep: build install
- dh_testdir
- dh_testroot
- dh_installdocs $(INSTALLREADME)
- dh_installexamples
- dh_installmenu
- dh_installcron
- dh_installman
- dh_installinfo
- $(CDD_INSTALL_HELPER)
- dh_install
- dh_installdebconf
- dh_installchangelogs
- dh_link
- dh_strip
- dh_compress
- dh_fixperms
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
+ dh_testdir -i
+ dh_testroot -i
+ dh_installdocs -i $(INSTALLREADME)
+ dh_installexamples -i
+ dh_installmenu -i
+ dh_installcron -i
+ dh_installman -i
+ dh_installinfo -i
+ if grep -q "^Architecture: \+all" debian/control ; then \
+ echo "$(CDD_INSTALL_HELPER) for architecture all" ; \
+ $(CDD_INSTALL_HELPER) ; \
+ fi
+ dh_install -i
+ dh_installdebconf -i
+ dh_installchangelogs -i
+ dh_link -i
+ dh_strip -i
+ dh_compress -i
+ dh_fixperms -i
+ dh_installdeb -i
+ dh_shlibdeps -i
+ dh_gencontrol -i
+ dh_md5sums -i
+ dh_builddeb -i
binary: binary-indep binary-arch
.PHONY: build clean binary-indep binary-arch binary install configure debian/control
Modified: cdd/trunk/cdd/templates/postinst
==============================================================================
--- cdd/trunk/cdd/templates/postinst (original)
+++ cdd/trunk/cdd/templates/postinst Tue Feb 19 15:28:54 2008
@@ -13,38 +13,42 @@
# 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#
+ # Also verify that this CDD provides special configuration
+ # If not there is no need to execute the user menu code
+ if [ -d /etc/cdd/#CDD# -a -f /etc/cdd/#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
- # Initialize debconf if not yet done
- if [ _"$DEBCONF_REDIR" = _"" ]; then
- . /usr/share/debconf/confmodule
- db_version 2.0
+ db_stop
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
-
- db_stop
fi
#DEBHELPER#
Modified: cdd/trunk/cdd/templates/postrm
==============================================================================
--- cdd/trunk/cdd/templates/postrm (original)
+++ cdd/trunk/cdd/templates/postrm Tue Feb 19 15:28:54 2008
@@ -13,40 +13,45 @@
# 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#
+ # Also verify that this CDD provides special configuration
+ # If not there is no need to execute the user menu code
+ if [ -d /etc/cdd/#CDD# -a -f /etc/cdd/#CDD#/#CDD#.conf ] ; then
- test -s /etc/cdd/cdd.conf && . /etc/cdd/cdd.conf
- test -s /etc/cdd/#CDD#/#CDD#.conf && . /etc/cdd/#CDD#/#CDD#.conf
+ test -x /usr/sbin/cdd-update-menus && /usr/sbin/cdd-update-menus -d #CDD#
- 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
+ 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
+ . /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#
+ case "$1" in
+ abort-install|abort-upgrade|failed-upgrade|upgrade)
;;
- "End of installation")
- touch /var/run/#CDD#-config.usermenu
+ 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
+ ;;
+ esac
;;
- esac
- ;;
- *)
- echo "postrm called with unknown argument \`$1'" >&2
- exit 1
- ;;
- esac
+ *)
+ echo "postrm called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
+ esac
+ fi
fi
fi
More information about the Cdd-commits
mailing list