From 85ce8edb9d5b92df39de1a22002bf29d779eeac2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 1 Oct 2017 19:25:58 +0200 Subject: Remove patches --- debian/changelog | 7 ++----- debian/patches/0100-config.diff | 24 ------------------------ debian/patches/series | 6 +++--- 3 files changed, 5 insertions(+), 32 deletions(-) diff --git a/debian/changelog b/debian/changelog index 63449fb..8335f2d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,7 @@ -mwc (1.8.2-1) UNRELEASED; urgency=medium +mwc (2.0.4-1) UNRELEASED; urgency=medium * New upstream release (Closes: #862004). - + Refresh patches. - * Renumbering patches. - * debian/patches/0105-try_mail.diff: - - Replace undefined printf with print (Closes: #860494). + + Remove now unuseable patches. * Rewrite debian/watch for archives without "v" in front of the version. * Declare compliance with Debian Policy 4.0.0. (No changes needed). * Bump compatlevel to 10 (no changes required): diff --git a/debian/patches/0100-config.diff b/debian/patches/0100-config.diff index 8529874..49bb589 100644 --- a/debian/patches/0100-config.diff +++ b/debian/patches/0100-config.diff @@ -5,30 +5,6 @@ Author: Jörg Frings-Fürst Last-Update: 2014-05-12 --- This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ -Index: trunk/config_template.py -=================================================================== ---- trunk.orig/config_template.py -+++ trunk/config_template.py -@@ -1,5 +1,3 @@ --import os.path -- - # Copyright: (2013-2014) Michael Till Beck - # License: GPL-2.0+ - -@@ -47,11 +45,11 @@ sender = 'me@mymail.com' - smtphost = 'mysmtpprovider.com' - useTLS = True - smtpport = 587 --smtpusername = sender -+smtpusername = 'sender' - smtppwd = 'mypassword' - receiver = 'me2@mymail.com' - --os.chdir('/var/cache/mwc') -+datadir'/var/cache/mwc' - - enableRSSFeed = True - rssfile = 'feed.xml' Index: trunk/mwcfeedserver.py =================================================================== --- trunk.orig/mwcfeedserver.py diff --git a/debian/patches/series b/debian/patches/series index a06ba62..3ad4804 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,4 @@ -0100-config.diff -0105-try_mail.diff -0110-syslog.diff +#0100-config.diff +#0105-try_mail.diff +#0110-syslog.diff #0115-Add_header.patch -- cgit v1.2.3