some work on debian/control and at the installation scripts

6 files changed, 30 insertions, 142 deletions

diff --git a/debian/changelog b/debian/changelog
index d340e8c..36a19ce 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,35 +12,22 @@ libonig (5.9.6-1) unstable; urgency=medium
   * debian/control:
     - Remove useless Depends ${shlibs:Depends} from libonig2-dbg
       and libonig-dev
-    - Add dpkg to Depends of libonig2-dbg to prevent
-      error on upgrade wheezy to jessie. (Closes: #769556).
+    - Add dpkg and ${misc:Pre-Depends} to Depends of libonig2-dbg 
+      to prevent error on upgrade wheezy to jessie (Closes: #769556).
     - Bump Standards-Version to 3.9.6 (no changes required).
     - Add Vcs-* fields pointed to alioth.
     - Remove deprecated hardening-wrapper from Build-Depends
       (Closes: #774485).
+    - Rewrite Descriptions (Closes: #774520).
   * debian/*.postrm, debian/*.postinst, debian/*.preinst:
-    - Change version in calls of dpkg-maintscript-helper symlink_to_dir
-      to 5.9.6-1~.
-  * Revert unwanted NMUs 5.9.5-3.1 & 5.9.5-3.2, replace with own version.
+    - Delete them and move the dpkg-maintscript-helper to
+      debian/libonig2-dbg.maintscript.
+  * New debian/libonig2-dbg.maintscript:
+    - Add symlink_to_dir calls.
+    - Change version in calls of symlink_to_dir to 5.9.6-1~.
   * Add Vcs
 
- -- Jörg Frings-Fürst <debian@jff-webhosting.net>  Sat, 03 Jan 2015 14:04:23 +0100
-
-libonig (5.9.5-3.2) unstable; urgency=medium
-
-  * Non-maintainer upload.
-  * Fix version for calls to dpkg-maintscript-helper symlink_to_dir.
-    (closes: #769556).
-
- -- Ivo De Decker <ivodd@debian.org>  Sun, 28 Dec 2014 12:11:12 +0100
-
-libonig (5.9.5-3.1) unstable; urgency=high
-
-  * Non-maintainer upload.
-  * Add missing pre-dependency on dpkg for dpkg-maintscript-helper
-    symlink_to_dir (closes: #769556).
-
- -- Julien Cristau <jcristau@debian.org>  Sat, 15 Nov 2014 11:53:45 +0100
+ -- Jörg Frings-Fürst <debian@jff-webhosting.net>  Sun, 04 Jan 2015 14:17:44 +0100
 
 libonig (5.9.5-3) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index e14b510..03aa026 100644
--- a/debian/control
+++ b/debian/control
@@ -14,29 +14,32 @@ Package: libonig2
 Priority: optional
 Architecture: any
 Multi-Arch: same
-Depends: 
+Depends:
  ${misc:Depends},
  ${shlibs:Depends}
 Pre-Depends:
  ${misc:Pre-Depends}
-Description: Oniguruma regular expressions library
- The characteristics of this library is that different
- character encoding for every regular expression object 
- can be specified.
+Description: regular expressions library
+ Oniguruma is a library for working with regular expressions.
+ .
+ Different character encoding for every regular expression object can
+ be specified.
 
 Package: libonig2-dbg
 Section: debug
 Architecture: any
 Multi-Arch: same
-Depends: 
+Depends:
  ${misc:Depends},
  libonig2 (= ${binary:Version})
 Pre-Depends:
- dpkg (>= 1.17.21)
-Description: Debugging symbols for libonig2
- The characteristics of this library is that different 
- character encoding for every regular expression object 
- can be specified.
+ ${misc:Pre-Depends},
+ dpkg
+Description: regular expressions library — debugging symbols
+ Oniguruma is a library for working with regular expressions.
+ .
+ Different character encoding for every regular expression object can
+ be specified.
  .
  This package provides the debugging symbols.
 
@@ -44,12 +47,13 @@ Package: libonig-dev
 Section: libdevel
 Priority: optional
 Architecture: any
-Depends: 
+Depends:
  ${misc:Depends},
  libonig2 (= ${binary:Version})
-Description: Development files for libonig2
- The characteristics of this library is that different 
- character encoding for every regular expression object 
- can be specified.
+Description: regular expressions library — development files
+ Oniguruma is a library for working with regular expressions.
+ .
+ Different character encoding for every regular expression object can
+ be specified.
  .
  This package provides development files and static libraries.
diff --git a/debian/libonig2-dbg.maintscript b/debian/libonig2-dbg.maintscript
new file mode 100644
index 0000000..3e20b43
--- /dev/null
+++ b/debian/libonig2-dbg.maintscript
@@ -0,0 +1 @@
+symlink_to_dir /usr/share/doc/libonig2-dbg /usr/share/doc/libonig2 5.9.6-1~
diff --git a/debian/libonig2-dbg.postinst b/debian/libonig2-dbg.postinst
deleted file mode 100644
index a749289..0000000
--- a/debian/libonig2-dbg.postinst
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/sh
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-#        * <postinst> `configure' <most-recently-configured-version>
-#        * <old-postinst> `abort-upgrade' <new version>
-#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
-#          <new-version>
-#        * <postinst> `abort-remove'
-#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
-#          <failed-install-package> <version> `removing'
-#          <conflicting-package> <version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-# source debconf library
-#. /usr/share/debconf/confmodule
-
-
-case "$1" in
-
-  configure|abort-upgrade|abort-remove|abort-deconfigure)
-    # Replace documentation directory symlink
-    dpkg-maintscript-helper symlink_to_dir /usr/share/doc/libonig2-dbg /usr/share/doc/libonig2 5.9.6-1~ -- "$@"
-  ;;
-
-  *)
-    echo "postinst called with unknown argument \`$1'" >&2
-    exit 1
-  ;;
-
-esac
-
-#DEBHELPER#
-
-
-exit 0
diff --git a/debian/libonig2-dbg.postrm b/debian/libonig2-dbg.postrm
deleted file mode 100644
index 70afa31..0000000
--- a/debian/libonig2-dbg.postrm
+++ /dev/null
@@ -1,33 +0,0 @@
-#! /bin/sh
-# postrm script for argyll
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-#        * <postrm> `remove'
-#        * <postrm> `purge'
-#        * <old-postrm> `upgrade' <new-version>
-#        * <new-postrm> `failed-upgrade' <old-version>
-#        * <new-postrm> `abort-install'
-#        * <new-postrm> `abort-install' <old-version>
-#        * <new-postrm> `abort-upgrade' <old-version>
-#        * <disappearer's-postrm> `disappear' <r>overwrit>r> <new-version>
-# for details, see /usr/share/doc/packaging-manual/
-
-case "$1" in
-    purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
-	dpkg-maintscript-helper symlink_to_dir /usr/share/doc/libonig2-dbg /usr/share/doc/libonig2 5.9.6-1~ -- "$@"
-        ;;
-
-    *)
-        echo "postrm called with unknown argument \`$1'" >&2
-        exit 0
-
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
diff --git a/debian/libonig2-dbg.preinst b/debian/libonig2-dbg.preinst
deleted file mode 100644
index 988f802..0000000
--- a/debian/libonig2-dbg.preinst
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/sh
-# preinst script for #PACKAGE#
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-#        * <new-preinst> `install'
-#        * <new-preinst> `install' <old-version>
-#        * <new-preinst> `upgrade' <old-version>
-#        * <old-preinst> `abort-upgrade' <new-version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-case "$1" in
-    install|upgrade|abort-upgrade)
-	dpkg-maintscript-helper symlink_to_dir /usr/share/doc/libonig2-dbg /usr/share/doc/libonig2 5.9.6-1~ -- "$@"
-	;;
-    *)
-        echo "preinst called with unknown argument \`$1'" >&2
-        exit 1
-	;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0