[interchange-cvs] [SCM] Interchange branch, master, updated. REL_5_7_3-9-g62dd067
Stefan Hornburg
interchange-cvs at icdevgroup.org
Wed Nov 11 12:27:45 UTC 2009
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Interchange".
The branch, master has been updated
via 62dd0670f886a2fb41e8e50100e42cc9f2f7fe79 (commit)
from 99154be99c74ca402fbd063aca09e94de8e77535 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 62dd0670f886a2fb41e8e50100e42cc9f2f7fe79
Author: Stefan Hornburg (Racke) <racke at linuxia.de>
Date: Fri Nov 6 13:48:58 2009 +0100
eliminated commands with absolute paths in maintainer scripts
-----------------------------------------------------------------------
Summary of changes and diff:
debian/interchange-cat-standard.postinst | 2 +-
debian/interchange-cat-standard.prerm | 6 +++---
debian/interchange-ui.postinst | 4 ++--
debian/interchange-ui.postrm | 6 +++---
debian/interchange-ui.prerm | 4 ++--
debian/interchange.config | 4 ++--
debian/interchange.postinst | 2 +-
7 files changed, 14 insertions(+), 14 deletions(-)
mode change 100644 => 100755 debian/interchange-cat-standard.postinst
mode change 100644 => 100755 debian/interchange-cat-standard.prerm
mode change 100644 => 100755 debian/interchange-ui.postinst
mode change 100644 => 100755 debian/interchange-ui.postrm
mode change 100644 => 100755 debian/interchange-ui.prerm
mode change 100644 => 100755 debian/interchange.postinst
diff --git a/debian/interchange-cat-standard.postinst b/debian/interchange-cat-standard.postinst
old mode 100644
new mode 100755
index 9def273..219ca36
--- a/debian/interchange-cat-standard.postinst
+++ b/debian/interchange-cat-standard.postinst
@@ -155,7 +155,7 @@ Catalog standard /var/lib/interchange/catalogs/standard $URLS
EOF
if [ ! -f /var/run/interchange-install ]; then
# add catalog to running server
- echo "Catalog standard /var/lib/interchange/catalogs/standard $URLS" | /usr/sbin/interchange --add standard
+ echo "Catalog standard /var/lib/interchange/catalogs/standard $URLS" | interchange --add standard
fi
fi
diff --git a/debian/interchange-cat-standard.prerm b/debian/interchange-cat-standard.prerm
old mode 100644
new mode 100755
index 526dad6..ebb1f0f
--- a/debian/interchange-cat-standard.prerm
+++ b/debian/interchange-cat-standard.prerm
@@ -1,6 +1,6 @@
#! /bin/sh -e
#
-# Copyright 2001,2004,2005,2008 by Stefan Hornburg (Racke) <racke at linuxia.de>
+# Copyright 2001,2004,2005,2008,2009 by Stefan Hornburg (Racke) <racke at linuxia.de>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -24,13 +24,13 @@
. /usr/share/dbconfig-common/dpkg/prerm
dbc_go interchange-cat-standard $@
-/usr/sbin/interchangeconfig USE_STANDARD=
+interchangeconfig USE_STANDARD=
db_get interchange-cat-standard/install
if [ "$RET" = "true" ]; then
if [ ! -f /var/run/interchange-install ]; then
# remove catalog from running server
- /usr/sbin/interchange --remove=standard || true
+ interchange --remove=standard || true
rm -f /var/lib/interchange/catalog.d/interchange-cat-standard.cfg
fi
fi
diff --git a/debian/interchange-ui.postinst b/debian/interchange-ui.postinst
old mode 100644
new mode 100755
index 8eed9f6..c7f07f8
--- a/debian/interchange-ui.postinst
+++ b/debian/interchange-ui.postinst
@@ -1,6 +1,6 @@
#! /bin/sh -e
#
-# Copyright 2001,2006 by Stefan Hornburg (Racke) <racke at linuxia.de>
+# Copyright 2001,2006,2009 by Stefan Hornburg (Racke) <racke at linuxia.de>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -34,7 +34,7 @@ fi
db_get interchange-ui/defaultlocale
UI_LOCALE=$RET
-/usr/sbin/interchangeconfig UI=1 UI_LOCALE=$UI_LOCALE USE_FOUNDATION=$USE_FOUNDATION
+interchangeconfig UI=1 UI_LOCALE=$UI_LOCALE USE_FOUNDATION=$USE_FOUNDATION
#DEBHELPER#
diff --git a/debian/interchange-ui.postrm b/debian/interchange-ui.postrm
old mode 100644
new mode 100755
index 02d841a..37d74f7
--- a/debian/interchange-ui.postrm
+++ b/debian/interchange-ui.postrm
@@ -1,6 +1,6 @@
#! /bin/sh -e
#
-# Copyright 2001,2006,2007 by Stefan Hornburg (Racke) <racke at linuxia.de>
+# Copyright 2001,2006,2007,2009 by Stefan Hornburg (Racke) <racke at linuxia.de>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -29,8 +29,8 @@ if [ "$1" = "remove" ]; then
fi
fi
- if [ -x /usr/sbin/interchangeconfig ]; then
- /usr/sbin/interchangeconfig UI= USE_FOUNDATION=
+ if which interchangeconfig > /dev/null 2>&1; then
+ interchangeconfig UI= USE_FOUNDATION=
fi
# We use the file /var/run/interchange-install to record
diff --git a/debian/interchange-ui.prerm b/debian/interchange-ui.prerm
old mode 100644
new mode 100755
index cde112b..ce4400b
--- a/debian/interchange-ui.prerm
+++ b/debian/interchange-ui.prerm
@@ -1,6 +1,6 @@
#! /bin/sh -e
#
-# Copyright 2001,2006 by Stefan Hornburg (Racke) <racke at linuxia.de>
+# Copyright 2001,2006,2009 by Stefan Hornburg (Racke) <racke at linuxia.de>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -26,7 +26,7 @@ else
/etc/init.d/interchange stop
fi
-/usr/sbin/interchangeconfig UI= USE_FOUNDATION=
+interchangeconfig UI= USE_FOUNDATION=
# We use the file /var/run/interchange-install to record
# the installed interchange packages, so only one server
diff --git a/debian/interchange.config b/debian/interchange.config
index 6d94f83..7cd1a6b 100755
--- a/debian/interchange.config
+++ b/debian/interchange.config
@@ -1,6 +1,6 @@
#! /bin/sh -e
#
-# Copyright 2000,2001,2002,2003,2004,2005,2007 by Stefan Hornburg (Racke) <racke at linuxia.de>
+# Copyright 2000,2001,2002,2003,2004,2005,2007,2009 by Stefan Hornburg (Racke) <racke at linuxia.de>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -155,7 +155,7 @@ db_input low interchange/full_url || [ $? -eq 30 ]
db_go
# SOAP server
-if /usr/bin/perl -MSOAP::Lite -e '' 2>/dev/null; then
+if perl -MSOAP::Lite -e '' 2>/dev/null; then
db_set interchange/cansoap true
db_input low interchange/soap || [ $? -eq 30 ]
else
diff --git a/debian/interchange.postinst b/debian/interchange.postinst
old mode 100644
new mode 100755
index 7d5bcfb..081fbb3
--- a/debian/interchange.postinst
+++ b/debian/interchange.postinst
@@ -107,7 +107,7 @@ fi
db_get interchange/traffic
TRAFFIC="$RET"
-/usr/sbin/interchangeconfig FULL_URL=$FULL_URL SOAP=$SOAP TRAFFIC=$RET
+interchangeconfig FULL_URL=$FULL_URL SOAP=$SOAP TRAFFIC=$RET
# Make configuration files owned by the interchange user
chown -R $USER.$GROUP /etc/interchange
hooks/post-receive
--
Interchange
More information about the interchange-cvs
mailing list