r1646 - in zope2.10/trunk/debian (9 files)

[Jonas Meurer]

    Date: Friday, July 3, 2009 @ 11:59:36
  Author: mejo
Revision: 1646

remove unused maintainer scripts and debconf templates, lintian cleanup

Modified:
  zope2.10/trunk/debian/changelog
  zope2.10/trunk/debian/zopeZVER-sandbox.copyright.in
  zope2.10/trunk/debian/zopeZVER.init.in
  zope2.10/trunk/debian/zopeZVER.postrm.in
  zope2.10/trunk/debian/zopeZVER.preinst.in
  zope2.10/trunk/debian/zopeZVER.prerm.in
Deleted:
  zope2.10/trunk/debian/zopeZVER-sandbox.postinst.in
  zope2.10/trunk/debian/zopeZVER-sandbox.templates.in
  zope2.10/trunk/debian/zopeZVER.postinst.in

Modified: zope2.10/trunk/debian/changelog
===================================================================
--- zope2.10/trunk/debian/changelog	2009-07-03 11:31:23 UTC (rev 1645)
+++ zope2.10/trunk/debian/changelog	2009-07-03 11:59:36 UTC (rev 1646)
@@ -4,8 +4,13 @@
     parallel building. Still disable parallel building for now, as suggested
     by Lucas Nussbaum. (closes: #533975)
   * Bump standards-version to 3.8.2, no changes needed.
+  * Check for /etc/default/zope2.10 before including it in initscript.
+  * lintian cleanup:
+    - zopeZVER-sandbox.copyright.in: link to GPL-2 instead of GPL.
+    - *.{post|pre}{inst|rm}: use set -e instead of /bin/sh -e.
+    - remove unused debconf templates and postinst maintainer scripts.
 
- -- Jonas Meurer <mejo at debian.org>  Fri, 03 Jul 2009 13:23:34 +0200
+ -- Jonas Meurer <mejo at debian.org>  Fri, 03 Jul 2009 13:54:05 +0200
 
 zope2.10 (2.10.8-1) unstable; urgency=low
 

Modified: zope2.10/trunk/debian/zopeZVER-sandbox.copyright.in
===================================================================
--- zope2.10/trunk/debian/zopeZVER-sandbox.copyright.in	2009-07-03 11:31:23 UTC (rev 1645)
+++ zope2.10/trunk/debian/zopeZVER-sandbox.copyright.in	2009-07-03 11:59:36 UTC (rev 1646)
@@ -2,4 +2,4 @@
 
 This package was created and released by the Debian Zope team, under 
 the terms of the Gnu General Public License, version 2 or later.
-See /usr/share/common-licenses/GPL for the full text of that license.
+See /usr/share/common-licenses/GPL-2 for the full text of that license.

Deleted: zope2.10/trunk/debian/zopeZVER-sandbox.postinst.in
===================================================================
--- zope2.10/trunk/debian/zopeZVER-sandbox.postinst.in	2009-07-03 11:31:23 UTC (rev 1645)
+++ zope2.10/trunk/debian/zopeZVER-sandbox.postinst.in	2009-07-03 11:59:36 UTC (rev 1646)
@@ -1,7 +0,0 @@
-#!/bin/sh -e
-
-. /usr/share/debconf/confmodule
-
-#DEBHELPER#
-
-db_stop

Deleted: zope2.10/trunk/debian/zopeZVER-sandbox.templates.in
===================================================================
--- zope2.10/trunk/debian/zopeZVER-sandbox.templates.in	2009-07-03 11:31:23 UTC (rev 1645)
+++ zope2.10/trunk/debian/zopeZVER-sandbox.templates.in	2009-07-03 11:59:36 UTC (rev 1646)
@@ -1,3 +0,0 @@
-Template: zope at ZVER@-sandbox/internal
-Type: note
-Description: Internal use

Modified: zope2.10/trunk/debian/zopeZVER.init.in
===================================================================
--- zope2.10/trunk/debian/zopeZVER.init.in	2009-07-03 11:31:23 UTC (rev 1645)
+++ zope2.10/trunk/debian/zopeZVER.init.in	2009-07-03 11:59:36 UTC (rev 1646)
@@ -16,8 +16,11 @@
 [ -d /var/lib/zope$ZVER/instance -a -d /var/lib/zope$ZVER/zeo -a -d /usr/lib/zope$ZVER ] || exit 0
 
 . /lib/lsb/init-functions
-. /etc/default/zope$ZVER
 
+if [ -f "/etc/default/zope$ZVER" ]; then
+	. /etc/default/zope$ZVER
+fi
+
 if [ "$ZEOSERVERS" = "NONE" -o "$ZEOSERVERS" = "" ]; then
     ZEOSERVERS=''
     log_warning_msg "Zope$ZVER: ZEO servers have been disabled, edit /etc/default/zope$ZVER to enable them."

Deleted: zope2.10/trunk/debian/zopeZVER.postinst.in
===================================================================
--- zope2.10/trunk/debian/zopeZVER.postinst.in	2009-07-03 11:31:23 UTC (rev 1645)
+++ zope2.10/trunk/debian/zopeZVER.postinst.in	2009-07-03 11:59:36 UTC (rev 1646)
@@ -1,8 +0,0 @@
-#!/bin/sh -e
-
-. /usr/share/debconf/confmodule
-
-#DEBHELPER#
-
-db_stop
-exit 0

Modified: zope2.10/trunk/debian/zopeZVER.postrm.in
===================================================================
--- zope2.10/trunk/debian/zopeZVER.postrm.in	2009-07-03 11:31:23 UTC (rev 1645)
+++ zope2.10/trunk/debian/zopeZVER.postrm.in	2009-07-03 11:59:36 UTC (rev 1646)
@@ -1,5 +1,7 @@
-#!/bin/sh -e
+#!/bin/sh
 
+set -e
+
 zope=zope at ZVER@
 
 delete_pyo_pyc () {

Modified: zope2.10/trunk/debian/zopeZVER.preinst.in
===================================================================
--- zope2.10/trunk/debian/zopeZVER.preinst.in	2009-07-03 11:31:23 UTC (rev 1645)
+++ zope2.10/trunk/debian/zopeZVER.preinst.in	2009-07-03 11:59:36 UTC (rev 1646)
@@ -1,5 +1,7 @@
-#! /bin/sh -e
+#!/bin/sh
 
+set -e
+
 # summary of how this script can be called:
 #        * <new-preinst> `install'
 #        * <new-preinst> `install' <old-version>

Modified: zope2.10/trunk/debian/zopeZVER.prerm.in
===================================================================
--- zope2.10/trunk/debian/zopeZVER.prerm.in	2009-07-03 11:31:23 UTC (rev 1645)
+++ zope2.10/trunk/debian/zopeZVER.prerm.in	2009-07-03 11:59:36 UTC (rev 1646)
@@ -1,5 +1,7 @@
-#!/bin/sh -e
+#!/bin/sh
 
+set -e
+
 zope=zope at ZVER@
 
 dpkg -L zope at ZVER@ |