[mupen64plus-ui-console] 80/172: Merge commit 'debian/1.99.4-5' into experimental

[Sven Eckelmann]

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

ecsv-guest pushed a commit to branch armhf_test
in repository mupen64plus-ui-console.

commit 7d9507413943bf46272d45141578408416728922
Merge: e674b10 e96c369
Author: Sven Eckelmann <sven at narfation.org>
Date:   Mon Oct 31 15:09:45 2011 +0100

    Merge commit 'debian/1.99.4-5' into experimental
    
    Conflicts:
    	debian/changelog
    	debian/control
    	debian/patches/series

 debian/changelog                         | 219 +++++++++++++++++--------------
 debian/control                           |   1 -
 debian/copyright                         |   2 +-
 debian/patches/cheat_leading_zeros.patch |  18 +++
 debian/patches/series                    |   1 +
 debian/rules                             |   6 +-
 6 files changed, 143 insertions(+), 104 deletions(-)

diff --cc debian/changelog
index b8b2555,4ca66f7..1d0d381
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,17 -1,17 +1,30 @@@
 +mupen64plus-ui-console (1.99.4+23+86aec84c1b27-1) experimental; urgency=low
 +
 +  * New upstream snapshot from revision 86aec84c1b2735ff5d4d3f4f6b0342497d4dc5ae
-   * Don't mix implicit and explicit rules to prevent FTBFS with make 3.82
 +  * debian/control:
 +    - Depend on mupen64plus-*-abi-2
 +    - Build-Depend on libmupen64plus-dev >= 1.99.4+77+8bb0e6b3ae3a-1
 +  * debian/patches:
 +    - Remove upstream merged patches big_endian_conflict.patch,
 +      rewrite_makefile.patch
 +  * Add debian/get-orig-source.sh for snapshots
 +
 + -- Sven Eckelmann <sven at narfation.org>  Mon, 29 Aug 2011 17:06:26 +0200
 +
+ mupen64plus-ui-console (1.99.4-5) unstable; urgency=low
+ 
+   * Don't mix implicit and explicit rules to prevent FTBFS with make
+     3.82
+   * debian/patches:
+     - Add cheat_leading_zeros.patch, Fix loading of cheats with leading
+       zeros in CRC1/2
+   * Remove hardening-includes which are now integrated in dpkg-
+     buildflags
+   * Use debian packaging manual URL as format identifier in
+     debian/copyright
+ 
+  -- Sven Eckelmann <sven at narfation.org>  Mon, 31 Oct 2011 12:49:39 +0100
+ 
  mupen64plus-ui-console (1.99.4-4) unstable; urgency=low
  
    * Upload to unstable
diff --cc debian/control
index 06ad979,07d2015..d83fd2e
--- a/debian/control
+++ b/debian/control
@@@ -11,8 -11,7 +11,7 @@@ Vcs-Browser: http://anonscm.debian.org/
  Build-Depends:
   debhelper (>= 8.0.0),
   dpkg-dev (>= 1.16.0),
-  hardening-includes,
 - libmupen64plus-dev,
 + libmupen64plus-dev (>= 1.99.4+77+8bb0e6b3ae3a),
  
  Package: mupen64plus-ui-console
  Architecture: any-i386 any-amd64
diff --cc debian/patches/series
index 0000000,a12ad75..a931874
mode 000000,100644..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,0 -1,3 +1,1 @@@
 -rewrite_makefile.patch
 -big_endian_conflict.patch
+ cheat_leading_zeros.patch

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