Browse Source

Packaging maintenance

* Declare compliance with policy 4.4.0
* Switch to debhelper-compat to declare the compat level
* Fix order in series file, refresh patch queue
Christoph Biedl 1 year ago
parent
commit
eeab2230b4

+ 0 - 1
debian/compat

@@ -1 +0,0 @@
-11

+ 2 - 2
debian/control

@@ -1,10 +1,10 @@
 Source: file
 Maintainer: Christoph Biedl <debian.axhn@manchmal.in-ulm.de>
 Homepage: https://www.darwinsys.com/file/
-Standards-Version: 4.3.0
+Standards-Version: 4.4.0
 Vcs-Browser: https://git.in-ulm.de/cbiedl/file
 Vcs-Git: https://git.in-ulm.de/cbiedl/file.git
-Build-Depends: debhelper (>= 11~),
+Build-Depends: debhelper-compat (= 11),
     libbz2-dev,
     liblzma-dev,
     libseccomp-dev [amd64 arm64 armel armhf hppa i386 mips mips64el mipsel powerpc powerpcspe ppc64 ppc64el s390x x32],

+ 3 - 3
debian/patches/cherry-pick.FILE5_37-54-g119cc185.add-lzma-decompression-support.patch

@@ -5,7 +5,7 @@ Date: Thu Jul 18 15:43:54 2019 +0000
 
 --- a/src/compress.c
 +++ b/src/compress.c
-@@ -118,6 +118,16 @@
+@@ -113,6 +113,16 @@
  }
  #endif
  
@@ -22,7 +22,7 @@ Date: Thu Jul 18 15:43:54 2019 +0000
  #define gzip_flags "-cd"
  #define lrzip_flags "-do"
  #define lzip_flags gzip_flags
-@@ -152,29 +162,30 @@
+@@ -147,29 +157,30 @@
  
  private const struct {
  	const void *magic;
@@ -68,7 +68,7 @@ Date: Thu Jul 18 15:43:54 2019 +0000
  #endif
  };
  
-@@ -243,15 +254,15 @@
+@@ -234,15 +245,15 @@
  
  	for (i = 0; i < ncompr; i++) {
  		int zm;

+ 3 - 3
debian/patches/cherry-pick.FILE5_37-55-gb259a07e.add-lzma-and-bzip-built-in-decompression-support.patch

@@ -91,7 +91,7 @@ Date: Thu Jul 18 20:32:06 2019 +0000
  #ifdef DEBUG
  int tty = -1;
  #define DPRINTF(...)	do { \
-@@ -190,7 +195,11 @@
+@@ -201,7 +206,11 @@
  #endif
  #ifdef BUILTIN_BZLIB
  private int uncompressbzlib(const unsigned char *, unsigned char **, size_t,
@@ -104,7 +104,7 @@ Date: Thu Jul 18 20:32:06 2019 +0000
  #endif
  
  static int makeerror(unsigned char **, size_t *, const char *, ...)
-@@ -570,6 +579,90 @@
+@@ -581,6 +590,90 @@
  }
  #endif
  
@@ -195,7 +195,7 @@ Date: Thu Jul 18 20:32:06 2019 +0000
  static int
  makeerror(unsigned char **buf, size_t *len, const char *fmt, ...)
  {
-@@ -702,6 +795,15 @@
+@@ -713,6 +806,15 @@
  	if (compr[method].maglen == 0)
  		return uncompresszlib(old, newch, bytes_max, n, 1);
  #endif

+ 1 - 1
debian/patches/series

@@ -1,6 +1,6 @@
 # cherry-picked commits. Keep in upstream's chronological order
-cherry-pick.FILE5_37-47-g62de35af.disable-gem-gdos-fonts-for-now-needs-to-be-stronger.patch
 cherry-pick.FILE5_37-46-g103c6ec2.dont-print-the-string-entry-unless-the-zip-entry-matched-christoph-biedl.patch
+cherry-pick.FILE5_37-47-g62de35af.disable-gem-gdos-fonts-for-now-needs-to-be-stronger.patch
 cherry-pick.FILE5_37-54-g119cc185.add-lzma-decompression-support.patch
 cherry-pick.FILE5_37-55-gb259a07e.add-lzma-and-bzip-built-in-decompression-support.patch