shishi-debian changelog copyright shishi-kdc.po...

[Simon Josefsson]

CVSROOT:        /sources/shishi
Module name:    shishi-debian
Changes by:     Simon Josefsson <jas>   09/10/06 15:04:44

Modified files:
        .              : changelog copyright 
Added files:
        .              : shishi-kdc.postinst 

Log message:
        Add postinst script to fix upgrades, from pere.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/shishi-debian/changelog?cvsroot=shishi&r1=1.111&r2=1.112
http://cvs.savannah.gnu.org/viewcvs/shishi-debian/copyright?cvsroot=shishi&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/shishi-debian/shishi-kdc.postinst?cvsroot=shishi&rev=1.5

Patches:
Index: changelog
===================================================================
RCS file: /sources/shishi/shishi-debian/changelog,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -b -r1.111 -r1.112
--- changelog   18 Aug 2009 19:23:24 -0000      1.111
+++ changelog   6 Oct 2009 15:04:44 -0000       1.112
@@ -3,8 +3,12 @@
   [ Simon Josefsson ]
   * Update to policy 3.8.3, no package changes required.
   * Made shishi-kdc suggest shisa, typical KDCs will need it.
-  * Fix Default-Start/Default-Stop in shishi-kdc's init.d script,
-    patch from Petter Reinholdtsen <address@hidden>. (closes: #542112)
+  * Fix shishi-kdc's init.d script. (closes: #542112)
+    - Fix Default-Start/Default-Stop in shishi-kdc's init.d script,
+      patch from Petter Reinholdtsen <address@hidden>.
+    - Make sure upgrades from earlier shishi-kdc packages have the
+      correct start/kill symlinks, patch from Petter Reinholdtsen
+      <address@hidden>.
   * Add $time to Request-Start/Stop because a KDC needs proper time.
 
  -- Simon Josefsson <address@hidden>  Tue, 28 Jul 2009 15:47:00 +0200

Index: copyright
===================================================================
RCS file: /sources/shishi/shishi-debian/copyright,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- copyright   15 Apr 2009 10:43:26 -0000      1.22
+++ copyright   6 Oct 2009 15:04:44 -0000       1.23
@@ -161,11 +161,12 @@
 Files: debian/*
 Copyright: Copyright 2005-2009, Simon Josefsson <address@hidden>
 Copyright: Copyright 2005-2008, Russ Allbery <address@hidden>
+Copyright: Copyright 2009, Petter Reinholdtsen <address@hidden>
 License: GPL-3+
-    The package files were written by Simon Josefsson and Russ
-    Allbery, and are copyright 2005, 2006, 2007, 2008, 2009, and may
-    be redistributed and/or modified under the terms of the GNU
-    General Public License as published by the Free Software
+    The package files were written by Simon Josefsson, Russ Allbery,
+    and Petter Reinholdtsen and are copyright 2005, 2006, 2007, 2008,
+    2009, and may be redistributed and/or modified under the terms of
+    the GNU General Public License as published by the Free Software
     Foundation; either version 3 of the License, or (at your option)
     any later version.  On Debian systems, the complete text of the
     GNU General Public License version 3 can be found in the file

Index: shishi-kdc.postinst
===================================================================
RCS file: shishi-kdc.postinst
diff -N shishi-kdc.postinst
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ shishi-kdc.postinst 6 Oct 2009 15:04:44 -0000       1.5
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+# Written by Petter Reinholdtsen <address@hidden> see
+# http://bugs.debian.org/542112
+
+set -e
+
+# Recover from incorrect init.d script headers in version 0.0.40-1 and earlier
+if [ "$1" = "configure" ] && dpkg --compare-versions "$2" le "0.0.40-1" \
+   && [ -f /etc/rc3.d/S[0-9][0-9]shishi-kdc ] \
+   && [ -f /etc/rc2.d/K[0-9][0-9]shishi-kdc ] ; then
+    update-rc.d -f shishi-kdc remove
+fi
+
+#DEBHELPER#