# HG changeset patch
# User Heiko Schlittermann (JUMPER) <hs@schlittermann.de>
# Date 1346137595 -7200
# Node ID a26ac4455cc5d35c682657073f11a1dec70a9701
# Parent  93f10a78f885fb34855c7a6868bcc91085fd6ecb# Parent  da0430f37b87dfe8fc5e97838775cd8f25b02873
[merged]

diff -r 93f10a78f885 -r a26ac4455cc5 .hgignore
--- a/.hgignore	Wed Sep 21 07:41:09 2011 +0200
+++ b/.hgignore	Tue Aug 28 09:06:35 2012 +0200
@@ -2,8 +2,10 @@
 debian/logbuch/
 build-stamp
 configure-stamp
+debian/dirs
 debian/files
 debian/logbuch.debhelper.log
 debian/logbuch.substvars
+debian/source/format
 log
 log.8
diff -r 93f10a78f885 -r a26ac4455cc5 Logbuch/HG.pm
--- a/Logbuch/HG.pm	Wed Sep 21 07:41:09 2011 +0200
+++ b/Logbuch/HG.pm	Tue Aug 28 09:06:35 2012 +0200
@@ -120,7 +120,7 @@
     my $path = $self->get_repo() . "/";
     $result[1] =~ s/^([^\s]+)(\s+)(.*)$/${1}${2}${path}${3}/mg;
 
-    return $result[1];
+    return "$result[1]\n" if $result[1];
 }
 
 
diff -r 93f10a78f885 -r a26ac4455cc5 debian/changelog
--- a/debian/changelog	Wed Sep 21 07:41:09 2011 +0200
+++ b/debian/changelog	Tue Aug 28 09:06:35 2012 +0200
@@ -1,3 +1,11 @@
+logbuch (0.36+nmu1) stable; urgency=low
+
+  * Non-maintainer upload.
+  * split status texts with newline when using multiple repos 
+  * added build dep: libclass-accessor-perl
+
+ -- Matthias Förste <foerste@schlittermann.de>  Thu, 07 Jun 2012 16:46:55 +0200
+
 logbuch (0.36) stable; urgency=low
 
   * removed empty usr/bin
diff -r 93f10a78f885 -r a26ac4455cc5 debian/control
--- a/debian/control	Wed Sep 21 07:41:09 2011 +0200
+++ b/debian/control	Tue Aug 28 09:06:35 2012 +0200
@@ -2,7 +2,7 @@
 Section: utils
 Priority: optional
 Maintainer: Heiko Schlittermann <hs@schlittermann.de>
-Build-Depends: debhelper (>= 7.0.50), libmailtools-perl, libdbi-perl, libdbd-mysql-perl, libfile-which-perl
+Build-Depends: debhelper (>= 7.0.50), libmailtools-perl, libdbi-perl, libdbd-mysql-perl, libfile-which-perl, libclass-accessor-perl
 Standards-Version: 3.9.1
 Homepage: http://schlittermann.de/
 
diff -r 93f10a78f885 -r a26ac4455cc5 log.pl
--- a/log.pl	Wed Sep 21 07:41:09 2011 +0200
+++ b/log.pl	Tue Aug 28 09:06:35 2012 +0200
@@ -169,7 +169,7 @@
       ? ""
       : "\n"
       . " Modified config files since last log entry listend below...\n"
-      . $hg_status_text . "\n";
+      . $hg_status_text;
 
     # Kopftext eintragen
     print $fh "Date: ", scalar(localtime()), "\n",