debian/changelog

+plaso (20190131-2) unstable; urgency=medium
+
+  * Adjust bencode import statement to work with Python3 import semantics
+  * Add python2/python3 support
+
+ -- Hilko Bengen <bengen@debian.org>  Mon, 11 Feb 2019 23:59:07 +0100
+
 plaso (20190131-1) unstable; urgency=medium
 
   * New upstream version 20190131

debian/fix-scripts.sh

+#!/bin/sh
+
+find debian/tmp/usr/bin -name \*.py | while read f
+do
+    echo $f:
+    head -n1 $f
+    if head -n1 "$f" | grep python3; then
+        mv "$f" "$f-python3"
+    else
+        mv "$f" "$f-python2"
+    fi
+done

debian/patches/0001-Add-vendored-bencode-2.0.patch

@@ -335,7 +335,7 @@ index 0000000..d29ae1c
 +    else:
 +        fd.write(bencode(data))
 diff --git a/plaso/parsers/bencode_parser.py b/plaso/parsers/bencode_parser.py
-index 6c933ec..18f977b 100644
+index 6c933ec..b71a5d5 100644
 --- a/plaso/parsers/bencode_parser.py
 +++ b/plaso/parsers/bencode_parser.py
 @@ -10,7 +10,7 @@ from __future__ import unicode_literals
@@ -343,7 +343,7 @@ index 6c933ec..18f977b 100644
  import os
  
 -import bencode
-+from bencode import bencode
++from plaso.parsers.bencode import bencode
  
  from plaso.lib import errors
  from plaso.parsers import interface

debian/plaso.NEWS.Debian

+plaso (20190131-1) unstable; urgency=medium
+
+There is now the option to run Plaso with either Python 2 or Python 3,
+using the python-plaso and python3-plaso packages, respectively.
+    
+The update-alternatives(1) program can be used to select which Python version
+will be used globally. To select python2 or python3 on a per-call basis, the
+following program names are available:
+  
+  * log2timeline.py-python2, log2timeline.py-python3
+  * image_export.py-python2, image_export.py-python3
+  * pinfo.py-python2, pinfo.py-python3
+  * psort.py-python2, psort.py-python3
+  * psteal.py-python2, psteal.py-python3
+  
+ -- Hilko Bengen <bengen@debian.org>  Sat, 09 Feb 2019 23:53:49 +0100
+
+

debian/python-plaso.install

+/usr/lib/python2*
+/usr/bin/*-python2

debian/python-plaso.postinst

+#!/bin/sh
+
+set -e
+
+case "${1}" in
+    configure)
+        update-alternatives \
+            --install /usr/bin/log2timeline.py log2timeline.py /usr/bin/log2timeline.py-python2 50 \
+            --slave /usr/bin/image_export.py image_export.py /usr/bin/image_export.py-python2 \
+            --slave /usr/bin/pinfo.py pinfo.py /usr/bin/pinfo.py-python2 \
+            --slave /usr/bin/psort.py psort.py /usr/bin/psort.py-python2 \
+            --slave /usr/bin/psteal.py psteal.py /usr/bin/psteal.py-python2
+	;;
+
+    abort-upgrade|abort-remove|abort-deconfigure)
+
+	;;
+
+    *)
+	echo "postinst called with unknown argument \`${1}'" >&2
+	exit 1
+	;;
+esac
+
+#DEBHELPER#
+
+exit 0

debian/python-plaso.prerm

+#!/bin/sh
+
+set -e
+
+case "${1}" in
+    remove|deconfigure)
+	update-alternatives --remove log2timeline.py /usr/bin/log2timeline.py-python2
+	;;
+    
+    upgrade|failed-upgrade)
+	;;
+    
+    *)
+	echo "prerm called with unknown argument \`${1}'" >&2
+	exit 1
+	;;
+esac
+
+#DEBHELPER#
+
+exit 0

debian/python3-plaso.install

+/usr/lib/python3*
+/usr/bin/*-python3

debian/python3-plaso.postinst

+#!/bin/sh
+
+set -e
+
+case "${1}" in
+    configure)
+        update-alternatives \
+            --install /usr/bin/log2timeline.py log2timeline.py /usr/bin/log2timeline.py-python3 100 \
+            --slave /usr/bin/image_export.py image_export.py /usr/bin/image_export.py-python3 \
+            --slave /usr/bin/pinfo.py pinfo.py /usr/bin/pinfo.py-python3 \
+            --slave /usr/bin/psort.py psort.py /usr/bin/psort.py-python3 \
+            --slave /usr/bin/psteal.py psteal.py /usr/bin/psteal.py-python3
+	;;
+
+    abort-upgrade|abort-remove|abort-deconfigure)
+
+	;;
+
+    *)
+	echo "postinst called with unknown argument \`${1}'" >&2
+	exit 1
+	;;
+esac
+
+#DEBHELPER#
+
+exit 0

debian/python3-plaso.prerm

+#!/bin/sh
+
+set -e
+
+case "${1}" in
+    remove|deconfigure)
+	update-alternatives --remove log2timeline.py /usr/bin/log2timeline.py-python3
+	;;
+    
+    upgrade|failed-upgrade)
+	;;
+    
+    *)
+	echo "prerm called with unknown argument \`${1}'" >&2
+	exit 1
+	;;
+esac
+
+#DEBHELPER#
+
+exit 0

debian/rules

@@ -9,8 +9,10 @@ include /usr/share/dpkg/default.mk
 
 # main packaging script based on dh7 syntax
 %:
-	dh $@ --buildsystem=pybuild --with=python2
+	dh $@ --buildsystem=pybuild --with=python2,python3
+
+override_dh_auto_install:
+	dh_auto_install -- --after-install debian/fix-scripts.sh
 
 override_dh_compress:
 	dh_compress -X.rst
-