1
0

7 Commits ae87b8cb78 ... b8fbb2862c

Autor SHA1 Nachricht Datum
  Christoph Biedl b8fbb2862c python-magic 2:0.4.27-4 vor 1 Monat
  Christoph Biedl 7512eb17da Packaging cleanup vor 1 Monat
  Christoph Biedl 11f0e90468 Use pytest instead of tox. Thanks Shanavas M. Closes: #1120248 vor 1 Monat
  Christoph Biedl 3ca8827746 python-magic 2:0.4.27-3 vor 2 Jahren
  Christoph Biedl a121aac390 Don't hardcode dependency on libmagic1. Closes: #1066850 vor 2 Jahren
  Christoph Biedl 45e74beb59 Reformat files in debian/ vor 2 Jahren
  Christoph Biedl e912c2a829 Update copyright notices to 2024 vor 2 Jahren

+ 12 - 0
debian/changelog

@@ -1,3 +1,15 @@
+python-magic (2:0.4.27-4) unstable; urgency=medium
+
+  * Use pytest instead of tox. Thanks Shanavas M. Closes: #1120248
+
+ -- Christoph Biedl <debian.axhn@manchmal.in-ulm.de>  Sat, 23 May 2026 14:14:14 +0200
+
+python-magic (2:0.4.27-3) unstable; urgency=medium
+
+  * Don't hardcode dependency on libmagic1. Closes: #1066850
+
+ -- Christoph Biedl <debian.axhn@manchmal.in-ulm.de>  Fri, 15 Mar 2024 08:41:01 +0100
+
 python-magic (2:0.4.27-2) unstable; urgency=medium
 
   * Fix test suite with file 5.45

+ 3 - 5
debian/control

@@ -1,27 +1,25 @@
 Source: python-magic
 Maintainer: Christoph Biedl <debian.axhn@manchmal.in-ulm.de>
 Homepage: https://github.com/ahupp/python-magic/
-Standards-Version: 4.6.0
+Standards-Version: 4.7.4
 Vcs-Browser: https://git.in-ulm.de/cbiedl/python-magic
 Vcs-Git: https://git.in-ulm.de/cbiedl/python-magic.git
 Testsuite: autopkgtest-pkg-python
 Build-Depends: debhelper-compat (= 13),
     dh-python,
-    libmagic1 (>= 1:5.39),
+    libmagic-dev,
     python3-all,
     python3-coverage,
     python3-pytest,
     python3-setuptools,
     python3-wheel,
-    tox,
 Priority: extra
-Rules-Requires-Root: no
 Section: libs
 
 Package: python3-magic
 Architecture: all
 Depends: ${misc:Depends}, ${python3:Depends},
-    libmagic1 (>= 1:5.39),
+    ${magic:Depends},
 Section: python
 Priority: optional
 Description: python3 interface to the libmagic file type identification library

+ 1 - 1
debian/copyright

@@ -16,7 +16,7 @@ License: BSD-2-Clause-alike
 
 Files:
  debian/*
-Copyright: 2017-2023 Christoph Biedl <debian.axhn@manchmal.in-ulm.de>
+Copyright: 2017-2024 Christoph Biedl <debian.axhn@manchmal.in-ulm.de>
 License: MIT
 
 License: MIT

+ 1 - 1
debian/patches/2022-12-23.adjust-for-5.43.patch

@@ -5,7 +5,7 @@ Forwarded: https://github.com/ahupp/python-magic/issues/283
 
 --- a/test/python_magic_test.py
 +++ b/test/python_magic_test.py
-@@ -134,7 +134,7 @@
+@@ -135,7 +135,7 @@
              self.assert_values(m, {
                  # some versions return '' for the extensions of a gz file,
                  # including w/ the command line.  Who knows...

+ 1 - 1
debian/patches/cherry-pick/1690968587.0.4.27-16-g545a2a5.fix-test-suite-with-file-5-45.patch

@@ -1,5 +1,5 @@
 Subject: Fix test suite with file 5.45
-Origin: 0.4.27-16-g545a2a5 <https://github.com/ahupp/python-magic/commit/0.4.27-16-g545a2a5>
+Origin: upstream, 0.4.27-16-g545a2a5 <https://github.com/ahupp/python-magic/commit/0.4.27-16-g545a2a5>
 Upstream-Author: Dominique Leuenberger <dimstar@opensuse.org>
 Date: Wed Aug 2 11:29:47 2023 +0200
 

+ 8 - 2
debian/rules

@@ -1,6 +1,12 @@
 #!/usr/bin/make -f
 
-export LC_ALL=C.UTF-8
+export LC_ALL = en_US.UTF-8
+
+libmagic_package := $(shell dpkg-query '-f$${Depends}' -W libmagic-dev | awk '{print $$1}')
 
 %:
-	dh $@ --with python3 --buildsystem=pybuild --test-tox
+	dh $@ --buildsystem=pybuild --test-pytest --with python3
+
+override_dh_gencontrol:
+	echo "magic:Depends=$(libmagic_package)" >>debian/python3-magic.substvars
+	dh_gencontrol $@

+ 4 - 4
debian/watch

@@ -1,4 +1,4 @@
-
-version=4
-https://github.com/ahupp/@PACKAGE@/tags \
-    /ahupp/@PACKAGE@/archive/refs/tags/@ANY_VERSION@@ARCHIVE_EXT@
+Version: 5
+Template: Github
+Owner: ahupp
+Project: @PACKAGE@