[Cdd-commits] r431 - in cdd/trunk/cdd: . debian etc/cdd share/cdd
share/menu
CDD Subversion Commit
noreply at alioth.debian.org
Mon Oct 23 06:11:40 UTC 2006
Author: tille
Date: Mon Oct 23 06:11:32 2006
New Revision: 431
Added:
cdd/trunk/cdd/debian/cdd-common.lintian.overrides
cdd/trunk/cdd/debian/cdd-dev.lintian.overrides
Removed:
cdd/trunk/cdd/debian/lintian.overrides
Modified:
cdd/trunk/cdd/VERSION
cdd/trunk/cdd/cdd-role
cdd/trunk/cdd/cdd-update-menus
cdd/trunk/cdd/cdd-update-usermenus
cdd/trunk/cdd/cdd-user
cdd/trunk/cdd/debian/changelog
cdd/trunk/cdd/debian/compat
cdd/trunk/cdd/debian/control
cdd/trunk/cdd/debian/rules
cdd/trunk/cdd/etc/cdd/cdd.conf
cdd/trunk/cdd/share/cdd/cdd-actions
cdd/trunk/cdd/share/cdd/cdd-update-menus
cdd/trunk/cdd/share/menu/cdd-menu
Log:
Fixed bashisms (source --> .) closes #394604; Updated packaging
Modified: cdd/trunk/cdd/VERSION
==============================================================================
--- cdd/trunk/cdd/VERSION (original)
+++ cdd/trunk/cdd/VERSION Mon Oct 23 06:11:32 2006
@@ -1 +1 @@
-0.3.11
+0.3.11.1
Modified: cdd/trunk/cdd/cdd-role
==============================================================================
--- cdd/trunk/cdd/cdd-role (original)
+++ cdd/trunk/cdd/cdd-role Mon Oct 23 06:11:32 2006
@@ -1,6 +1,6 @@
#!/bin/bash
#
-# $Id: cdd-role,v 1.2 2004/04/14 11:48:36 kalfa Exp $
+# $Id$
usage () {
echo "Usage: `basename $0` <action> <CDD> [<role>]"
@@ -15,7 +15,7 @@
CONFBASE=${CONFBASE:-/etc/cdd}
# should be /usr/lib/cdd/*, file should be named differently
-source ${CONFBASE}/cdd.conf
+. ${CONFBASE}/cdd.conf
# Check consistency of passed argouments
@@ -44,7 +44,7 @@
# Now that we know the selected CDD, we can check if there is a local
# configuration for it (ie differnt backend from the default one)
test -n "${CDD}" -a -f ${CONFBASE}/${CDD}/${CDD}.conf &&
- source ${CONFBASE}/${CDD}/${CDD}.conf
+ . ${CONFBASE}/${CDD}/${CDD}.conf
if [ -n "${DBBACKEND}" ]; then
Modified: cdd/trunk/cdd/cdd-update-menus
==============================================================================
--- cdd/trunk/cdd/cdd-update-menus (original)
+++ cdd/trunk/cdd/cdd-update-menus Mon Oct 23 06:11:32 2006
@@ -1,6 +1,6 @@
#!/bin/bash
#
-# $Id: cdd-update-menus,v 1.11 2004/06/09 07:08:43 tille Exp $
+# $Id$
usage() {
echo "Usage: `basename $0` [ -u <user> | -d <CDD> ]"
@@ -15,10 +15,10 @@
CONFBASE=${CONFBASE:-/etc/cdd}
# a local per CDD conf is sourced later, after argument parsing
-source ${CONFBASE}/cdd.conf
+. ${CONFBASE}/cdd.conf
# specific utilities for cdd-update-menus
-source ${SHAREDIR}/cdd-update-menus
+. ${SHAREDIR}/cdd-update-menus
# Get command line arguments
GETOPT=`getopt -o d:u:h --long cdd:,user:,help -n "$0" -- "$@"`
@@ -95,7 +95,7 @@
# Now that we know the selected CDD, we can check if there is a local
# configuration for it (ie differnt backend from the default one)
test -n "${CDD}" -a -f ${CONFBASE}/${CDD}/${CDD}.conf &&
- source ${CONFBASE}/${CDD}/${CDD}.conf
+ . ${CONFBASE}/${CDD}/${CDD}.conf
set -e
checkCDD ${CDD} || \
Modified: cdd/trunk/cdd/cdd-update-usermenus
==============================================================================
--- cdd/trunk/cdd/cdd-update-usermenus (original)
+++ cdd/trunk/cdd/cdd-update-usermenus Mon Oct 23 06:11:32 2006
@@ -1,6 +1,6 @@
#!/bin/bash
#
-# $Id: cdd-update-usermenus,v 1.2 2004/06/26 22:03:18 tille Exp $
+# $Id$
usage() {
echo "Usage: `basename $0` <CDD>"
@@ -14,10 +14,10 @@
CONFBASE=${CONFBASE:-/etc/cdd}
# a local per CDD conf is sourced later, after argument parsing
-source ${CONFBASE}/cdd.conf
+. ${CONFBASE}/cdd.conf
# specific utilities for cdd-update-menus
-source ${SHAREDIR}/cdd-update-menus
+. ${SHAREDIR}/cdd-update-menus
if ! amI root; then
cddLog "$0 must be called by root. If you are a normal user just call update-menus ."
@@ -37,7 +37,9 @@
set +e
esac
-if [ -s /etc/cdd/${CDD}/${CDD}.conf ] ; then source /etc/cdd/${CDD}/${CDD}.conf ; fi
+if [ -s /etc/cdd/${CDD}/${CDD}.conf ] ; then
+ . /etc/cdd/${CDD}/${CDD}.conf
+fi
for ROLE in `getCDDRoleList ${CDD}`; do
for CDDUSER in `getUsersInRole ${CDD} ${ROLE} 1`; do
Modified: cdd/trunk/cdd/cdd-user
==============================================================================
--- cdd/trunk/cdd/cdd-user (original)
+++ cdd/trunk/cdd/cdd-user Mon Oct 23 06:11:32 2006
@@ -1,6 +1,6 @@
#!/bin/bash
#
-# $Id: cdd-user,v 1.4 2004/04/15 23:16:43 kalfa Exp $
+# $Id$
usage () {
echo "Usage: `basename $0` <action> <CDD> <user> [<Role>]"
@@ -17,7 +17,7 @@
CONFBASE=${CONFBASE:-/etc/cdd}
# a local per CDD conf is sourced later, after argoument parsing
-source ${CONFBASE}/cdd.conf
+. ${CONFBASE}/cdd.conf
# Check consistency of passed argouments
@@ -52,7 +52,7 @@
# Now that we know the selected CDD, we can check if there is a local
# configuration for it (ie differnt backend from the default one)
test -n "${CDD}" -a -f ${CONFBASE}/${CDD}/${CDD}.conf &&
- source ${CONFBASE}/${CDD}/${CDD}.conf
+ . ${CONFBASE}/${CDD}/${CDD}.conf
if [ -n "${DBBACKEND}" ]; then
set -e
Added: cdd/trunk/cdd/debian/cdd-common.lintian.overrides
==============================================================================
--- (empty file)
+++ cdd/trunk/cdd/debian/cdd-common.lintian.overrides Mon Oct 23 06:11:32 2006
@@ -0,0 +1,12 @@
+# The script /usr/lib/menu/cdd-menu is not intended to be called by the
+# cdd-common package but should be called by meta packages according to
+# the Custom Debian Distribution philosphy which is explained in cdd-doc.
+# That's why neither postinst nor postrm will call update-menus and
+# if they would it would just be a useless call because it just exits 0
+# if called by root.
+cdd-common: postinst-does-not-call-updatemenus usr/share/menu/cdd-menu
+cdd-common: postrm-does-not-call-updatemenus usr/share/menu/cdd-menu
+
+# For obvious reasons the script has to be executable which is the
+# intended use for scripts which dynamically create menu entries.
+cdd-common: executable-menu-file usr/share/menu/cdd-menu 0755
Added: cdd/trunk/cdd/debian/cdd-dev.lintian.overrides
==============================================================================
--- (empty file)
+++ cdd/trunk/cdd/debian/cdd-dev.lintian.overrides Mon Oct 23 06:11:32 2006
@@ -0,0 +1,5 @@
+# The scripts are not intended to be running before the template
+# variable #CDD# is replaced. The '#' sign in the template variable
+# makes the shell syntax checker fail to interpret the syntax correctly
+cdd-dev: shell-script-fails-syntax-check ./usr/share/cdd/templates/common.config
+cdd-dev: shell-script-fails-syntax-check ./usr/share/cdd/templates/common.postinst
Modified: cdd/trunk/cdd/debian/changelog
==============================================================================
--- cdd/trunk/cdd/debian/changelog (original)
+++ cdd/trunk/cdd/debian/changelog Mon Oct 23 06:11:32 2006
@@ -1,3 +1,13 @@
+cdd (0.3.11.1) unstable; urgency=low
+
+ * Remove Bashism (source --> .)
+ Closes: #394604 (of med-common, this bug did not really belong to
+ med-common but was caused by the bashism in cdd-common)
+ * Standards-Version: 3.7.2 (no changes necessary)
+ * Build-Depends: debhelper (>= 5)
+
+ -- Andreas Tille <tille at debian.org> Mon, 23 Oct 2006 07:46:58 +0200
+
cdd (0.3.11) unstable; urgency=low
* Fix problem with resulting *.dsc files that did not list the
Modified: cdd/trunk/cdd/debian/compat
==============================================================================
--- cdd/trunk/cdd/debian/compat (original)
+++ cdd/trunk/cdd/debian/compat Mon Oct 23 06:11:32 2006
@@ -1 +1 @@
-4
+5
Modified: cdd/trunk/cdd/debian/control
==============================================================================
--- cdd/trunk/cdd/debian/control (original)
+++ cdd/trunk/cdd/debian/control Mon Oct 23 06:11:32 2006
@@ -3,8 +3,8 @@
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-Indep: debhelper (>= 4.1.16)
-Standards-Version: 3.6.2
+Build-Depends: debhelper (>= 5)
+Standards-Version: 3.7.2
Package: cdd-dev
Architecture: all
Modified: cdd/trunk/cdd/debian/rules
==============================================================================
--- cdd/trunk/cdd/debian/rules (original)
+++ cdd/trunk/cdd/debian/rules Mon Oct 23 06:11:32 2006
@@ -35,7 +35,8 @@
dh_installdocs
dh_installexamples
dh_installman
- cp -a debian/lintian.overrides debian/cdd-common/usr/share/lintian/overrides/cdd-common
+ cp -a debian/cdd-common.lintian.overrides debian/cdd-common/usr/share/lintian/overrides/cdd-common
+ cp -a debian/cdd-dev.lintian.overrides debian/cdd-dev/usr/share/lintian/overrides/cdd-dev
dh_link
dh_compress
dh_fixperms
Modified: cdd/trunk/cdd/etc/cdd/cdd.conf
==============================================================================
--- cdd/trunk/cdd/etc/cdd/cdd.conf (original)
+++ cdd/trunk/cdd/etc/cdd/cdd.conf Mon Oct 23 06:11:32 2006
@@ -11,8 +11,8 @@
#DEBUG=1
# Utility functions, backend indep
-source ${SHAREDIR}/cdd-utils
-source ${SHAREDIR}/cdd-actions
+. ${SHAREDIR}/cdd-utils
+. ${SHAREDIR}/cdd-actions
# actual action performed by choosen backend
-source ${SHAREDIR}/${DBBACKEND}/cdd-actions
+. ${SHAREDIR}/${DBBACKEND}/cdd-actions
Modified: cdd/trunk/cdd/share/cdd/cdd-actions
==============================================================================
--- cdd/trunk/cdd/share/cdd/cdd-actions (original)
+++ cdd/trunk/cdd/share/cdd/cdd-actions Mon Oct 23 06:11:32 2006
@@ -1,4 +1,4 @@
-# $Id: cdd-actions,v 1.4 2004/04/18 20:43:33 kalfa Exp $
+# $Id$
#
# Backend independant functions for cdd package
#
@@ -43,8 +43,8 @@
for CDD in `getCDDList`; do
# Run a subshell as a environment sandbox
( test -f ${CONFBASE}/${CDD}/${CDD}.conf &&
- source ${CONFBASE}/${CDD}/${CDD}.conf
- source ${SHAREDIR}/${DBBACKEND}/cdd-actions
+ . ${CONFBASE}/${CDD}/${CDD}.conf
+ . ${SHAREDIR}/${DBBACKEND}/cdd-actions
checkUserInCDD ${CDD} ${CDDUSER} && exit 0
) && RET=0 && break
done
Modified: cdd/trunk/cdd/share/cdd/cdd-update-menus
==============================================================================
--- cdd/trunk/cdd/share/cdd/cdd-update-menus (original)
+++ cdd/trunk/cdd/share/cdd/cdd-update-menus Mon Oct 23 06:11:32 2006
@@ -1,4 +1,4 @@
-# $Id: cdd-update-menus,v 1.7 2004/06/26 22:03:21 tille Exp $
+# $Id$
# check if I am a specific user
amI() {
Modified: cdd/trunk/cdd/share/menu/cdd-menu
==============================================================================
--- cdd/trunk/cdd/share/menu/cdd-menu (original)
+++ cdd/trunk/cdd/share/menu/cdd-menu Mon Oct 23 06:11:32 2006
@@ -13,7 +13,7 @@
CONFBASE=${CONFBASE:-/etc/cdd}
# read generic CDD conf
-source ${CONFBASE}/cdd.conf
+. ${CONFBASE}/cdd.conf
CDDUSER=`whoami`
@@ -191,7 +191,7 @@
for CDD in ${ALLCDD}; do
# read per CDD conf
test -f ${CONFBASE}/${CDD}/${CDD}.conf && \
- source ${CONFBASE}/${CDD}/${CDD}.conf
+ . ${CONFBASE}/${CDD}/${CDD}.conf
if [ -d "$tasksdir"/"$CDD" ] ; then
for PKG in `ls "$tasksdir"/"$CDD"` ; do
More information about the Cdd-commits
mailing list