diff -urN origs/libpaper-1.1.24+nmu1/debian/changelog patched/libpaper-1.1.24+nmu2/debian/changelog --- origs/libpaper-1.1.24+nmu1/debian/changelog 2011-05-06 05:07:23.000000000 +0000 +++ patched/libpaper-1.1.24+nmu2/debian/changelog 2012-05-02 18:50:52.000000000 +0000 @@ -1,3 +1,11 @@ +libpaper (1.1.24+nmu2) unstable; urgency=low + + * Add multiarch support (Closes: #649672) + * Fix option-parsing headers for non-linux OSes (Closes: #542851) + * Correct DL size in paperconf (Closes: #475683) + + -- Wookey Wed, 02 May 2012 17:52:10 +0000 + libpaper (1.1.24+nmu1) unstable; urgency=low * Non-maintainer upload. diff -urN origs/libpaper-1.1.24+nmu1/debian/compat patched/libpaper-1.1.24+nmu2/debian/compat --- origs/libpaper-1.1.24+nmu1/debian/compat 2010-02-24 21:57:52.000000000 +0000 +++ patched/libpaper-1.1.24+nmu2/debian/compat 2012-05-03 15:34:02.000000000 +0000 @@ -1 +1 @@ -7 +9 diff -urN origs/libpaper-1.1.24+nmu1/debian/control patched/libpaper-1.1.24+nmu2/debian/control --- origs/libpaper-1.1.24+nmu1/debian/control 2010-02-24 22:11:41.000000000 +0000 +++ patched/libpaper-1.1.24+nmu2/debian/control 2012-05-03 15:40:48.000000000 +0000 @@ -3,10 +3,12 @@ Priority: optional Maintainer: Giuseppe Sacco Standards-Version: 3.6.2 -Build-Depends: autotools-dev, debhelper (>= 7), po-debconf, autoconf +Build-Depends: autotools-dev, debhelper (>= 8.1.3~), dh-exec(>= 0.3), po-debconf, autoconf Package: libpaper1 Architecture: any +Multi-Arch: same +Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends}, ucf (>= 0.28) Replaces: libpaperg (<< 1.1.9) Provides: libpaperg @@ -19,6 +21,7 @@ Package: libpaper-utils Section: utils Architecture: any +Multi-Arch: foreign Depends: ${shlibs:Depends}, ${misc:Depends} Replaces: libpaperg (<< 1.1.9), libpaper1 (<< 1.1.10) Description: library for handling paper characteristics (utilities) @@ -33,6 +36,8 @@ Package: libpaper-dev Section: libdevel Architecture: any +Multi-Arch: same +Pre-Depends: ${misc:Pre-Depends} Depends: libpaper1 (= ${binary:Version}), ${misc:Depends} Replaces: libpaperg-dev (<< 1.1.9) Provides: libpaperg-dev diff -urN origs/libpaper-1.1.24+nmu1/debian/libpaper-dev.install patched/libpaper-1.1.24+nmu2/debian/libpaper-dev.install --- origs/libpaper-1.1.24+nmu1/debian/libpaper-dev.install 2002-11-11 00:56:08.000000000 +0000 +++ patched/libpaper-1.1.24+nmu2/debian/libpaper-dev.install 2012-05-03 15:41:11.000000000 +0000 @@ -1,4 +1,5 @@ +#! /usr/bin/dh-exec --with-scripts=subst-multiarch debian/tmp/usr/include -debian/tmp/usr/lib/libpaper.a -debian/tmp/usr/lib/libpaper.so +debian/tmp/usr/lib/${DEB_HOST_MULTIARCH}/libpaper.a +debian/tmp/usr/lib/${DEB_HOST_MULTIARCH}/libpaper.so debian/tmp/usr/share/man/man3 diff -urN origs/libpaper-1.1.24+nmu1/debian/libpaper1.install patched/libpaper-1.1.24+nmu2/debian/libpaper1.install --- origs/libpaper-1.1.24+nmu1/debian/libpaper1.install 2002-11-19 07:30:23.000000000 +0000 +++ patched/libpaper-1.1.24+nmu2/debian/libpaper1.install 2012-05-03 15:41:18.000000000 +0000 @@ -1,2 +1,3 @@ -debian/tmp/usr/lib/libpaper.so.* +#! /usr/bin/dh-exec --with-scripts=subst-multiarch +debian/tmp/usr/lib/${DEB_HOST_MULTIARCH}/libpaper.so.* debian/tmp/usr/share/man/man5 diff -urN origs/libpaper-1.1.24+nmu1/debian/rules patched/libpaper-1.1.24+nmu2/debian/rules --- origs/libpaper-1.1.24+nmu1/debian/rules 2010-02-24 21:58:13.000000000 +0000 +++ patched/libpaper-1.1.24+nmu2/debian/rules 2012-05-03 15:31:45.000000000 +0000 @@ -4,14 +4,14 @@ export DH_OPTIONS= -export DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) -export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) +include /usr/share/dpkg/architecture.mk package := $(firstword $(shell dh_listpackages)) prefix := $(CURDIR)/debian/tmp share := /usr/share config_flags := --prefix=/usr \ + --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \ --sysconfdir=/etc \ --mandir=$(share)/man \ --infodir=$(share)/info \ @@ -103,7 +103,7 @@ dh_makeshlibs dh_installdebconf dh_installdeb - dh_shlibdeps -L$(package) -ldebian/$(package)/usr/lib + dh_shlibdeps -L$(package) -ldebian/$(package)/usr/lib/$(DEB_HOST_MULTIARCH) dh_gencontrol dh_md5sums dh_builddeb diff -urN origs/libpaper-1.1.24+nmu1/lib/paperspecs patched/libpaper-1.1.24+nmu2/lib/paperspecs --- origs/libpaper-1.1.24+nmu1/lib/paperspecs 2004-10-23 09:53:15.000000000 +0000 +++ patched/libpaper-1.1.24+nmu2/lib/paperspecs 2012-05-02 18:59:40.000000000 +0000 @@ -40,7 +40,7 @@ c6 114 162 mm c7 81 114 mm c8 57 81 mm -DL 312 624 +DL 110 220 mm Comm10 297 684 Monarch 279 540 archE 2592 3456 diff -urN origs/libpaper-1.1.24+nmu1/man/paperconf.1.in patched/libpaper-1.1.24+nmu2/man/paperconf.1.in --- origs/libpaper-1.1.24+nmu1/man/paperconf.1.in 2004-01-20 04:35:04.000000000 +0000 +++ patched/libpaper-1.1.24+nmu2/man/paperconf.1.in 2012-05-02 18:52:27.000000000 +0000 @@ -1,8 +1,8 @@ .TH PAPERCONF 1 "24 April 2001" .SH NAME .B paperconf -\- print paper configuration informations -.SH SYNOPSYS +\- print paper configuration information +.SH SYNOPSIS .B paperconf [ [ @@ -38,8 +38,8 @@ ] .SH DESCRIPTION .B paperconf -prints informations about a given paper. -The informations that can be obtaineed are the name of the paper, its +prints information about a given paper. +The information that can be obtained is the name of the paper, its size and its width or height. When called without arguments, .B paperconf @@ -48,7 +48,7 @@ .B @PAPERSIZEVAR@ environment variable, at the contents of the file specified by the .B @PAPERCONFVAR@ -environment variable, at the contects of +environment variable, at the contents of .B @PAPERCONF@ or by using .B letter @@ -59,13 +59,13 @@ .BI \-p " paper" Specify the name of the .I paper -about which informations are asked. +about which information is asked. .TP .B \-d Use the default builtin paper name. .TP .B \-a -Consider all known papers names. +Consider all known paper names. .TP .B \-z If the paper name is unknown, print it but issue a message on the diff -urN origs/libpaper-1.1.24+nmu1/src/paperconf.c patched/libpaper-1.1.24+nmu2/src/paperconf.c --- origs/libpaper-1.1.24+nmu1/src/paperconf.c 2007-09-26 06:13:38.000000000 +0000 +++ patched/libpaper-1.1.24+nmu2/src/paperconf.c 2012-05-02 18:52:47.000000000 +0000 @@ -6,7 +6,7 @@ #include #include -#include +#include #include #include #include