[pkg-fso-commits] [nodm] 49/50: Merge branch 'debian/nmu/0.12-1.1'

[Mike Gabriel]

This is an automated email from the git hooks/post-receive script.

sunweaver pushed a commit to branch master
in repository nodm.

commit aee4b5b793d4c4e9bb4a378a6b1520d243939f50
Merge: 228cf9d ede6a3f
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Jan 23 13:18:58 2017 +0100

    Merge branch 'debian/nmu/0.12-1.1'
    
    Conflicts (resolved by Mike Gabriel):
    	debian/changelog

 Makefile.am           | 13 ++++++++++++-
 debian/changelog      |  8 ++++++++
 debian/copyright      | 15 +++++++++++++++
 debian/nodm.config    | 36 ++++++++++++++++++++++++++++++++++++
 debian/nodm.init      |  2 +-
 debian/nodm.postinst  | 41 ++++++++++++++++++++++++++++++++++++++++-
 debian/nodm.templates | 20 ++++++++++++++++++++
 debian/rules          |  5 +++++
 8 files changed, 137 insertions(+), 3 deletions(-)

diff --cc debian/changelog
index 656f9b8,3594738..04d139b
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,17 -1,11 +1,25 @@@
 +nodm (0.12-2) UNRELEASED; urgency=medium
 +
 +  * Upstream code:
 +    - Rename symbol "basename" to "nodm_basename". This is to avoid
 +      naming conflicts with the basename() function from <string.h>.
 +  * debian/changelog:
 +    + Add post-upload closure for #638601. Bug has been closed manually
 +      meanwhile (on Thu 24th Mar 2016).
 +  * debian/<debconf>:
 +    + Explain about how the NODM_X_OPTIONS env var has to be populated.
 +    + Update .po files and template.pot.
 +
 + -- Mike Gabriel <sunweaver at debian.org>  Thu, 24 Mar 2016 14:43:36 +0100
 +
+ nodm (0.12-1.1) unstable; urgency=medium
+ 
+   * Non-maintainer upload.
+   * Apply patches from Simon McVittie to add a native systemd service
+     file (Closes: #796203).
+ 
+  -- Arto Jantunen <viiru at debian.org>  Wed, 18 Jan 2017 17:29:22 +0200
+ 
  nodm (0.12-1) unstable; urgency=low
  
    [ Enrico Zini ]

-- 
Alioth's hooks/post-receive on /srv/git.debian.org/git/pkg-fso/nodm.git