Hello community, here is the log from the commit of package libpaper1 for openSUSE:Factory checked in at 2020-09-21 16:59:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libpaper1 (Old) and /work/SRC/openSUSE:Factory/.libpaper1.new.4249 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libpaper1" Mon Sep 21 16:59:35 2020 rev:6 rq:835049 version:1.1.28 Changes: -------- --- /work/SRC/openSUSE:Factory/libpaper1/libpaper1.changes 2019-06-12 12:59:15.445327945 +0200 +++ /work/SRC/openSUSE:Factory/.libpaper1.new.4249/libpaper1.changes 2020-09-21 16:59:41.758721024 +0200 @@ -1,0 +2,7 @@ +Sun Aug 16 02:57:48 UTC 2020 - Dirk Mueller <[email protected]> + +- update to 1.2.28: + * Fixed a circular dependency in debian/rules that left libpaper1.config + * Check for ucf presence in the postrm script + +------------------------------------------------------------------- Old: ---- libpaper_1.1.26.tar.gz New: ---- libpaper_1.1.28.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libpaper1.spec ++++++ --- /var/tmp/diff_new_pack.ZSMYaE/_old 2020-09-21 16:59:44.022723060 +0200 +++ /var/tmp/diff_new_pack.ZSMYaE/_new 2020-09-21 16:59:44.022723060 +0200 @@ -1,7 +1,7 @@ # # spec file for package libpaper1 # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,13 +17,13 @@ Name: libpaper1 -Version: 1.1.26 +Version: 1.1.28 Release: 0 Summary: Library to handle papers License: GPL-2.0-or-later Group: System/Libraries -Url: http://packages.debian.org/unstable/source/libpaper -Source: libpaper_%{version}.tar.gz +URL: https://packages.debian.org/unstable/source/libpaper +Source: http://ftp.de.debian.org/debian/pool/main/libp/libpaper/libpaper_%{version}.tar.gz Source1: libpaper1-rpmlintrc %if 0%{?suse_version} BuildRequires: autoconf @@ -33,7 +33,6 @@ BuildRequires: fdupes %endif %endif -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description This package contains a simple library for use by programs needing to @@ -65,7 +64,7 @@ %build autoreconf -fi %configure --disable-static -make %{?_smp_mflags} +%make_build %install %make_install @@ -82,11 +81,9 @@ %postun -p /sbin/ldconfig %files -%defattr(-,root,root) %{_libdir}/libpaper.so.1* %files -n libpaper-utils -%defattr(-,root,root) %if 0%{?suse_version} >= 01500 %license %{_defaultdocdir}/libpaper/COPYING %doc %{_defaultdocdir}/libpaper/{README,ChangeLog,changelog} @@ -100,7 +97,6 @@ %{_sbindir}/paperconfig %files -n libpaper-devel -%defattr(-,root,root) %{_mandir}/man3/* %{_mandir}/man5/* %{_includedir}/paper.h ++++++ libpaper_1.1.26.tar.gz -> libpaper_1.1.28.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libpaper-1.1.26/configure.ac new/libpaper-1.1.28/configure.ac --- old/libpaper-1.1.26/configure.ac 2018-12-11 11:50:29.000000000 +0100 +++ new/libpaper-1.1.28/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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libpaper-1.1.26/debian/changelog new/libpaper-1.1.28/debian/changelog --- old/libpaper-1.1.26/debian/changelog 2018-12-11 11:50:45.000000000 +0100 +++ new/libpaper-1.1.28/debian/changelog 2019-06-26 00:04:32.000000000 +0200 @@ -1,3 +1,16 @@ +libpaper (1.1.28) unstable; urgency=medium + + * Completely fixed #927226. + + -- Giuseppe Sacco <[email protected]> Wed, 26 Jun 2019 00:04:32 +0200 + +libpaper (1.1.27) unstable; urgency=medium + + * Fixed a circular dependency in debian/rules that left libpaper1.config + not built. See #927226. + + -- Giuseppe Sacco <[email protected]> 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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libpaper-1.1.26/debian/libpaper1.config new/libpaper-1.1.28/debian/libpaper1.config --- old/libpaper-1.1.26/debian/libpaper1.config 2018-12-11 11:50:45.000000000 +0100 +++ new/libpaper-1.1.28/debian/libpaper1.config 2019-06-26 00:04:32.000000000 +0200 @@ -10,9 +10,12 @@ # Try to find a matching paper size. The data must be embedded here # (done automatically by debian/rules) because the rest of the package # may not have been unpacked at this stage. - LC_ALL=C awk 'NF == 5 && int($2 + 0.5) == '"$w"' && int($4 + 0.5) == '"$h"' { + LC_ALL=C awk -v w="$w" -v h="$h" 'NF == 3 && int($2*72/2.54 + 0.5) == w && int($3*72/2.54 + 0.5) == h { print $1; - exit; + exit} + NF == 4 && $2 == w && $3 == h { + print $1; + exit }' <<__END_PAPERSPECS__ __BEGIN_PAPERSPECS__ __END_PAPERSPECS__ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libpaper-1.1.26/debian/rules new/libpaper-1.1.28/debian/rules --- old/libpaper-1.1.26/debian/rules 2018-12-02 22:28:23.000000000 +0100 +++ new/libpaper-1.1.28/debian/rules 2019-06-23 22:08:17.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 > [email protected] \ - && sed -n '1,/^__BEGIN_PAPERSPECS__/p' $@ \ - && $(native_paperconf) -amns \ - && sed -n '/^__END_PAPERSPECS__/,$$p' $@ - mv [email protected] $@ +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
