[merkaartor] 01/01: Merge branch 'master' into lenny-backports

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to annotated tag debian/0.14+svnfixes.20090912-2.bpo50+1
in repository merkaartor.

commit 38c77392f07cd34482e317d3bbe230ce87b0fde3
Merge: fb41810 9a09bb5
Author: Bernd Zeimetz <bernd at bzed.de>
Date:   Thu Oct 15 12:00:55 2009 +0200

    Merge branch 'master' into lenny-backports
    
    Conflicts:
    	debian/changelog

 debian/changelog               | 13 +++++++++++--
 debian/patches/log-to-dev-null | 11 +++++++++++
 debian/patches/series          |  1 +
 3 files changed, 23 insertions(+), 2 deletions(-)

diff --cc debian/changelog
index 594f261,73f58b0..5c51306
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,12 +1,19 @@@
- merkaartor (0.14+svnfixes~20090912-1~bpo50+1) lenny-backports; urgency=low
++merkaartor (0.14+svnfixes~20090912-2~bpo50+1) lenny-backports; urgency=high
 +
 +  * Rebuild for lenny-backports.
-   * Use libboost 1.35 as we don't hav more recent versions in Lenny. 
++  * Use libboost 1.35 as we don't have more recent versions in Lenny. 
 +
 + -- Bernd Zeimetz <bzed at debian.org>  Wed, 23 Sep 2009 18:56:00 +0200
 +
+ merkaartor (0.14+svnfixes~20090912-2) unstable; urgency=high
+ 
+   * [6a4e67f9] Support +svnfixes dversion in debian/watch.
+   * [00189629] Write log to /dev/null, workaround for a minor symlink
+     attack until upstream fixes it properly. (Closes: #548546) - thanks
+     to Paul Wise
+ 
+  -- Bernd Zeimetz <bzed at debian.org>  Thu, 15 Oct 2009 11:37:15 +0200
+ 
  merkaartor (0.14+svnfixes~20090912-1) unstable; urgency=low
  
    * [f99555b6] Remove embedded code copies while repackaging.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/merkaartor.git