tags 607332 + pending tags 639772 + patch tags 639772 + pending thanks Dear maintainer,
I've prepared an NMU for slrn (versioned as 1.0.0~pre18-1.2) and uploaded it to DELAYED/2. Please feel free to tell me if I should delay it longer. Regards. -- .''`. Homepage: http://info.comodo.priv.at/ - OpenPGP key ID: 0x8649AA06 : :' : Debian GNU/Linux user, admin, & developer - http://www.debian.org/ `. `' Member of VIBE!AT & SPI, fellow of Free Software Foundation Europe `- NP: Arlo Guthrie: Can't Help Falling in Love
diff -u slrn-1.0.0~pre18/debian/changelog slrn-1.0.0~pre18/debian/changelog --- slrn-1.0.0~pre18/debian/changelog +++ slrn-1.0.0~pre18/debian/changelog @@ -1,3 +1,16 @@ +slrn (1.0.0~pre18-1.2) unstable; urgency=low + + * Non-maintainer upload. + * Fix "FTBFS: checking for the slang library and header files ... no": + tell configure about the multiarched slang lib; build-depend on dpkg-dev + (>= 1.16.0). Remove rpath that gets introduced by the multiarch path. + (Closes: #639772) + * Fix "cleanscore breaks with perl 5.12": new patch + cleanscore-prototypes.dpatch. + (Closes: #607332) + + -- gregor herrmann <gre...@debian.org> Sat, 03 Dec 2011 15:12:43 +0100 + slrn (1.0.0~pre18-1.1) unstable; urgency=low * Non-maintainer upload. diff -u slrn-1.0.0~pre18/debian/control slrn-1.0.0~pre18/debian/control --- slrn-1.0.0~pre18/debian/control +++ slrn-1.0.0~pre18/debian/control @@ -4,7 +4,8 @@ Maintainer: Jörg Sommer <jo...@alea.gnuu.de> Build-Depends: debhelper (>= 6.0.7~), libslang2-dev, libuu-dev, exim4 | mail-transport-agent, libgnutls-dev, po-debconf, autoconf, - dpatch (>= 2.0.30), libcanlock2-dev, autotools-dev, hardening-wrapper + dpatch (>= 2.0.30), libcanlock2-dev, autotools-dev, hardening-wrapper, + dpkg-dev (>= 1.16.0), chrpath Standards-Version: 3.8.4 Homepage: http://www.slrn.org/ Vcs-Browser: http://git.debian.org/?p=users/jo-guest/slrn.git diff -u slrn-1.0.0~pre18/debian/rules slrn-1.0.0~pre18/debian/rules --- slrn-1.0.0~pre18/debian/rules +++ slrn-1.0.0~pre18/debian/rules @@ -7,6 +7,8 @@ WITH_UUDEV := --with-uu endif +DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) + # These additional compiler flags should bring up warnings about common # sources of errors. export CFLAGS += -Wall -g -Wformat=2 -Wunused -Wundef -Wextra -Wswitch-enum \ @@ -42,6 +44,8 @@ --with-canlock \ --without-x \ $(WITH_UUDEV) \ + --with-slanglib=/usr/lib/$(DEB_HOST_MULTIARCH) \ + --with-slanginc=/usr/include \ || { rc=$$?; cat config.log; exit $$rc; } $(MAKE) -C src CONFDIR=/etc/news slrn @@ -61,6 +65,7 @@ $(MAKE) install DESTDIR=$(tmp_dir) dh_install + chrpath --delete $(slrn_dir)/usr/bin/slrn # # slrn diff -u slrn-1.0.0~pre18/debian/patches/00list slrn-1.0.0~pre18/debian/patches/00list --- slrn-1.0.0~pre18/debian/patches/00list +++ slrn-1.0.0~pre18/debian/patches/00list @@ -10,0 +11 @@ +cleanscore-prototypes only in patch2: unchanged: --- slrn-1.0.0~pre18.orig/debian/patches/cleanscore-prototypes.dpatch +++ slrn-1.0.0~pre18/debian/patches/cleanscore-prototypes.dpatch @@ -0,0 +1,41 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## cleanscore-prototypes.dpatch by gregor herrmann <gre...@debian.org> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Taken from https://groups.google.com/group/news.software.readers/msg/5bdbd6dfa74332b8 +## DP: Original author: Ignatios Souvatzis +## DP: subroutine prototypes have changed in perl since 5.12 + +@DPATCH@ +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' slrn-1.0.0~pre18~/contrib/cleanscore slrn-1.0.0~pre18/contrib/cleanscore +--- slrn-1.0.0~pre18~/contrib/cleanscore 2009-12-02 16:44:32.000000000 +0100 ++++ slrn-1.0.0~pre18/contrib/cleanscore 2011-12-03 15:07:24.000000000 +0100 +@@ -27,8 +27,8 @@ + + sub help(); + sub reset_vars(%); +-sub insert_comment(%%); +-sub end_of_score(%$); ++sub insert_comment(%); ++sub end_of_score(%); + sub clean_file($); + + # globals variables. +@@ -323,7 +323,7 @@ + + # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # + +-sub end_of_score(%$) ++sub end_of_score(%) + { + my $entry = shift; + my $file_is_changed = shift; +@@ -355,7 +355,7 @@ + + # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # + +-sub insert_comment(%%) ++sub insert_comment(%) + { + my $comment=shift; + my $entry=shift;
signature.asc
Description: Digital signature
