Drop postinst/preinst; update copyright and overrides files

diff --git a/debian/changelog b/debian/changelog
index 873771c..7f08ce0 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,16 +1,20 @@
 grml-scripts (1.1.24) unstable; urgency=low
 
-  * grml-setlang: do not set $LANGUAGE and $LC_MESSAGES any longer, but
-    instead just set $LANG and $LC_CTYPE. $LC_CTYPE is set to 'en_US.UTF-8'
-    by default and to 'C' if using a ISO system - this should avoid breakages
-    if logging in to a remote system where the according $LANG locale isn't
-    available. Thanks to Gebi and Thorsten 'mira' Glaser for discussing
-    the issue.
-  * Install wm-ng as x-window-manager alternative.
-  * Bump Standard-Version to 3.8.2 (no further changes).
-  * Bump Build-Depends on dh >=5.
-
- -- Michael Prokop <mika@grml.org>  Fri, 07 Aug 2009 19:16:17 +0200
+  * grml-setlang: do not set $LANGUAGE and $LC_MESSAGES any longer,
+    but instead just set $LANG and $LC_CTYPE. $LC_CTYPE is set to
+    'en_US.UTF-8' by default and to 'C' if using a ISO system - this
+    should avoid breakages if logging in to a remote system where the
+    according $LANG locale isn't available. Thanks to Gebi and Thorsten
+    'mira' Glaser for discussing the issue.
+  * Debian packaging:
+    - Install wm-ng as x-window-manager alternative.
+    - Bump Standard-Version to 3.8.2 (no further changes).
+    - Bump Build-Depends on dh >=5.
+    - Update copyright file and overrides to make lintian happy.
+    - Drop postinst and preinst files. The [ef]grep stuff was from the
+      very beginnings of grml and should not affect any systems anymore.
+
+ -- Michael Prokop <mika@grml.org>  Fri, 07 Aug 2009 19:24:35 +0200
 
 grml-scripts (1.1.23) unstable; urgency=low
 

diff --git a/debian/copyright b/debian/copyright
index c581bdc..97af204 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -7,9 +7,11 @@ Upstream Author: Michael Prokop <mika@grml.org>
 
 Copyright:
 
-This packages contains several scripts from several people.
-Please see the copyright information in the scripts for more details.
-Scripts by the grml-team are licensed under GPL v2.
+   Copyright (c) 2003+ by the grml team and others.
+
+   This packages contains several scripts from several people.
+   Please see the copyright information in the scripts for more details.
+   Scripts by the grml-team are licensed under GPL v2.
 
 On Debian GNU/Linux systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
+Public License can be found in `/usr/share/common-licenses/GPL-2'.

diff --git a/debian/overrides b/debian/overrides
index 6c3c9ce..a9ebd8b 100644 (file)
--- a/debian/overrides
+++ b/debian/overrides
@@ -10,6 +10,7 @@ grml-scripts: script-with-language-extension usr/bin/irclog2html-2.1.pl
 grml-scripts: script-with-language-extension usr/bin/lesspipe.sh
 grml-scripts: script-with-language-extension usr/bin/osd_server.py
 grml-scripts: script-with-language-extension usr/bin/sepdate.pl
+grml-scripts: script-with-language-extension usr/bin/sepdate.rb
 grml-scripts: script-with-language-extension usr/bin/sepdate.sh
 grml-scripts: script-with-language-extension usr/bin/tinyp2p.py
 grml-scripts: script-with-language-extension usr/bin/unbleach.pl

diff --git a/debian/postinst b/debian/postinst
deleted file mode 100755 (executable)
index bcb01fd..0000000
--- a/debian/postinst
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh
-# Filename:      postinst
-# Purpose:       postinst script for package grml-scripts
-# Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
-# Bug-Reports:   see http://grml.org/bugs/
-# License:       This file is licensed under the GPL v2.
-# Latest change: Son Okt 28 17:37:25 CET 2007 [mika]
-################################################################################
-
-set -e
-
-case "$1" in
-   configure)
-
-     [ -f /bin/egrep.dpkg-bak ] && mv /bin/egrep.dpkg-bak /bin/egrep
-     [ -f /bin/egrep.old      ] && rm /bin/egrep.old
-     [ -f /bin/fgrep.dpkg-bak ] && mv /bin/fgrep.dpkg-bak /bin/fgrep
-     [ -f /bin/fgrep.old      ] && rm /bin/fgrep.old
-
-     ;;
-
-   *)
-     exit 0
-esac
-
-exit 0
-
-## END OF FILE #################################################################

diff --git a/debian/preinst b/debian/preinst
deleted file mode 100755 (executable)
index 6a56568..0000000
--- a/debian/preinst
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/sh
-# Filename:      preinst
-# Purpose:       preinst script for package grml-scripts
-# Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
-# Bug-Reports:   see http://grml.org/bugs/
-# License:       This file is licensed under the GPL v2.
-# Latest change: Son Okt 28 17:37:29 CET 2007 [mika]
-################################################################################
-
-set -e
-
-case "$1" in
-   upgrade)
-
-     # remove (nowadays deprecated) "dpkg-divert"ion of [ef]grep
-     dpkg-divert --list /bin/egrep | grep grml-scripts && \
-     mv /bin/egrep /bin/egrep.old && \
-     cp /bin/egrep.original /bin/egrep.dpkg-bak && \
-     dpkg-divert --quiet --package grml-scripts --remove --rename --divert /bin/egrep.original /bin/egrep
-
-     dpkg-divert --list /bin/fgrep | grep grml-scripts && \
-     mv /bin/fgrep /bin/fgrep.old && \
-     cp /bin/fgrep.original /bin/fgrep.dpkg-bak && \
-     dpkg-divert --quiet --package grml-scripts --remove --rename --divert /bin/fgrep.original /bin/fgrep
-
-     ;;
-   *)
-     exit 0
-esac
-
-exit 0
-
-## END OF FILE #################################################################