Package: slrn Severity: wishlist Tags: patch -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256
Upstream has released a final 1.0.0 version yesterday (and a 1.0.1 bugfix release). It would be great to see this new version in Debian. I've updated the package locally, and I'm attaching the diff of the debian/ dir in case it might be useful. Cheers, gregor -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iQIcBAEBCAAGBQJQ1RRiAAoJELs6aAGGSaoGVUsP/AhEpNYceoxTaWTe3eshrXr1 NbbybPToOD5pohSTJ9AS/gKUTw0iCVRmS1B4tRgOYWx3Vw7th267+EOv0v0I1oKP xJZjbf0HmMHRiE7nLGxKLmXwbjL4rEOj1oqUq6RN1lFXej9Mo4dO3GMmSRLmrlsI y/DtETtHgYcV1EhPGj2RTVaX0FLSXHTXx2lHOKWJRJEJR7YHwRtGeVaf4C2oRktk Fz1cuBYgUailfIOaEa2+jVUfwOj9DODURBzBAKDGVgjM88qoYge7ZdTOEFlc090p WMeyp82OiO29CB1WTXTkYjNF1SqiSXPD9gY/6az8ZqvGzPiSlaNBaM3Qlri9mdil 0tmTYYt1xwLB15rC21u+XxQxA2sWApT0fBFmfNZHp0I6Du2W+GBBtwph7PqRVshp 3B+XAKDSoJR6wZzD0A/SY6qL3ueVdOXLafprv/VzF2WGajTS4UvIsDKxL2PtRffF 6XjBI+BhN3AA1yF/Gr7kwnTtPe11fqi92iHe+jQjxZ13C6b43ygifPgS30H3RFbf eJc/9rvoQJmN6jS8ONKkDSa3CiMbZBL2rHRx+WgAsaK2rs/Acc3FTfEKk9OAahij FVEB2kvgK872sjSx5VtVjtZAV2U+B6Bc1htiV32ObTNxK2oDgkJgG5CrAEaIvt/6 DW98iLRN6X9xLUjlHUhI =VHje -----END PGP SIGNATURE-----
diff -Nru slrn-1.0.0~pre18/debian/changelog slrn-1.0.1/debian/changelog --- slrn-1.0.0~pre18/debian/changelog 2012-12-22 02:55:25.000000000 +0100 +++ slrn-1.0.1/debian/changelog 2012-12-22 02:55:26.000000000 +0100 @@ -1,3 +1,20 @@ +slrn (1.0.1-0.1) experimental; urgency=low + + * NMU. + * New upstream release. + + -- gregor herrmann <gre...@debian.org> Sat, 22 Dec 2012 02:35:29 +0100 + +slrn (1.0.0-0.1) experimental; urgency=low + + * NMU. + * New upstream release. + * Convert patches from dpatch to quilt, drop one, replace another one with + dh-autoreconf. + * Define path to gnutls in debian/rules. + + -- gregor herrmann <gre...@debian.org> Sat, 22 Dec 2012 01:24:36 +0100 + slrn (1.0.0~pre18-1.3) unstable; urgency=low * Non-maintainer upload. diff -Nru slrn-1.0.0~pre18/debian/control slrn-1.0.1/debian/control --- slrn-1.0.0~pre18/debian/control 2012-12-22 02:55:25.000000000 +0100 +++ slrn-1.0.1/debian/control 2012-12-22 02:55:26.000000000 +0100 @@ -3,9 +3,9 @@ Priority: optional 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, - dpkg-dev (>= 1.16.0), chrpath + exim4 | mail-transport-agent, libgnutls-dev, po-debconf, + quilt (>= 0.40), libcanlock2-dev, hardening-wrapper, + dpkg-dev (>= 1.16.0), chrpath, dh-autoreconf Standards-Version: 3.8.4 Homepage: http://www.slrn.org/ Vcs-Browser: http://git.debian.org/?p=users/jo-guest/slrn.git diff -Nru slrn-1.0.0~pre18/debian/patches/00list slrn-1.0.1/debian/patches/00list --- slrn-1.0.0~pre18/debian/patches/00list 2012-12-22 02:55:25.000000000 +0100 +++ slrn-1.0.1/debian/patches/00list 1970-01-01 01:00:00.000000000 +0100 @@ -1,11 +0,0 @@ -201_configure.diff -configure-rebuild - -202_help.txt.diff -203_locations.diff -204_manpage.diff -211_query-cutoff.diff - -config.guess+sub -fix-multipart.sl -cleanscore-prototypes diff -Nru slrn-1.0.0~pre18/debian/patches/201_configure.diff slrn-1.0.1/debian/patches/201_configure.diff --- slrn-1.0.0~pre18/debian/patches/201_configure.diff 2012-12-22 02:55:25.000000000 +0100 +++ slrn-1.0.1/debian/patches/201_configure.diff 1970-01-01 01:00:00.000000000 +0100 @@ -1,21 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 201_configure.diff, author unknown -## -## DP: The configure script for slrn searches the $PATH for inews. We don't -## DP: want to install a news server at build time so we hardcode the path. - -@DPATCH@ -diff --git a/autoconf/configure.ac b/autoconf/configure.ac ---- a/autoconf/configure.ac -+++ b/autoconf/configure.ac -@@ -97,7 +97,9 @@ CF_COMPILE_OPTION(inews, - [SLRN_HAS_INEWS_SUPPORT], 0) - if test "x$enable_inews" = xyes ; then - dnl# find inews -- AC_PATH_PROG(INEWS, inews, no, $PATH:/usr/local/bin:/usr/bin) -+ dnl# always on for debian -+ dnl# AC_PATH_PROG(INEWS, inews, no, $PATH:/usr/local/bin:/usr/bin) -+ ac_cv_path_INEWS=/usr/bin/inews - if test "x$ac_cv_path_INEWS" != xno; then - dnl# AC_DEFINE_UNQUOTED(SLRN_INEWS_COMMAND, "$ac_cv_path_INEWS -S -h") - AC_SUBST(SLRN_INEWS_COMMAND, "$ac_cv_path_INEWS -S -h") diff -Nru slrn-1.0.0~pre18/debian/patches/201_configure.patch slrn-1.0.1/debian/patches/201_configure.patch --- slrn-1.0.0~pre18/debian/patches/201_configure.patch 1970-01-01 01:00:00.000000000 +0100 +++ slrn-1.0.1/debian/patches/201_configure.patch 2012-12-22 02:55:26.000000000 +0100 @@ -0,0 +1,16 @@ +Author: +Description: The configure script for slrn searches the $PATH for inews. We don't +want to install a news server at build time so we hardcode the path. +--- a/autoconf/configure.ac ++++ b/autoconf/configure.ac +@@ -125,7 +125,9 @@ + [SLRN_HAS_INEWS_SUPPORT], 0) + if test "x$enable_inews" = xyes ; then + dnl# find inews +- AC_PATH_PROG(INEWS, inews, no, $PATH:/usr/local/bin:/usr/bin) ++ dnl# always on for debian ++ dnl# AC_PATH_PROG(INEWS, inews, no, $PATH:/usr/local/bin:/usr/bin) ++ ac_cv_path_INEWS=/usr/bin/inews + if test "x$ac_cv_path_INEWS" != xno; then + dnl# AC_DEFINE_UNQUOTED(SLRN_INEWS_COMMAND, "$ac_cv_path_INEWS -S -h") + AC_SUBST(SLRN_INEWS_COMMAND, "$ac_cv_path_INEWS -S -h") diff -Nru slrn-1.0.0~pre18/debian/patches/202_help.txt.diff slrn-1.0.1/debian/patches/202_help.txt.diff --- slrn-1.0.0~pre18/debian/patches/202_help.txt.diff 2012-12-22 02:55:25.000000000 +0100 +++ slrn-1.0.1/debian/patches/202_help.txt.diff 1970-01-01 01:00:00.000000000 +0100 @@ -1,31 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 202_help.txt.diff; author unknown -## -## DP: * Because Perl is every time installed on Debian we can simplify the -## DP: upgrade message. -## DP: * help.txt is installed as slrn-help.txt in Debian. - -@DPATCH@ ---- slrn-0.9.8.0.orig/src/slrn.c -+++ slrn-0.9.8.0/src/slrn.c -@@ -1221,9 +1221,8 @@ - { - slrn_message (_("\n! Your configuration file contains obsolete commands or function names that\n" - "! will not be supported by future versions of this program.\n" -- "! If you have Perl installed, you can use the script slrnrc-conv to change\n" -- "! your configuration accordingly. It can be found in the source distribution\n" -- "! or retrieved from <URL:http://slrn.sourceforge.net/data/>.\n")); -+ "! You can use the script /usr/share/slrn/contrib/slrnrc-conv to change\n" -+ "! your configuration accordingly.\n")); - Slrn_Saw_Warning = 1; - } - -@@ -1281,7 +1281,7 @@ - #ifdef VMS - slrn_snprintf (file, sizeof (file), "%s%s", SLRN_CONF_DIR, "help.txt"); - #else -- slrn_snprintf (file, sizeof (file), "%s/%s", SLRN_CONF_DIR, "help.txt"); -+ slrn_snprintf (file, sizeof (file), "%s/%s", SLRN_CONF_DIR, "slrn-help.txt"); - #endif - } - diff -Nru slrn-1.0.0~pre18/debian/patches/202_help.txt.patch slrn-1.0.1/debian/patches/202_help.txt.patch --- slrn-1.0.0~pre18/debian/patches/202_help.txt.patch 1970-01-01 01:00:00.000000000 +0100 +++ slrn-1.0.1/debian/patches/202_help.txt.patch 2012-12-22 02:55:26.000000000 +0100 @@ -0,0 +1,27 @@ +Author: +Description: * Because Perl is every time installed on Debian we can simplify the +upgrade message. +* help.txt is installed as slrn-help.txt in Debian. +--- a/src/slrn.c ++++ b/src/slrn.c +@@ -1194,9 +1194,8 @@ + { + slrn_message (_("\n! Your configuration file contains obsolete commands or function names that\n" + "! will not be supported by future versions of this program.\n" +- "! If you have Perl installed, you can use the script slrnrc-conv to change\n" +- "! your configuration accordingly. It can be found in the source distribution\n" +- "! or retrieved from <URL:http://slrn.sourceforge.net/data/>.\n")); ++ "! You can use the script /usr/share/slrn/contrib/slrnrc-conv to change\n" ++ "! your configuration accordingly.\n")); + Slrn_Saw_Warning = 1; + } + +@@ -1272,7 +1271,7 @@ + #ifdef VMS + slrn_snprintf (file, sizeof (file), "%s%s", SLRN_CONF_DIR, "help.txt"); + #else +- slrn_snprintf (file, sizeof (file), "%s/%s", SLRN_CONF_DIR, "help.txt"); ++ slrn_snprintf (file, sizeof (file), "%s/%s", SLRN_CONF_DIR, "slrn-help.txt"); + #endif + } + diff -Nru slrn-1.0.0~pre18/debian/patches/203_locations.diff slrn-1.0.1/debian/patches/203_locations.diff --- slrn-1.0.0~pre18/debian/patches/203_locations.diff 2012-12-22 02:55:25.000000000 +0100 +++ slrn-1.0.1/debian/patches/203_locations.diff 1970-01-01 01:00:00.000000000 +0100 @@ -1,37 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 203_locations.diff author unknown -## -## DP: This patch changes values in src/slrnfeat.hin - -@DPATCH@ -diff -Nur slrn-0.9.8.1pl1.orig/src/slrnfeat.h slrn-0.9.8.1pl1/src/slrnfeat.h ---- slrn-0.9.8.1pl1.orig/src/slrnfeat.hin -+++ slrn-0.9.8.1pl1/src/slrnfeat.hin -@@ -70,7 +70,7 @@ - */ - - /* Root directory names */ --# define SLRN_SPOOL_ROOT "/var/spool/news" -+# define SLRN_SPOOL_ROOT "/var/spool/slrnpull/news" - /* SLRN_NOV_ROOT gives the root directory for overview files - * if you don't have overview files, leave as SLRN_SPOOL_ROOT for now */ - # define SLRN_SPOOL_NOV_ROOT SLRN_SPOOL_ROOT -@@ -152,7 +152,9 @@ - #endif /* vms */ - - /* #define OUR_ORGANIZATION "organization-name" */ -+#define OUR_ORGANIZATION "/etc/news/organization" - /* #define OUR_HOSTNAME "host.name.here" */ -+#define OUR_HOSTNAME "/etc/mailname" - - #if SLRN_HAS_GROUPLENS - # undef SLRN_USE_SLTCP -@@ -189,7 +191,7 @@ - #define SLRNPULL_NEWS_DIR "news" - - /* File where messages and errors will be placed. */ --#define SLRNPULL_LOGFILE "log" -+#define SLRNPULL_LOGFILE "/var/log/news/slrnpull.log" - - #if !SLRN_HAS_NNTP_SUPPORT - # undef SLRN_HAS_GROUPLENS diff -Nru slrn-1.0.0~pre18/debian/patches/203_locations.patch slrn-1.0.1/debian/patches/203_locations.patch --- slrn-1.0.0~pre18/debian/patches/203_locations.patch 1970-01-01 01:00:00.000000000 +0100 +++ slrn-1.0.1/debian/patches/203_locations.patch 2012-12-22 02:55:26.000000000 +0100 @@ -0,0 +1,32 @@ +Author: +Description: This patch changes values in src/slrnfeat.hin +--- a/src/slrnfeat.hin ++++ b/src/slrnfeat.hin +@@ -104,7 +104,7 @@ + */ + + /* Root directory names */ +-# define SLRN_SPOOL_ROOT "/var/spool/news" ++# define SLRN_SPOOL_ROOT "/var/spool/slrnpull/news" + /* SLRN_NOV_ROOT gives the root directory for overview files + * if you don't have overview files, leave as SLRN_SPOOL_ROOT for now */ + # define SLRN_SPOOL_NOV_ROOT SLRN_SPOOL_ROOT +@@ -186,7 +186,9 @@ + #endif /* vms */ + + /* #define OUR_ORGANIZATION "organization-name" */ ++#define OUR_ORGANIZATION "/etc/news/organization" + /* #define OUR_HOSTNAME "host.name.here" */ ++#define OUR_HOSTNAME "/etc/mailname" + + #if SLRN_HAS_GROUPLENS + # undef SLRN_USE_SLTCP +@@ -228,7 +230,7 @@ + #define SLRNPULL_NEWS_DIR "news" + + /* File where messages and errors will be placed. */ +-#define SLRNPULL_LOGFILE "log" ++#define SLRNPULL_LOGFILE "/var/log/news/slrnpull.log" + + #if !SLRN_HAS_NNTP_SUPPORT + # undef SLRN_HAS_GROUPLENS diff -Nru slrn-1.0.0~pre18/debian/patches/204_manpage.diff slrn-1.0.1/debian/patches/204_manpage.diff --- slrn-1.0.0~pre18/debian/patches/204_manpage.diff 2012-12-22 02:55:25.000000000 +0100 +++ slrn-1.0.1/debian/patches/204_manpage.diff 1970-01-01 01:00:00.000000000 +0100 @@ -1,18 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 204_manpage.diff author unknown -## -## DP: The file help.txt is installed as slrn-help.txt in Debian. -## DP: So update the manpage. - -@DPATCH@ ---- slrn-0.9.8.0.orig/doc/slrn.1 -+++ slrn-0.9.8.0/doc/slrn.1 -@@ -208,7 +208,7 @@ - You can set this variable to a file slrn - should read its online help from. This is only needed when the default key - bindings have been changed and you want the help function to reflect this. --If unset, slrn looks for help.txt in the configuration directory. -+If unset, slrn looks for slrn-help.txt in the configuration directory. - .TP - .B SLRNHOME - When interpreting filenames as relative to your home directory, diff -Nru slrn-1.0.0~pre18/debian/patches/204_manpage.patch slrn-1.0.1/debian/patches/204_manpage.patch --- slrn-1.0.0~pre18/debian/patches/204_manpage.patch 1970-01-01 01:00:00.000000000 +0100 +++ slrn-1.0.1/debian/patches/204_manpage.patch 2012-12-22 02:55:26.000000000 +0100 @@ -0,0 +1,14 @@ +Author: +Description: The file help.txt is installed as slrn-help.txt in Debian. +So update the manpage. +--- a/doc/slrn.1 ++++ b/doc/slrn.1 +@@ -207,7 +207,7 @@ + You can set this variable to a file slrn + should read its online help from. This is only needed when the default key + bindings have been changed and you want the help function to reflect this. +-If unset, slrn looks for help.txt in the configuration directory. ++If unset, slrn looks for slrn-help.txt in the configuration directory. + .TP + .B SLRNHOME + When interpreting filenames as relative to your home directory, diff -Nru slrn-1.0.0~pre18/debian/patches/211_query-cutoff.diff slrn-1.0.1/debian/patches/211_query-cutoff.diff --- slrn-1.0.0~pre18/debian/patches/211_query-cutoff.diff 2012-12-22 02:55:25.000000000 +0100 +++ slrn-1.0.1/debian/patches/211_query-cutoff.diff 1970-01-01 01:00:00.000000000 +0100 @@ -1,28 +0,0 @@ -#! /bin/sh -e -if [ $# -ne 1 ]; then - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1 -fi -case "$1" in - -patch) patch -f --no-backup-if-mismatch -p1 < $0;; - -unpatch) patch -f --no-backup-if-mismatch -R -p1 < $0;; - *) - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1;; -esac - -exit 0 - -@DPATCH@ -diff -Nur slrn-0.9.8.1pl1.orig/src/group.c slrn-0.9.8.1pl1/src/group.c ---- slrn-0.9.8.1pl1.orig/src/group.c 2004-12-06 00:59:17.000000000 +0100 -+++ slrn-0.9.8.1pl1/src/group.c 2006-08-01 14:01:59.000000000 +0200 -@@ -68,7 +68,7 @@ - - /*{{{ Global Variables */ - --int Slrn_Query_Group_Cutoff = 100; -+int Slrn_Query_Group_Cutoff = 1000; - int Slrn_Groups_Dirty; /* 1 == need to write newsrc */ - int Slrn_List_Active_File = 0; - int Slrn_Write_Newsrc_Flags = 0; /* if 1, do not save unsubscribed diff -Nru slrn-1.0.0~pre18/debian/patches/211_query-cutoff.patch slrn-1.0.1/debian/patches/211_query-cutoff.patch --- slrn-1.0.0~pre18/debian/patches/211_query-cutoff.patch 1970-01-01 01:00:00.000000000 +0100 +++ slrn-1.0.1/debian/patches/211_query-cutoff.patch 2012-12-22 02:55:26.000000000 +0100 @@ -0,0 +1,13 @@ +Author: +Description: +--- a/src/group.c ++++ b/src/group.c +@@ -69,7 +69,7 @@ + + /*{{{ Global Variables */ + +-int Slrn_Query_Group_Cutoff = 100; ++int Slrn_Query_Group_Cutoff = 1000; + int Slrn_Groups_Dirty; /* 1 == need to write newsrc */ + int Slrn_List_Active_File = 0; + int Slrn_Write_Newsrc_Flags = 0; /* if 1, do not save unsubscribed diff -Nru slrn-1.0.0~pre18/debian/patches/cleanscore-prototypes.dpatch slrn-1.0.1/debian/patches/cleanscore-prototypes.dpatch --- slrn-1.0.0~pre18/debian/patches/cleanscore-prototypes.dpatch 2012-12-22 02:55:25.000000000 +0100 +++ slrn-1.0.1/debian/patches/cleanscore-prototypes.dpatch 1970-01-01 01:00:00.000000000 +0100 @@ -1,41 +0,0 @@ -#! /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; diff -Nru slrn-1.0.0~pre18/debian/patches/cleanscore-prototypes.patch slrn-1.0.1/debian/patches/cleanscore-prototypes.patch --- slrn-1.0.0~pre18/debian/patches/cleanscore-prototypes.patch 1970-01-01 01:00:00.000000000 +0100 +++ slrn-1.0.1/debian/patches/cleanscore-prototypes.patch 2012-12-22 02:55:26.000000000 +0100 @@ -0,0 +1,35 @@ +Author: gregor herrmann <gre...@debian.org> +Description: Taken from https://groups.google.com/group/news.software.readers/msg/5bdbd6dfa74332b8 +Original author: Ignatios Souvatzis +subroutine prototypes have changed in perl since 5.12 +--- a/contrib/cleanscore ++++ b/contrib/cleanscore +@@ -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; diff -Nru slrn-1.0.0~pre18/debian/patches/config.guess+sub.dpatch slrn-1.0.1/debian/patches/config.guess+sub.dpatch --- slrn-1.0.0~pre18/debian/patches/config.guess+sub.dpatch 2012-12-22 02:55:25.000000000 +0100 +++ slrn-1.0.1/debian/patches/config.guess+sub.dpatch 1970-01-01 01:00:00.000000000 +0100 @@ -1,24 +0,0 @@ -#! /bin/sh -e -## config.guess+sub.dpatch © Ralf Treinen <trei...@debian.org> -## -## DP: replace all config.{guess,sub} by the vesion installed in -## DP: /usr/share/misc - -dpatch_patch () -{ - find . -name config.guess -o -name config.sub \ - | tar vcf debian/patched/config.guess+sub.tar -T - - find . -name config.guess \ - -exec ln -sfv /usr/share/misc/config.guess '{}' \; - find . -name config.sub \ - -exec ln -sfv /usr/share/misc/config.sub '{}' \; -} - -dpatch_unpatch () -{ - tar xf debian/patched/config.guess+sub.tar -} - -DPATCH_LIB_NO_DEFAULT=1 - -. /usr/share/dpatch/dpatch.lib.sh diff -Nru slrn-1.0.0~pre18/debian/patches/configure-rebuild.dpatch slrn-1.0.1/debian/patches/configure-rebuild.dpatch --- slrn-1.0.0~pre18/debian/patches/configure-rebuild.dpatch 2012-12-22 02:55:25.000000000 +0100 +++ slrn-1.0.1/debian/patches/configure-rebuild.dpatch 1970-01-01 01:00:00.000000000 +0100 @@ -1,20 +0,0 @@ -#! /bin/sh -e -## configure-rebuild.dpatch © Jörg Sommer <jo...@alea.gnuu.de> -## -## DP: Rebuild the configure file - -dpatch_patch () -{ - mv --verbose configure debian/patched/configure-rebuild-orig - autoconf --verbose --include=autoconf --output=configure \ - autoconf/configure.ac 2>&1 -} - -dpatch_unpatch () -{ - mv debian/patched/configure-rebuild-orig configure -} - -DPATCH_LIB_NO_DEFAULT=1 - -. /usr/share/dpatch/dpatch.lib.sh diff -Nru slrn-1.0.0~pre18/debian/patches/fix-multipart.sl.dpatch slrn-1.0.1/debian/patches/fix-multipart.sl.dpatch --- slrn-1.0.0~pre18/debian/patches/fix-multipart.sl.dpatch 2012-12-22 02:55:25.000000000 +0100 +++ slrn-1.0.1/debian/patches/fix-multipart.sl.dpatch 1970-01-01 01:00:00.000000000 +0100 @@ -1,32 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## fix-multipart.sl.dpatch by Brian Murray <br...@ubuntu.com> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: The usage of the return value of string_match in multipart.sl is -## DP: wrong. The return value is the position from the start of the string -## DP: and not from the start of the match. Hence, the calculation of the -## DP: new start is wrong. - -@DPATCH@ - -diff --git a/macros/multipart.sl b/macros/multipart.sl ---- a/macros/multipart.sl -+++ b/macros/multipart.sl -@@ -40,7 +40,7 @@ define subject_compare_hook ( subject1, subject2) - - while (tmp > 0) - { -- pos1 = pos1 + 4 + tmp; -+ pos1 = tmp; - tmp = string_match(subject1, pattern, pos1 + 5); - } - -@@ -48,7 +48,7 @@ define subject_compare_hook ( subject1, subject2) - tmp = string_match(subject2, pattern, pos2 + 5); - while (tmp > 0) - { -- pos2 = pos2 + 4 + tmp; -+ pos2 = tmp; - tmp = string_match(subject2, pattern, pos2 + 5); - } - diff -Nru slrn-1.0.0~pre18/debian/patches/fix-multipart.sl.patch slrn-1.0.1/debian/patches/fix-multipart.sl.patch --- slrn-1.0.0~pre18/debian/patches/fix-multipart.sl.patch 1970-01-01 01:00:00.000000000 +0100 +++ slrn-1.0.1/debian/patches/fix-multipart.sl.patch 2012-12-22 02:55:26.000000000 +0100 @@ -0,0 +1,25 @@ +Author: Brian Murray <br...@ubuntu.com> +Description: The usage of the return value of string_match in multipart.sl is +wrong. The return value is the position from the start of the string +and not from the start of the match. Hence, the calculation of the +new start is wrong. +--- a/macros/multipart.sl ++++ b/macros/multipart.sl +@@ -40,7 +40,7 @@ + + while (tmp > 0) + { +- pos1 = pos1 + 4 + tmp; ++ pos1 = tmp; + tmp = string_match(subject1, pattern, pos1 + 5); + } + +@@ -48,7 +48,7 @@ + tmp = string_match(subject2, pattern, pos2 + 5); + while (tmp > 0) + { +- pos2 = pos2 + 4 + tmp; ++ pos2 = tmp; + tmp = string_match(subject2, pattern, pos2 + 5); + } + diff -Nru slrn-1.0.0~pre18/debian/patches/series slrn-1.0.1/debian/patches/series --- slrn-1.0.0~pre18/debian/patches/series 1970-01-01 01:00:00.000000000 +0100 +++ slrn-1.0.1/debian/patches/series 2012-12-22 02:55:26.000000000 +0100 @@ -0,0 +1,7 @@ +201_configure.patch +202_help.txt.patch +203_locations.patch +204_manpage.patch +211_query-cutoff.patch +fix-multipart.sl.patch +cleanscore-prototypes.patch diff -Nru slrn-1.0.0~pre18/debian/rules slrn-1.0.1/debian/rules --- slrn-1.0.0~pre18/debian/rules 2012-12-22 02:55:25.000000000 +0100 +++ slrn-1.0.1/debian/rules 2012-12-22 02:55:26.000000000 +0100 @@ -23,18 +23,19 @@ export DEB_BUILD_HARDENING=1 -include /usr/share/dpatch/dpatch.make +include /usr/share/quilt/quilt.make slrn_dir = $(CURDIR)/debian/slrn slrnpull_dir = $(CURDIR)/debian/slrnpull tmp_dir = $(CURDIR)/debian/tmp build: build-stamp -build-stamp: patch-stamp +build-stamp: $(QUILT_STAMPFN) dh_testdir + dh_autoreconf autoconf -- --verbose --include=autoconf --output=configure autoconf/configure.ac ./configure \ --with-slrnpull=/var/spool/slrnpull \ - --with-gnutls \ + --with-gnutls=/usr/lib/$(DEB_HOST_MULTIARCH) \ --enable-inews --enable-spool \ --enable-setgid-code \ --prefix=/usr \ @@ -55,6 +56,7 @@ clean: unpatch dh_testdir if [ -e Makefile ]; then $(MAKE) distclean; fi + dh_autoreconf_clean dh_clean build-stamp debian/installed-files # Build architecture-dependent files here.
