Source: jbigkit
Version: 2.1-6.1
Tags: patch
User: debian-cr...@lists.debian.org
Usertags ftcbfs
jbigkit-testdata actually contains data that is the same for all
architectures. As such, it should be an Arch:all package. I'm attaching
a patch to do so for your convenience.
As it happens, generation of jbigkit-testdata breaks cross compilation.
By moving it into an indep package, it becomes irrelevant to cross
compilation and thus cross compilation is fixed.
Helmut
--- jbigkit-2.1/debian/changelog
+++ jbigkit-2.1/debian/changelog
@@ -1,3 +1,10 @@
+jbigkit (2.1-6.2) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Convert jbigkit-testdata to Arch: all. (Closes: #-1)
+
+ -- Helmut Grohne <hel...@subdivi.de> Tue, 11 Apr 2023 13:25:14 +0200
+
jbigkit (2.1-6.1) unstable; urgency=medium
* Non-maintainer upload.
--- jbigkit-2.1/debian/control
+++ jbigkit-2.1/debian/control
@@ -23,7 +23,8 @@
Package: jbigkit-testdata
Section: graphics
-Architecture: any
+Architecture: all
+Multi-Arch: foreign
Depends: ${misc:Depends}
Description: JBIG-KIT testdata
JBIG-KIT provides a portable library of compression and decompression
functions
--- jbigkit-2.1/debian/patches/split-arch-indep.patch
+++ jbigkit-2.1/debian/patches/split-arch-indep.patch
@@ -0,0 +1,35 @@
+--- jbigkit-2.1.orig/Makefile
++++ jbigkit-2.1/Makefile
+@@ -10,7 +10,7 @@
+ export CC CFLAGS
+
+ VERSION=2.1
+-.PHONY: all lib pbm test clean install
++.PHONY: all lib pbm test clean install install-lib install-pbm
install-testdata
+
+ all: lib pbm testdata
+ @echo "Enter 'make test' in order to start some automatic tests."
+@@ -47,16 +47,22 @@
+ rsync -t jbigkit-$(VERSION).tar.gz $(HOME)/public_html/download/
+ rsync -t jbigkit-$(VERSION)/CHANGES $(HOME)/public_html/jbigkit/
+
+-install: all
++install-lib: lib
+ install -d $(DESTDIR)/usr/lib/$(DEB_HOST_MULTIARCH)
+ install -m 644 libjbig/*.so.* libjbig/*.a
$(DESTDIR)/usr/lib/$(DEB_HOST_MULTIARCH)
+ /sbin/ldconfig -n $(DESTDIR)/usr/lib/$(DEB_HOST_MULTIARCH)
+ ln -s libjbig.so.0 $(DESTDIR)/usr/lib/$(DEB_HOST_MULTIARCH)/libjbig.so
+ install -d $(DESTDIR)/usr/include
+ install -m 644 libjbig/*.h $(DESTDIR)/usr/include
++
++install-pbm: pbm
+ install -d $(DESTDIR)/usr/bin
+ install -m 755 pbmtools/jbgtopbm pbmtools/jbgtopbm85 pbmtools/pbmtojbg
pbmtools/pbmtojbg85 $(DESTDIR)/usr/bin
+ install -d $(DESTDIR)/usr/share/man/man1
+ install -m 644 pbmtools/*.1 $(DESTDIR)/usr/share/man/man1
++
++install-testdata: testdata
+ install -d $(DESTDIR)/usr/share/jbigkit-testdata
+ install -m 644 examples/*.pgm examples/*.jbg pbmtools/test-t82.pbm
$(DESTDIR)/usr/share/jbigkit-testdata
++
++install: install-lib install-pbm install-testdata
--- jbigkit-2.1/debian/patches/series
+++ jbigkit-2.1/debian/patches/series
@@ -5,3 +5,4 @@
improve-upstream-Makefiles.diff
create-testdata.diff
pic-so.diff
+split-arch-indep.patch
--- jbigkit-2.1/debian/rules
+++ jbigkit-2.1/debian/rules
@@ -9,6 +9,18 @@
pkg_run = jbigkit-bin
+override_dh_auto_build-arch:
+ dh_auto_build -- lib pbm
+
+override_dh_auto_build-indep:
+ dh_auto_build -- testdata
+
+override_dh_auto_install-arch:
+ $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install-lib install-pbm
+
+override_dh_auto_install-indep:
+ $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install-testdata
+
override_dh_installman:
dh_installman -p$(pkg_run) debian/jbgtopbm85.1 debian/pbmtojbg85.1
