Package: release.debian.org
Severity: normal
User: release.debian....@packages.debian.org
Usertags: unblock

Please unblock package libpaper

1.1.26 has a circular dependency in debian/rules that skips
the creation of an important file: libpaper1.config.
The new package fixes this problem and make use of DPKG_EXPORT_BUILDFLAGS.

source debdiff is attached

unblock libpaper/1.1.27

-- System Information:
Debian Release: 10.0
  APT prefers testing
  APT policy: (500, 'testing'), (500, 'stable')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.19.0-5-amd64 (SMP w/8 CPU cores)
Locale: LANG=it_IT.UTF-8, LC_CTYPE=it_IT.UTF-8 (charmap=UTF-8), 
LANGUAGE=it_IT.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
diff -Nru libpaper-1.1.26/configure.ac libpaper-1.1.27/configure.ac
--- libpaper-1.1.26/configure.ac        2018-12-11 11:50:29.000000000 +0100
+++ libpaper-1.1.27/configure.ac        2019-06-23 21:26:40.000000000 +0200
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 
-AC_INIT([libpaper], [1.1.26])
+AC_INIT([libpaper], [1.1.27])
 AC_CONFIG_SRCDIR([configure.ac])
 AM_INIT_AUTOMAKE([no-define])
 AM_CONFIG_HEADER(config.h)
diff -Nru libpaper-1.1.26/debian/changelog libpaper-1.1.27/debian/changelog
--- libpaper-1.1.26/debian/changelog    2018-12-11 11:50:45.000000000 +0100
+++ libpaper-1.1.27/debian/changelog    2019-06-23 21:27:03.000000000 +0200
@@ -1,3 +1,10 @@
+libpaper (1.1.27) unstable; urgency=medium
+
+  * Fixed a circular dependency in debian/rules that left libpaper1.config
+    not built. See #927226.
+
+ -- Giuseppe Sacco <eppes...@debian.org>  Sun, 23 Jun 2019 21:27:03 +0200
+
 libpaper (1.1.26) unstable; urgency=medium
 
   * Check for ucf presence in the postrm script. See #916197 and #916198.
diff -Nru libpaper-1.1.26/debian/rules libpaper-1.1.27/debian/rules
--- libpaper-1.1.26/debian/rules        2018-12-02 22:28:23.000000000 +0100
+++ libpaper-1.1.27/debian/rules        2019-06-23 21:27:03.000000000 +0200
@@ -6,6 +6,9 @@
 
 include /usr/share/dpkg/architecture.mk
 
+DPKG_EXPORT_BUILDFLAGS = 1
+include /usr/share/dpkg/buildflags.mk
+
 package        := $(firstword $(shell dh_listpackages))
 prefix := $(CURDIR)/debian/tmp
 share  := /usr/share
@@ -24,20 +27,9 @@
 native_paperconf       := debian/build-native/src/paperconf
 endif
 
-cflags := -g -Wall
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-cflags += -O2
-else
-cflags += -O0
-endif
-
-export CFLAGS=$(cflags)
-export CXXFLAGS=$(cflags)
-
 version        := $(shell dpkg-parsechangelog | \
                        sed -ne 's/^Version: *\([0-9]\+:\)*//p')
 
-
 tag:
        cvs tag -c -F $(subst .,_,debian_version_$(version))
 ifeq ($(findstring -,$(version)),)
@@ -57,7 +49,7 @@
 endif
        touch $@
 
-build-indep:   config debian/libpaper1.config
+build-indep:   config libpaper1.config-stamp
        $(MAKE) -C debian/build
 ifneq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
        $(MAKE) -C debian/build-native
@@ -67,15 +59,16 @@
 build-arch:    build-indep
 build: build-arch
 
-debian/libpaper1.config: build-arch
-       exec > $@.new \
-               && sed -n '1,/^__BEGIN_PAPERSPECS__/p' $@ \
-               && $(native_paperconf) -amns \
-               && sed -n '/^__END_PAPERSPECS__/,$$p' $@
-       mv $@.new $@
+libpaper1.config-stamp:
+       exec > debian/libpaper1.config.new \
+               && sed -n '1,/^__BEGIN_PAPERSPECS__/p' debian/libpaper1.config \
+               && cat lib/paperspecs \
+               && sed -n '/^__END_PAPERSPECS__/,$$p' debian/libpaper1.config
+       mv debian/libpaper1.config.new debian/libpaper1.config
+       touch libpaper1.config-stamp
 
 clean: checkroot
-       rm -f *-stamp
+       rm -f *-stamp build-indep
        [ ! -f Makefile ] || $(MAKE) distclean
        rm -rf debian/build debian/build-native
        dh_autoreconf_clean

Reply via email to