Fix unhandled symlink to directory conversion

9 files changed, 23 insertions, 133 deletions

diff --git a/debian/changelog b/debian/changelog
index c6489b0..b52d75c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+xbase64 (3.1.2-10) unstable; urgency=medium
+
+  * Fix unhandled symlink to directory conversion (Closes: #843467):
+    - debian/control: 
+      + Add Pre-Depends: dpkg (>= 1.17.5) to libxbase64-doc.
+      + Add Pre-Depends: ${misc:Pre-Depends} to libxbase64-bin, libxbase64-dev
+        and libxbase64-1.
+      * Replace *.postinst with *.maintscript.
+
+ -- Jörg Frings-Fürst <debian@jff-webhosting.net>  Wed, 09 Nov 2016 04:14:39 +0100
+
 xbase64 (3.1.2-9) unstable; urgency=medium
 
   * New debian/patches/0135-replace_gets.patch:
diff --git a/debian/control b/debian/control
index 769cc89..41c48b8 100644
--- a/debian/control
+++ b/debian/control
@@ -18,6 +18,8 @@ Depends:
  ${misc:Depends},
  ${shlibs:Depends},
  libxbase64-doc (= ${source:Version})
+Pre-Depends:
+ ${misc:Pre-Depends}
 Description: xbase compatible C++ class library (shared libraries)
  Xbase (formerly known as xdb, also formerly known as xBase) is a collection
  of specifiations, programs, utilities and a C++ class library for
@@ -40,6 +42,8 @@ Depends:
  libxbase64-1 (= ${binary:Version}),
  libxbase64-doc (= ${source:Version}),
  libc6-dev | libc-dev
+Pre-Depends:
+ ${misc:Pre-Depends}
 Suggests: libxbase64-bin
 Description: xbase compatible C++ class library (development files)
  Xbase (formerly known as xdb, also formerly known as xBase) is a collection
@@ -64,6 +68,8 @@ Depends:
  libxbase64-1 (= ${binary:Version}),
  libxbase64-dev,
  libxbase64-doc (= ${source:Version})
+Pre-Depends:
+ ${misc:Pre-Depends}
 Conflicts: libxdb-dev, libxbase2.0-bin, dvb-apps
 Description: xbase compatible C++ class library (utilities)
  Xbase (formerly known as xdb, also formerly known as xBase) is a collection
@@ -83,6 +89,8 @@ Architecture: all
 Section: doc
 Multi-Arch: foreign
 Depends: ${misc:Depends}
+Pre-Depends:
+ dpkg (>= 1.17.5)
 Description: xbase compatible C++ class library (documentation)
  Xbase (formerly known as xdb, also formerly known as xBase) is a collection
  of specifiations, programs, utilities and a C++ class library for
diff --git a/debian/libxbase64-1.maintscript b/debian/libxbase64-1.maintscript
new file mode 120000
index 0000000..e0b7486
--- /dev/null
+++ b/debian/libxbase64-1.maintscript
@@ -0,0 +1 @@
+maintscript
\ No newline at end of file
diff --git a/debian/libxbase64-1.postinst b/debian/libxbase64-1.postinst
deleted file mode 100644
index 4ad8b6a..0000000
--- a/debian/libxbase64-1.postinst
+++ /dev/null
@@ -1,45 +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)
-    # Replace documentation directory with symlink
-    dpkg-maintscript-helper dir_to_symlink /usr/share/doc/libxbase64-1 /usr/share/doc/libxbase64-doc 3.1.2-4 -- "$@"
-
-  ;;
-
-  abort-upgrade|abort-remove|abort-deconfigure)
-    exit 0
-  ;;
-
-  *)
-    echo "postinst called with unknown argument \`$1'" >&2
-    exit 1
-  ;;
-
-esac
-
-#DEBHELPER#
-
-
-exit 0
diff --git a/debian/libxbase64-bin.maintscript b/debian/libxbase64-bin.maintscript
new file mode 120000
index 0000000..e0b7486
--- /dev/null
+++ b/debian/libxbase64-bin.maintscript
@@ -0,0 +1 @@
+maintscript
\ No newline at end of file
diff --git a/debian/libxbase64-bin.postinst b/debian/libxbase64-bin.postinst
deleted file mode 100644
index d8dd482..0000000
--- a/debian/libxbase64-bin.postinst
+++ /dev/null
@@ -1,44 +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)
-    # Replace documentation directory with symlink
-    dpkg-maintscript-helper dir_to_symlink /usr/share/doc/libxbase64-bin /usr/share/doc/libxbase64-doc 3.1.2-4 -- "$@"
-  ;;
-
-  abort-upgrade|abort-remove|abort-deconfigure)
-    exit 0
-  ;;
-
-  *)
-    echo "postinst called with unknown argument \`$1'" >&2
-    exit 1
-  ;;
-
-esac
-
-#DEBHELPER#
-
-
-exit 0
diff --git a/debian/libxbase64-dev.maintscript b/debian/libxbase64-dev.maintscript
new file mode 120000
index 0000000..e0b7486
--- /dev/null
+++ b/debian/libxbase64-dev.maintscript
@@ -0,0 +1 @@
+maintscript
\ No newline at end of file
diff --git a/debian/libxbase64-dev.postinst b/debian/libxbase64-dev.postinst
deleted file mode 100644
index 4b2aaf7..0000000
--- a/debian/libxbase64-dev.postinst
+++ /dev/null
@@ -1,44 +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)
-    # Replace documentation directory with symlink
-    dpkg-maintscript-helper dir_to_symlink /usr/share/doc/libxbase64-dev /usr/share/doc/libxbase64-doc 3.1.2-4 -- "$@"
-  ;;
-
-  abort-upgrade|abort-remove|abort-deconfigure)
-    exit 0
-  ;;
-
-  *)
-    echo "postinst called with unknown argument \`$1'" >&2
-    exit 1
-  ;;
-
-esac
-
-#DEBHELPER#
-
-
-exit 0
diff --git a/debian/maintscript b/debian/maintscript
new file mode 100644
index 0000000..e22e041
--- /dev/null
+++ b/debian/maintscript
@@ -0,0 +1 @@
+dir_to_symlink /usr/share/doc/libxbase64-bin /usr/share/doc/libxbase64-doc 3.1.2-4