debian/changelog

-mat2 (0.1.1-1) unstable; urgency=medium
+mat2 (0.4.0-1) unstable; urgency=medium
 
+  [ Jonas Meurer ]
   * Initial release. (Closes: #898622)
 
- -- Jonas Meurer <jonas@freesources.org>  Fri, 18 May 2018 21:14:19 +0200
+ -- Georg Faerber <georg@riseup.net>  Thu, 04 Oct 2018 19:56:23 +0000

debian/control

 Source: mat2
-Section: python
+Section: utils
 Priority: optional
 Maintainer: Debian Privacy Tools Maintainers <pkg-privacy-maintainers@lists.alioth.debian.org>
 Uploaders: Georg Faerber <georg@riseup.net>,
            Jonas Meurer <jonas@freesources.org>,
-Build-Depends: debhelper (>= 11),
+Build-Depends: debhelper (>= 11~),
                dh-exec,
                dh-python,
                gir1.2-gdkpixbuf-2.0,
@@ -22,13 +22,13 @@ Vcs-Browser: https://salsa.debian.org/pkg-privacy-team/mat2
 
 Package: mat2
 Architecture: all
-Depends: ${misc:Depends}, ${python3:Depends}
-Recommends: gir1.2-gdkpixbuf-2.0,
+Depends: gir1.2-gdkpixbuf-2.0,
          gir1.2-poppler-0.18,
          libimage-exiftool-perl,
-            python-nautilus,
          python3-gi-cairo,
          python3-mutagen,
+         ${misc:Depends},
+         ${python3:Depends},
 Description: Metadata anonymisation toolkit v2
  Metadata consist of information that characterizes data. Metadata are
  used to provide documentation for data products. In essence, metadata

debian/mat2.install

 #!/usr/bin/dh-exec
-mat2.py => /usr/bin/mat2
-nautilus/nautilus_mat2.py => /usr/share/nautilus-python/extensions/mat2.py
+mat2 => /usr/bin/mat2

debian/mat2.manpages

+doc/mat2.1

debian/patches/0001-autopkgtest-fix-tests.patch

+Description: autopkgtest: fix tests
+  Some tests invoke the mat2 binary via './mat2'. This fails during
+  autopkgtest, as the software "as installed" should be tested, and
+  therefore, the 'tests' directory and the binary are not stored in the
+  same directory. The following upstream patch fixes this via
+  introducing an environment variable, which, if set, calls the binary
+  stored in '/usr/bin/'.
+
+Author: Georg Faerber <georg@riseup.net>
+Upstream: https://0xacab.org/jvoisin/mat2/issues/16#note_153878
+Last-Update: 2018-10-04
+--
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/tests/test_climat2.py
++++ b/tests/test_climat2.py
+@@ -4,16 +4,24 @@
+ import unittest
+ 
+ 
++mat2_binary = ['./mat2']
++
++if 'MAT2_GLOBAL_PATH_TESTSUITE' in os.environ:
++    # Debian runs tests after installing the package
++    # https://0xacab.org/jvoisin/mat2/issues/16#note_153878
++    mat2_binary = ['/usr/bin/env', 'mat2']
++
++
+ class TestHelp(unittest.TestCase):
+     def test_help(self):
+-        proc = subprocess.Popen(['./mat2', '--help'], stdout=subprocess.PIPE)
++        proc = subprocess.Popen(mat2_binary + ['--help'], stdout=subprocess.PIPE)
+         stdout, _ = proc.communicate()
+         self.assertIn(b'usage: mat2 [-h] [-v] [-l] [--check-dependencies] [-V]',
+                       stdout)
+         self.assertIn(b'[--unknown-members policy] [-s | -L]', stdout)
+ 
+     def test_no_arg(self):
+-        proc = subprocess.Popen(['./mat2'], stdout=subprocess.PIPE)
++        proc = subprocess.Popen(mat2_binary, stdout=subprocess.PIPE)
+         stdout, _ = proc.communicate()
+         self.assertIn(b'usage: mat2 [-h] [-v] [-l] [--check-dependencies] [-V]',
+                       stdout)
+@@ -22,29 +30,29 @@
+ 
+ class TestVersion(unittest.TestCase):
+     def test_version(self):
+-        proc = subprocess.Popen(['./mat2', '--version'], stdout=subprocess.PIPE)
++        proc = subprocess.Popen(mat2_binary + ['--version'], stdout=subprocess.PIPE)
+         stdout, _ = proc.communicate()
+         self.assertTrue(stdout.startswith(b'MAT2 '))
+ 
+ class TestDependencies(unittest.TestCase):
+     def test_dependencies(self):
+-        proc = subprocess.Popen(['./mat2', '--check-dependencies'], stdout=subprocess.PIPE)
++        proc = subprocess.Popen(mat2_binary + ['--check-dependencies'], stdout=subprocess.PIPE)
+         stdout, _ = proc.communicate()
+         self.assertTrue(b'MAT2' in stdout)
+ 
+ class TestReturnValue(unittest.TestCase):
+     def test_nonzero(self):
+-        ret = subprocess.call(['./mat2', './mat2'], stdout=subprocess.DEVNULL)
++        ret = subprocess.call(mat2_binary + ['mat2'], stdout=subprocess.DEVNULL)
+         self.assertEqual(255, ret)
+ 
+-        ret = subprocess.call(['./mat2', '--whololo'], stderr=subprocess.DEVNULL)
++        ret = subprocess.call(mat2_binary + ['--whololo'], stderr=subprocess.DEVNULL)
+         self.assertEqual(2, ret)
+ 
+     def test_zero(self):
+-        ret = subprocess.call(['./mat2'], stdout=subprocess.DEVNULL)
++        ret = subprocess.call(mat2_binary, stdout=subprocess.DEVNULL)
+         self.assertEqual(0, ret)
+ 
+-        ret = subprocess.call(['./mat2', '--show', './mat2'], stdout=subprocess.DEVNULL)
++        ret = subprocess.call(mat2_binary + ['--show', 'mat2'], stdout=subprocess.DEVNULL)
+         self.assertEqual(0, ret)
+ 
+ 
+@@ -57,19 +65,19 @@
+         shutil.copy('./tests/data/dirty.jpg', './tests/data/folder/clean1.jpg')
+         shutil.copy('./tests/data/dirty.jpg', './tests/data/folder/clean2.jpg')
+ 
+-        proc = subprocess.Popen(['./mat2', '--show', './tests/data/folder/'],
++        proc = subprocess.Popen(mat2_binary + ['--show', './tests/data/folder/'],
+                 stdout=subprocess.PIPE)
+         stdout, _ = proc.communicate()
+         self.assertIn(b'Comment: Created with GIMP', stdout)
+ 
+-        proc = subprocess.Popen(['./mat2', './tests/data/folder/'],
++        proc = subprocess.Popen(mat2_binary + ['./tests/data/folder/'],
+                 stdout=subprocess.PIPE)
+         stdout, _ = proc.communicate()
+ 
+         os.remove('./tests/data/folder/clean1.jpg')
+         os.remove('./tests/data/folder/clean2.jpg')
+ 
+-        proc = subprocess.Popen(['./mat2', '--show', './tests/data/folder/'],
++        proc = subprocess.Popen(mat2_binary + ['--show', './tests/data/folder/'],
+                 stdout=subprocess.PIPE)
+         stdout, _ = proc.communicate()
+         self.assertNotIn(b'Comment: Created with GIMP', stdout)
+@@ -81,16 +89,16 @@
+     def test_jpg(self):
+         shutil.copy('./tests/data/dirty.jpg', './tests/data/clean.jpg')
+ 
+-        proc = subprocess.Popen(['./mat2', '--show', './tests/data/clean.jpg'],
++        proc = subprocess.Popen(mat2_binary + ['--show', './tests/data/clean.jpg'],
+                 stdout=subprocess.PIPE)
+         stdout, _ = proc.communicate()
+         self.assertIn(b'Comment: Created with GIMP', stdout)
+ 
+-        proc = subprocess.Popen(['./mat2', './tests/data/clean.jpg'],
++        proc = subprocess.Popen(mat2_binary + ['./tests/data/clean.jpg'],
+                 stdout=subprocess.PIPE)
+         stdout, _ = proc.communicate()
+ 
+-        proc = subprocess.Popen(['./mat2', '--show', './tests/data/clean.cleaned.jpg'],
++        proc = subprocess.Popen(mat2_binary + ['--show', './tests/data/clean.cleaned.jpg'],
+                 stdout=subprocess.PIPE)
+         stdout, _ = proc.communicate()
+         self.assertNotIn(b'Comment: Created with GIMP', stdout)
+@@ -100,32 +108,32 @@
+ 
+ class TestIsSupported(unittest.TestCase):
+     def test_pdf(self):
+-        proc = subprocess.Popen(['./mat2', '--show', './tests/data/dirty.pdf'],
++        proc = subprocess.Popen(mat2_binary + ['--show', './tests/data/dirty.pdf'],
+                 stdout=subprocess.PIPE)
+         stdout, _ = proc.communicate()
+         self.assertNotIn(b"isn't supported", stdout)
+ 
+ class TestGetMeta(unittest.TestCase):
+     def test_pdf(self):
+-        proc = subprocess.Popen(['./mat2', '--show', './tests/data/dirty.pdf'],
++        proc = subprocess.Popen(mat2_binary + ['--show', './tests/data/dirty.pdf'],
+                 stdout=subprocess.PIPE)
+         stdout, _ = proc.communicate()
+         self.assertIn(b'producer: pdfTeX-1.40.14', stdout)
+ 
+     def test_png(self):
+-        proc = subprocess.Popen(['./mat2', '--show', './tests/data/dirty.png'],
++        proc = subprocess.Popen(mat2_binary + ['--show', './tests/data/dirty.png'],
+                 stdout=subprocess.PIPE)
+         stdout, _ = proc.communicate()
+         self.assertIn(b'Comment: This is a comment, be careful!', stdout)
+ 
+     def test_jpg(self):
+-        proc = subprocess.Popen(['./mat2', '--show', './tests/data/dirty.jpg'],
++        proc = subprocess.Popen(mat2_binary + ['--show', './tests/data/dirty.jpg'],
+                 stdout=subprocess.PIPE)
+         stdout, _ = proc.communicate()
+         self.assertIn(b'Comment: Created with GIMP', stdout)
+ 
+     def test_docx(self):
+-        proc = subprocess.Popen(['./mat2', '--show', './tests/data/dirty.docx'],
++        proc = subprocess.Popen(mat2_binary + ['--show', './tests/data/dirty.docx'],
+                 stdout=subprocess.PIPE)
+         stdout, _ = proc.communicate()
+         self.assertIn(b'Application: LibreOffice/5.4.5.1$Linux_X86_64', stdout)
+@@ -133,7 +141,7 @@
+         self.assertIn(b'revision: 1', stdout)
+ 
+     def test_odt(self):
+-        proc = subprocess.Popen(['./mat2', '--show', './tests/data/dirty.odt'],
++        proc = subprocess.Popen(mat2_binary + ['--show', './tests/data/dirty.odt'],
+                 stdout=subprocess.PIPE)
+         stdout, _ = proc.communicate()
+         self.assertIn(b'generator: LibreOffice/3.3$Unix', stdout)
+@@ -141,14 +149,14 @@
+         self.assertIn(b'date_time: 2011-07-26 02:40:16', stdout)
+ 
+     def test_mp3(self):
+-        proc = subprocess.Popen(['./mat2', '--show', './tests/data/dirty.mp3'],
++        proc = subprocess.Popen(mat2_binary + ['--show', './tests/data/dirty.mp3'],
+                 stdout=subprocess.PIPE)
+         stdout, _ = proc.communicate()
+         self.assertIn(b'TALB: harmfull', stdout)
+         self.assertIn(b'COMM::: Thank you for using MAT !', stdout)
+ 
+     def test_flac(self):
+-        proc = subprocess.Popen(['./mat2', '--show', './tests/data/dirty.flac'],
++        proc = subprocess.Popen(mat2_binary + ['--show', './tests/data/dirty.flac'],
+                 stdout=subprocess.PIPE)
+         stdout, _ = proc.communicate()
+         self.assertIn(b'comments: Thank you for using MAT !', stdout)
+@@ -156,7 +164,7 @@
+         self.assertIn(b'title: I am so', stdout)
+ 
+     def test_ogg(self):
+-        proc = subprocess.Popen(['./mat2', '--show', './tests/data/dirty.ogg'],
++        proc = subprocess.Popen(mat2_binary + ['--show', './tests/data/dirty.ogg'],
+                 stdout=subprocess.PIPE)
+         stdout, _ = proc.communicate()
+         self.assertIn(b'comments: Thank you for using MAT !', stdout)

debian/patches/0002-fix-shebang.patch

+Description: fix shebang
+Author: Georg Faerber <georg@riseup.net>
+Forwarded: https://0xacab.org/jvoisin/mat2/merge_requests/19
+Last-Update: 2018-10-03
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/libmat2/__init__.py
++++ b/libmat2/__init__.py
+@@ -1,4 +1,4 @@
+-#!/bin/env python3
++#!/usr/bin/env python3
+ 
+ import os
+ import collections

debian/patches/series

+0002-fix-shebang.patch
+0001-autopkgtest-fix-tests.patch

debian/rules

@@ -6,5 +6,6 @@ export DH_VERBOSE=1
 	dh $@ --with python3 --buildsystem=pybuild
 
 override_dh_auto_test:
-	python3 -m unittest discover
-	dh_auto_test
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+	python3 -m unittest discover -v
+endif

debian/tests/control

 Tests: test-installed
 Depends: @
-Restrictions: allow-stderr, needs-recommends
+Restrictions: allow-stderr

debian/tests/test-installed

@@ -3,8 +3,6 @@
 #                    source tree
 set -e
 
-WORKDIR=$(mktemp -d)
-cp -prv test/* $WORKDIR
-trap "rm -rf $WORKDIR" 0 INT QUIT ABRT PIPE TERM
-cd $WORKDIR
+export MAT2_GLOBAL_PATH_TESTSUITE
+
 python3 -m unittest discover -v