[Pkg-privacy-commits] [Git][pkg-privacy-team/mat2][master] 6 commits: d/control: Add 'ffmpeg' as build dependency
Georg Faerber
gitlab at salsa.debian.org
Tue Oct 23 19:41:49 BST 2018
Georg Faerber pushed to branch master at Privacy Maintainers / mat2
Commits:
a5e8c737 by Georg Faerber at 2018-10-23T18:05:17Z
d/control: Add 'ffmpeg' as build dependency
- - - - -
6d1677bb by Georg Faerber at 2018-10-23T18:05:18Z
d/control: Add 'ffmpeg' as a suggested package
- - - - -
d8ab69bd by Georg Faerber at 2018-10-23T18:29:15Z
d/control: Add '.avi' to list of supported file formats
- - - - -
a65a63d0 by Georg Faerber at 2018-10-23T18:29:32Z
d/patches: Drop patches, applied and released upstream
- - - - -
3e58427c by Georg Faerber at 2018-10-23T18:29:32Z
d/t/control: Install 'ffmpeg' to check '.avi' files
- - - - -
4e902fc9 by Georg Faerber at 2018-10-23T18:29:32Z
d/changelog: Debian release 0.5.0-1
- - - - -
6 changed files:
- debian/changelog
- debian/control
- − debian/patches/0001-autopkgtest-fix-tests.patch
- − debian/patches/0002-fix-shebang.patch
- debian/patches/series
- debian/tests/control
Changes:
=====================================
debian/changelog
=====================================
@@ -1,9 +1,24 @@
-mat2 (0.4.0-3) UNRELEASED; urgency=medium
+mat2 (0.5.0-1) unstable; urgency=medium
+
+ * New upstream release.
+ * d/control:
+ - Add 'ffmpeg' as a build dependency and as a suggested package to clean
+ '.avi' files.
+ - Add '.avi' to list of supported file formats.
+ * d/mat2.docs:
+ - Install documentation about implementation and threat model.
+ * d/patches:
+ - Drop patches, released upstream.
+ * d/t/control:
+ - Install 'ffmpeg' to check cleaning of '.avi' files.
+ * d/gitlab-ci.yml:
+ - Checkout the git 'pristine-tar' branch before the build.
- * d/gbp.conf
- - Enable 'pristine-tar = True'
+ [ Jonas Meurer ]
+ * d/gbp.conf:
+ - Enable 'pristine-tar = True'.
- -- Jonas Meurer <jonas at freesources.org> Mon, 08 Oct 2018 12:07:19 +0200
+ -- Georg Faerber <georg at riseup.net> Tue, 23 Oct 2018 18:27:37 +0000
mat2 (0.4.0-2) unstable; urgency=medium
=====================================
debian/control
=====================================
@@ -7,6 +7,7 @@ Uploaders: Georg Faerber <georg at riseup.net>,
Build-Depends: debhelper (>= 11~),
dh-exec,
dh-python,
+ ffmpeg,
gir1.2-gdkpixbuf-2.0,
gir1.2-poppler-0.18,
libimage-exiftool-perl,
@@ -29,6 +30,7 @@ Depends: gir1.2-gdkpixbuf-2.0,
python3-mutagen,
${misc:Depends},
${python3:Depends},
+Suggests: ffmpeg,
Description: Metadata anonymisation toolkit v2
Metadata consist of information that characterizes data. Metadata are
used to provide documentation for data products. In essence, metadata
@@ -61,3 +63,4 @@ Description: Metadata anonymisation toolkit v2
- Ogg Vorbis (.ogg)
- Free Lossless Audio Codec (.flac)
- Torrent (.torrent)
+ - Audio Video Interleave (.avi)
=====================================
debian/patches/0001-autopkgtest-fix-tests.patch deleted
=====================================
@@ -1,194 +0,0 @@
-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 at 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 deleted
=====================================
@@ -1,14 +0,0 @@
-Description: fix shebang
-Author: Georg Faerber <georg at 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
=====================================
@@ -1,2 +0,0 @@
-0002-fix-shebang.patch
-0001-autopkgtest-fix-tests.patch
=====================================
debian/tests/control
=====================================
@@ -1,3 +1,4 @@
Test-Command: MAT2_GLOBAL_PATH_TESTSUITE= pytest-3
Depends: @,
+ ffmpeg,
python3-pytest
View it on GitLab: https://salsa.debian.org/pkg-privacy-team/mat2/compare/6b3513999636ea4becf633412c3f6f1847dbb39f...4e902fc963b1704573bdba7063acc0734f23d2e5
--
View it on GitLab: https://salsa.debian.org/pkg-privacy-team/mat2/compare/6b3513999636ea4becf633412c3f6f1847dbb39f...4e902fc963b1704573bdba7063acc0734f23d2e5
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-privacy-commits/attachments/20181023/2da96a51/attachment-0001.html>
More information about the Pkg-privacy-commits
mailing list