From 3065d0a638aecf62a662d2f21eb6583c46d28d61 Mon Sep 17 00:00:00 2001 From: Roland Rosenfeld Date: Sat, 4 Apr 2020 14:49:35 +0200 Subject: [PATCH 1/1] Update to upstream git ec5b42 and to Debian version 3.0.28-3. --- debian/changelog | 18 ++++++++++++++++-- debian/compat | 1 - debian/control | 4 ++-- debian/copyright | 10 +++++----- debian/patches/05_defaut_action.patch | 4 ++-- debian/privoxy.service | 2 +- debian/{gitlab-ci.yml => salsa-ci.yml} | 0 debian/tests/control | 2 +- debian/upstream/metadata | 10 ++++++++++ debian/watch | 2 +- 10 files changed, 38 insertions(+), 15 deletions(-) delete mode 100644 debian/compat rename debian/{gitlab-ci.yml => salsa-ci.yml} (100%) create mode 100644 debian/upstream/metadata diff --git a/debian/changelog b/debian/changelog index a547a9a6..0bade0b0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,25 @@ -privoxy (3.0.29~git6a358e-1) UNRELEASED; urgency=medium +privoxy (3.0.29~gitec5b42-1) UNRELEASED; urgency=medium * New upstream developement version. * Update all patches to new version. * 36_trusted-cgi-referer-example and 37_ppedit-tests403 are now incorporated upstream. + * d/copyright: use ./ prefix to upstream filenames, because orig.tar.gz + is build with a ./ prefix. - -- Roland Rosenfeld Sat, 30 Nov 2019 12:44:20 +0100 + -- Roland Rosenfeld Sat, 04 Apr 2020 14:46:51 +0200 + +privoxy (3.0.28-3) unstable; urgency=medium + + * Add buildlog to salsa-ci test pipeline. + * d/salsa-ci.yml stripped down using pipline-jobs.yml + * Build-depend on debhelper-compat (= 12) instead of using d/compat. + * Upgrade to Standards-Version 4.5.0 (no changes). + * Add upstream metadata. + * privoxy.service: run After=network-online.target, this fixes + LP#1870101. + + -- Roland Rosenfeld Thu, 02 Apr 2020 18:04:44 +0200 privoxy (3.0.28-2) unstable; urgency=medium diff --git a/debian/compat b/debian/compat deleted file mode 100644 index 48082f72..00000000 --- a/debian/compat +++ /dev/null @@ -1 +0,0 @@ -12 diff --git a/debian/control b/debian/control index c483d5c5..b7464f8c 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: web Priority: optional Maintainer: Roland Rosenfeld Build-Depends: autoconf, - debhelper (>= 12~), + debhelper-compat (= 12), docbook, docbook-dsssl, docbook-utils, @@ -15,7 +15,7 @@ Build-Depends: autoconf, sgmlspl, w3m, zlib1g-dev -Standards-Version: 4.3.0 +Standards-Version: 4.5.0 Homepage: https://www.privoxy.org/ Vcs-Git: https://salsa.debian.org/debian/privoxy.git Vcs-Browser: https://salsa.debian.org/debian/privoxy diff --git a/debian/copyright b/debian/copyright index 059f5193..9c41e3fc 100644 --- a/debian/copyright +++ b/debian/copyright @@ -16,14 +16,14 @@ Comment: Junkbusters Corporation. http://www.junkbusters.com License: GPL-2+ -Files: regression-tests.action tools/uagen.pl tools/privoxy-regression-test.pl - tools/privoxy-log-parser.pl tools/url-pattern-translator.pl utils/changelog2doc.pl - utils/create-package-feed.pl +Files: ./regression-tests.action ./tools/uagen.pl ./tools/privoxy-regression-test.pl + ./tools/privoxy-log-parser.pl ./tools/url-pattern-translator.pl ./utils/changelog2doc.pl + ./utils/create-package-feed.pl Copyright: Copyright (c) 2006-2017 Fabian Keil License: ISC -Files: strptime.h +Files: ./strptime.h Copyright: Copyright (C) 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc. Comment: @@ -36,7 +36,7 @@ Copyright: 2002-2018 Roland Rosenfeld License: GPL-2+ -Files: pcre/* +Files: ./pcre/* Copyright: Copyright (c) 1997-2000 University of Cambridge Comment: Written by: Philip Hazel diff --git a/debian/patches/05_defaut_action.patch b/debian/patches/05_defaut_action.patch index 4e1ab727..4e8911ed 100644 --- a/debian/patches/05_defaut_action.patch +++ b/debian/patches/05_defaut_action.patch @@ -4,7 +4,7 @@ Subject: Several changes/additons to default.action. --- a/default.action.master +++ b/default.action.master -@@ -2433,6 +2433,9 @@ schneegans.de/sv/\?url=referer +@@ -2435,6 +2435,9 @@ schneegans.de/sv/\?url=referer #MASTER# REMARKS: Exclude per Debian bug report #377843 # URL = http://blogs.msdn.com/wga/archive/2006/07/16/667063.aspx blogs.msdn.com @@ -14,7 +14,7 @@ Subject: Several changes/additons to default.action. {-filter{unsolicited-popups}} # Sticky Actions = -filter{unsolicited-popups} -@@ -2491,6 +2494,11 @@ tr.anp.se/ +@@ -2493,6 +2496,11 @@ tr.anp.se/ {+filter{tiny-textforms}} .sourceforge.net/tracker diff --git a/debian/privoxy.service b/debian/privoxy.service index 8ad06d39..d8c08ed5 100644 --- a/debian/privoxy.service +++ b/debian/privoxy.service @@ -1,7 +1,7 @@ [Unit] Description=Privacy enhancing HTTP Proxy Documentation=man:privoxy(8) https://www.privoxy.org/user-manual/ -After=network.target +After=network-online.target [Service] Environment=PIDFILE=/run/privoxy.pid diff --git a/debian/gitlab-ci.yml b/debian/salsa-ci.yml similarity index 100% rename from debian/gitlab-ci.yml rename to debian/salsa-ci.yml diff --git a/debian/tests/control b/debian/tests/control index 6968f2af..1566c8fe 100644 --- a/debian/tests/control +++ b/debian/tests/control @@ -1,2 +1,2 @@ Tests: privoxy-regression-test -Depends: @, curl +Depends: curl, @ diff --git a/debian/upstream/metadata b/debian/upstream/metadata new file mode 100644 index 00000000..cd970b6e --- /dev/null +++ b/debian/upstream/metadata @@ -0,0 +1,10 @@ +Archive: SourceForge +Bug-Database: https://sourceforge.net/p/ijbswa/bugs/ +Bug-Submit: https://sourceforge.net/p/ijbswa/bugs/new/ +Changelog: https://www.privoxy.org/gitweb/?p=privoxy.git;a=blob_plain;f=ChangeLog +Documentation: https://www.privoxy.org/user-manual/ +Donation: https://www.privoxy.org/faq/general.html#DONATE +FAQ: https://www.privoxy.org/faq/ +Repository: https://www.privoxy.org/git/privoxy.git +Repository-Browse: https://www.privoxy.org/gitweb/?p=privoxy.git +Security-Contact: Fabian Keil diff --git a/debian/watch b/debian/watch index 2687b2ed..c2044783 100644 --- a/debian/watch +++ b/debian/watch @@ -3,6 +3,6 @@ # Compulsory line, this is a version 3 file version=3 -#http://sourceforge.net/project/showfiles.php?group_id=11118 http://prdownloads.sourceforge.net/ijbswa/privoxy-(.*)-stable-src.tar.gz\?download +#https://sourceforge.net/project/showfiles.php?group_id=11118 https://prdownloads.sourceforge.net/ijbswa/privoxy-(.*)-stable-src.tar.gz\?download opts=pgpsigurlmangle=s/$/.asc/ https://sf.net/ijbswa/privoxy-(\d+.*)-(?:stable|beta)-src.tar.gz -- 2.39.2