Control: tags 861345 + pending Control: tags 965632 + patch Control: tags 965632 + pending Control: tags 999263 + patch Control: tags 999263 + pending
Dear maintainer, I've prepared an NMU for libcompface (versioned as 1:1.5.2-5.1) and uploaded it to DELAYED/7. Please feel free to tell me if I should delay it longer. Regards. -- .''`. https://info.comodo.priv.at -- Debian Developer https://www.debian.org : :' : OpenPGP fingerprint D1E1 316E 93A7 60A8 104D 85FA BB3A 6801 8649 AA06 `. `' Member VIBE!AT & SPI Inc. -- Supporter Free Software Foundation Europe `- NP: Alan Jackson: Chattahoochee
diff -u libcompface-1.5.2/debian/control libcompface-1.5.2/debian/control
--- libcompface-1.5.2/debian/control
+++ libcompface-1.5.2/debian/control
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Hakan Ardo <ha...@debian.org>
Standards-Version: 3.2.1.0
-Build-Depends: debhelper (>=5)
+Build-Depends: debhelper (>=7)
Package: libcompfaceg1-dev
Section: devel
diff -u libcompface-1.5.2/debian/compat libcompface-1.5.2/debian/compat
--- libcompface-1.5.2/debian/compat
+++ libcompface-1.5.2/debian/compat
@@ -1 +1 @@
-5
+7
diff -u libcompface-1.5.2/debian/control.common libcompface-1.5.2/debian/control.common
--- libcompface-1.5.2/debian/control.common
+++ libcompface-1.5.2/debian/control.common
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Hakan Ardo <ha...@debian.org>
Standards-Version: 3.2.1.0
-Build-Depends: debhelper (>=5)
+Build-Depends: debhelper (>=7)
Package: libcompfaceg1-dev
Section: devel
diff -u libcompface-1.5.2/debian/changelog libcompface-1.5.2/debian/changelog
--- libcompface-1.5.2/debian/changelog
+++ libcompface-1.5.2/debian/changelog
@@ -1,3 +1,22 @@
+libcompface (1:1.5.2-5.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+
+ [ Helmut Grohne ]
+ * Fix FTCBFS: Pass triplet-prefixed CC to make (closes: #861345)
+
+ [ gregor herrmann ]
+ * Fix "Removal of obsolete debhelper compat 5 and 6 in bookworm":
+ Bump to 7 in debian/compat and debian/control{,.common}.
+ Remove manual handling of debian/{copyright,changelog} from debian/rules,
+ handled by dh_install{docs,changelogs}.
+ (Closes: #965632)
+ * Fix "missing required debian/rules targets build-arch and/or build-
+ indep": Add targets to debian/rules.
+ (Closes: #999263)
+
+ -- gregor herrmann <gre...@debian.org> Sat, 25 Dec 2021 18:12:05 +0100
+
libcompface (1:1.5.2-5) unstable; urgency=high
* Fixed bufferoverflow when reading xbm files (closes: #534973)
diff -u libcompface-1.5.2/debian/rules libcompface-1.5.2/debian/rules
--- libcompface-1.5.2/debian/rules
+++ libcompface-1.5.2/debian/rules
@@ -4,6 +4,11 @@
SHELL = /bin/bash
+include /usr/share/dpkg/architecture.mk
+ifeq ($(origin CC),default)
+CC := $(DEB_HOST_GNU_TYPE)-gcc
+endif
+
package=libcompface
version=1.0.0 #$(shell expr `pwd` : '.*-\([0-9.]*\)')
@@ -12,10 +17,13 @@
LD_LIBRARY_PATH=shared:$(old_libpath)
+build-arch: build
+build-indep: build
+
build: build-libc6
$(checkdir)
@echo '### Building binaries...'
- $(MAKE) LDFLAGS="-s -L$(CURDIR)/shared"
+ $(MAKE) LDFLAGS="-s -L$(CURDIR)/shared" 'CC=$(CC)'
touch build
build-libc6:
@@ -30,6 +38,7 @@
cd shared && \
$(MAKE) -f ../Makefile VPATH=".." srcdir=".." \
LDFLAGS="-lc"\
+ 'CC=$(CC)' \
CFLAGS="-O2 -fPIC -pipe -D_BSD_SOURCE -D_REENTRANT" shared && \
ln -sf $(package).so $(package).so.$(version_major) && \
ln -sf $(package).so.$(version) $(package).so #&& \
@@ -41,6 +50,7 @@
#
cd static && \
$(MAKE) -f ../Makefile VPATH=".." srcdir=".." \
+ 'CC=$(CC)' \
CFLAGS="-O2 -pipe -D_BSD_SOURCE" LDFLAGS="-s" static #&& \
# strip --strip-debug $(package).a
@@ -105,10 +115,7 @@
mv debian/tmp/usr/man debian/tmp/usr/share/
mv debian/tmp/usr/doc/compface debian/tmp/usr/share/doc/
mv debian/tmp/usr/doc/libcompfaceg1 debian/tmp/usr/share/doc/
- cp debian/copyright debian/tmp/usr/share/doc/libcompfaceg1
cp debian/README.debian debian/tmp/usr/share/doc/libcompfaceg1
- cp debian/changelog debian/tmp/usr/share/doc/libcompfaceg1/changelog.Debian
- gzip -9 debian/tmp/usr/share/doc/libcompfaceg1/changelog.Debian
mv debian/tmp/usr/doc/libcompfaceg1-dev debian/tmp/usr/share/doc/
#gzip -9 debian/tmp/usr/share/man/man1/compface.1
rm debian/tmp/usr/share/man/man1/uncompface.1
@@ -166,9 +173,6 @@
install -m644 compface.3 debian/tmp/usr/man/man3/
install -m644 README debian/tmp/usr/doc/compface
- install -m644 debian/copyright debian/tmp/usr/doc/compface
- install -m644 debian/changelog debian/tmp/usr/doc/compface/changelog.Debian
- gzip -9 debian/tmp/usr/doc/compface/changelog.Debian
install -m644 compface.1 debian/tmp/usr/man/man1/
ln -s compface.1 debian/tmp/usr/man/man1/uncompface.1
@@ -211,9 +215,6 @@
chmod 644 debian/tmp/usr/lib/libc5-compat/$(package).so.$(version)
-mkdir debian/tmp/usr/doc/libcompface1
- install -m644 debian/copyright debian/tmp/usr/doc/libcompface1
- install -m644 debian/changelog debian/tmp/usr/doc/libcompface1/changelog.Debian
- gzip -9 debian/tmp/usr/doc/libcompface1/changelog.Debian
-ln -s libcompface1 debian/tmp/usr/doc/libcompface1-altdev
@@ -229,4 +230,4 @@
$(checkdir)
test root = "`whoami`"
-.PHONY: binary binary-arch binary-indep clean checkroot
+.PHONY: binary binary-arch binary-indep clean checkroot build-arch build-indep
signature.asc
Description: Digital Signature
