shishi-debian changelog control copyright shish...

[Simon Josefsson]

CVSROOT:        /sources/shishi
Module name:    shishi-debian
Changes by:     Simon Josefsson <jas>   12/03/12 19:37:31

Modified files:
        .              : changelog control copyright shishi-kdc.init.d 

Log message:
        Update copyright file. Implement init.d 'status' action.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/shishi-debian/changelog?cvsroot=shishi&r1=1.134&r2=1.135
http://cvs.savannah.gnu.org/viewcvs/shishi-debian/control?cvsroot=shishi&r1=1.75&r2=1.76
http://cvs.savannah.gnu.org/viewcvs/shishi-debian/copyright?cvsroot=shishi&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/shishi-debian/shishi-kdc.init.d?cvsroot=shishi&r1=1.8&r2=1.9

Patches:
Index: changelog
===================================================================
RCS file: /sources/shishi/shishi-debian/changelog,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -b -r1.134 -r1.135
--- changelog   12 Mar 2012 19:18:45 -0000      1.134
+++ changelog   12 Mar 2012 19:37:31 -0000      1.135
@@ -1,7 +1,10 @@
 shishi (1.0.1-1) unstable; urgency=low
 
   * New upstream version.
+  * Update copyright file.
   * Update standards version to 3.9.3 (no changes required).
+  * Implement init.d 'status' action as suggested on
+    http://wiki.debian.org/LSBInitScripts/StatusSupport
 
  -- Simon Josefsson <address@hidden>  Mon, 12 Mar 2012 20:18:02 +0100
 

Index: control
===================================================================
RCS file: /sources/shishi/shishi-debian/control,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -b -r1.75 -r1.76
--- control     12 Mar 2012 19:18:45 -0000      1.75
+++ control     12 Mar 2012 19:37:31 -0000      1.76
@@ -146,7 +146,7 @@
 
 Package: shishi-kdc
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, lsb-base (>= 3.0-6)
+Depends: ${shlibs:Depends}, ${misc:Depends}, lsb-base
 Suggests: shishi-doc, shisa
 Description: Kerberos v5 Key Distribution Center (KDC) Shishi server daemon
  Shishi is an implementation of the kerberos v5 network authentication

Index: copyright
===================================================================
RCS file: /sources/shishi/shishi-debian/copyright,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- copyright   6 Oct 2009 15:04:44 -0000       1.23
+++ copyright   12 Mar 2012 19:37:31 -0000      1.24
@@ -8,7 +8,7 @@
   and others (very few files, see below).
 
 Files: *
-Copyright: Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009  Simon 
Josefsson
+Copyright: Copyright (C) 2002-2012 Simon Josefsson
 License: GPL-3+
  The entire package is licensed under GPL version 3, or (at your
  option) any later version.  On Debian systems, the complete text of
@@ -18,7 +18,7 @@
  Most files in lib/ and src/ have a license like this, for example
  quoting lib/version.c:
  .
- * Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007  Simon Josefsson
+ * Copyright (C) 2002-2012 Simon Josefsson
  *
  * This file is part of Shishi.
  *
@@ -38,9 +38,9 @@
  * 02110-1301, USA
 
 Files: doc/shishi.texi
-Copyright: Copyright 2002-2009 Simon Josefsson
+Copyright: Copyright 2002-2012 Simon Josefsson.
 License: GFDL-1.3+
-  Copyright @copyright{} 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Simon 
Josefsson.
+ Copyright @copyright{} 2002-2012 Simon Josefsson.
  .
   Permission is granted to copy, distribute and/or modify this document
   under the terms of the GNU Free Documentation License, Version 1.3 or
@@ -54,19 +54,30 @@
  `/usr/share/common-licenses/GFDL-1.3'.
 
 Files: doc/gdoc
-Copyright: Copyright (c) 2002, 2003, 2004, 2005, 2006, 2007 Simon Josefsson
+Copyright: Copyright (c) 2002, 2003, 2004, 2005, 2006, 2007, 2008 Simon 
Josefsson
+Copyright: Copyright (c) 2001, 2002 Nikos Mavrogiannopoulos
 Copyright: Copyright (c) 1998 Michael Zucchi
 License: GPL-3+
- ## This software falls under the GNU Public License. Please read ##
- ##              the COPYING file for more information            ##
+ # 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
+ # the Free Software Foundation, either version 3 of the License, or
+ # (at your option) any later version.
+ #
+ # This program is distributed in the hope that it will be useful,
+ # but WITHOUT ANY WARRANTY; without even the implied warranty of
+ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ # GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 Files: lib/resolv.c
-Copyright: Copyright (C) 2003, 2004  Simon Josefsson
+Copyright: Copyright (C) 2003-2012  Simon Josefsson
 Copyright: Copyright (C) 2002 Jeremie Miller, Thomas Muldowney, Ryan Eatmon, 
Robert Norris
 License: GPL-3+
 
 Files: lib/kerberos.asn1
-Copyright: Copyright (C) 2002, 2003, 2004, 2006, 2007  Simon Josefsson
+Copyright: Copyright (C) 2002-2012 Simon Josefsson
 License: GPL-3+
 -- This rest of this file is taken from appendix A of RFC 4120,
 -- http://www.ietf.org/rfc/rfc4120.txt (MD5
@@ -159,7 +170,7 @@
  * 02110-1301, USA
 
 Files: debian/*
-Copyright: Copyright 2005-2009, Simon Josefsson <address@hidden>
+Copyright: Copyright 2005-2012, Simon Josefsson <address@hidden>
 Copyright: Copyright 2005-2008, Russ Allbery <address@hidden>
 Copyright: Copyright 2009, Petter Reinholdtsen <address@hidden>
 License: GPL-3+

Index: shishi-kdc.init.d
===================================================================
RCS file: /sources/shishi/shishi-debian/shishi-kdc.init.d,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- shishi-kdc.init.d   18 Mar 2010 09:33:32 -0000      1.8
+++ shishi-kdc.init.d   12 Mar 2012 19:37:31 -0000      1.9
@@ -70,6 +70,9 @@
 }
 
 case "$1" in
+  status)
+       status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $?
+       ;;
   start)
        [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME"
        do_start