work on new release

6 files changed, 13 insertions, 14 deletions

diff --git a/debian/changelog b/debian/changelog
index d3e0b05..48ee0e8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,9 @@
-mwc (1.7.4-1) UNRELEASED; urgency=medium
+mwc (1.7.5-1) UNRELEASED; urgency=medium
 
   * New upstream release.
   * Renumbering patches.
   * debian/patches/0105-try_mail.diff:
     - Replace undefined printf with print (Closes: #860494).
-  * New debian/patches/0115-Add_header.patch:
-    - Add missing Access header.
   * Rewrite debian/watch for archives without "v" in front of the version.
   * Bump Standards-Version to 3.9.8.
   * Bump compatlevel to 10 (no changes required):
diff --git a/debian/copyright b/debian/copyright
index 028d656..4976aef 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,7 +3,7 @@ Upstream-Name: mwc
 Source: https://github.com/Debianguru/MailWebsiteChanges
 
 Files: *
-Copyright: 2013-2015 Michael Till Beck <Debianguru@gmx.de>
+Copyright: 2013-2017 Michael Till Beck <Debianguru@gmx.de>
 License: GPL-2+
 
 Files: debian/*
diff --git a/debian/patches/0100-config.diff b/debian/patches/0100-config.diff
index bb07520..ce4dba7 100644
--- a/debian/patches/0100-config.diff
+++ b/debian/patches/0100-config.diff
@@ -9,7 +9,7 @@ Index: trunk/mwc.py
 ===================================================================
 --- trunk.orig/mwc.py
 +++ trunk/mwc.py
-@@ -316,7 +316,7 @@ def pollWebsites():
+@@ -319,7 +319,7 @@ def pollWebsites():
  
  if __name__ == "__main__":
  
@@ -18,7 +18,7 @@ Index: trunk/mwc.py
          dryrun = None
  
          try:
-@@ -332,9 +332,24 @@ if __name__ == "__main__":
+@@ -335,9 +335,24 @@ if __name__ == "__main__":
                          configMod = arg
                  elif opt in ('-d', '--dry-run'):
                          dryrun = arg
@@ -56,7 +56,7 @@ Index: trunk/config_template.py
  # Copyright: (2013-2014) Michael Till Beck <Debianguru@gmx.de>
  # License: GPL-2.0+
  
-@@ -44,11 +42,11 @@ sender = 'me@mymail.com'
+@@ -46,11 +44,11 @@ sender = 'me@mymail.com'
  smtphost = 'mysmtpprovider.com'
  useTLS = True
  smtpport = 587
diff --git a/debian/patches/0105-try_mail.diff b/debian/patches/0105-try_mail.diff
index b1b204b..d390b6d 100644
--- a/debian/patches/0105-try_mail.diff
+++ b/debian/patches/0105-try_mail.diff
@@ -12,7 +12,7 @@ Index: trunk/mwc.py
 ===================================================================
 --- trunk.orig/mwc.py
 +++ trunk/mwc.py
-@@ -223,15 +223,27 @@ def sendmail(receiver, subject, content,
+@@ -225,16 +225,27 @@ def sendmail(receiver, subject, content,
          mail['Subject'] = Header(subject, defaultEncoding)
  
          # initialize session once, not each time this method gets called
@@ -21,7 +21,8 @@ Index: trunk/mwc.py
 -                if config.useTLS:
 -                        mailsession.ehlo()
 -                        mailsession.starttls()
--                mailsession.login(config.smtpusername, config.smtppwd)
+-                if config.smtpusername is not None:
+-                    mailsession.login(config.smtpusername, config.smtppwd)
 -
 -        mailsession.sendmail(config.sender, receiver.split(','), mail.as_string())
 -
diff --git a/debian/patches/0110-syslog.diff b/debian/patches/0110-syslog.diff
index ceda4ae..12d629d 100644
--- a/debian/patches/0110-syslog.diff
+++ b/debian/patches/0110-syslog.diff
@@ -16,7 +16,7 @@ Index: trunk/mwc.py
  
  import subprocess
  
-@@ -225,25 +226,28 @@ def sendmail(receiver, subject, content,
+@@ -227,25 +228,28 @@ def sendmail(receiver, subject, content,
          # initialize session once, not each time this method gets called
          #
          # add try / except to open mailsession
@@ -60,7 +60,7 @@ Index: trunk/mwc.py
  
  # returns a list of all content that is stored locally for a specific site
  def getFileContents(shortname):
-@@ -330,7 +334,11 @@ if __name__ == "__main__":
+@@ -332,7 +336,11 @@ if __name__ == "__main__":
  
          configMod = '/etc/mwc/mwc-config'
          dryrun = None
@@ -73,7 +73,7 @@ Index: trunk/mwc.py
          try:
                  opts, args = getopt.getopt(sys.argv[1:], 'hc:d:', ['help', 'config=', 'dry-run='])
          except getopt.GetoptError:
-@@ -355,11 +363,13 @@ if __name__ == "__main__":
+@@ -357,11 +365,13 @@ if __name__ == "__main__":
              config = importlib.import_module(fullname)
          except: 
              print('Error: loading config')
@@ -87,7 +87,7 @@ Index: trunk/mwc.py
              sys.exit(3)
      
          if dryrun:
-@@ -381,3 +391,5 @@ if __name__ == "__main__":
+@@ -383,3 +393,5 @@ if __name__ == "__main__":
                          mailsession.quit()
                          mailsession = None
  
diff --git a/debian/patches/series b/debian/patches/series
index f44e7e1..a06ba62 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,4 @@
 0100-config.diff
 0105-try_mail.diff
 0110-syslog.diff
-0115-Add_header.patch
+#0115-Add_header.patch