[lierolibre] 01/01: Sync with NMU which was made outside Git

[Martin Werner]

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

arand-guest pushed a commit to branch master
in repository lierolibre.

commit fecf5e2e07430df862cda3b4720bb38ddfff8106
Author: Martin Erik Werner <martinerikwerner at gmail.com>
Date:   Mon Aug 31 17:10:31 2015 +0200

    Sync with NMU which was made outside Git
    
    NMU was made outside of Git, with slightly different patches, sync by
    simply lifting in the changelog entries and replacing the patches by the
    ones from Git, which have been tested slightly more and follows upstream
    more closely.
---
 debian/changelog | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1516ec0..4218430 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,17 +4,24 @@ lierolibre (0.5-2) UNRELEASED; urgency=low
   * Handle hurd/kfreebsd as linux. Fixes build there
 
   [ Martin Erik Werner ]
-  * Add patch to adapt to libconfig++9v5 (Closes: #795437)
+  * Replace NMU patch to adapt to libconfig++9v5 (#795437)
     - debian/patches/adapt-to-new-libconfig.patch
     - Thanks to Simon McVittie for large parts of this patch
-  * Add upstream patches for building on other archs than x86 and x86_64
-    (Closes: #790363)
+  * Replace NMU patches for building on other archs than x86 and x86_64
+    (#790363)
     - debian/patches/0001-Use-unaligned-access-define-over-checking-arch.patch
     - debian/patches/0002-At-least-try-building-for-other-archs-than-x86.patch
     - debian/patches/0003-Remove-unknown-arch-warning.patch
   * Update standards-version to 3.9.6 (no changes)
 
- -- Martin Erik Werner <martinerikwerner at gmail.com>  Mon, 17 Aug 2015 16:27:12 +0200
+ -- Arturo Borrero Gonzalez <arturo.borrero.glez at gmail.com>  Fri, 21 Aug 2015 17:25:00 +0200
+
+lierolibre (0.5-1.1) unstable; urgency=low
+
+  * NMU: fix FTBFS on mipsel (Closes: #790363)
+  * NMU: fix FTBFS with libconfig 1.5 (Closes: #795437)
+
+ -- Arturo Borrero Gonzalez <arturo.borrero.glez at gmail.com>  Fri, 21 Aug 2015 17:25:00 +0200
 
 lierolibre (0.5-1) unstable; urgency=low
 

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