[mupen64plus-video-glide64] 87/172: Merge commit 'debian/1.99.4-4' into experimental

[Sven Eckelmann]

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

ecsv-guest pushed a commit to branch master
in repository mupen64plus-video-glide64.

commit 5fb4c679b0b67b64fcd906deb16911183e0d847e
Merge: f1a2d35 bb23848
Author: Sven Eckelmann <sven at narfation.org>
Date:   Mon Oct 31 15:13:43 2011 +0100

    Merge commit 'debian/1.99.4-4' into experimental
    
    Conflicts:
    	debian/changelog

 debian/changelog | 228 ++++++++++++++++++++++++++++++-------------------------
 debian/control   |   1 -
 debian/copyright |   2 +-
 debian/rules     |   6 --
 4 files changed, 127 insertions(+), 110 deletions(-)

diff --cc debian/changelog
index f7a6317,f76f7fa..a715e03
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,27 -1,16 +1,39 @@@
 +mupen64plus-video-glide64 (1.99.4+31+53ab44c26168-1) UNRELEASED; urgency=low
 +
 +  * New upstream snapshot from revision 53ab44c2616804c350025d44b6db0ac8d83b89ab
 +  * debian/patches:
 +    - Rebase printf_fixup.patch against 1.99.4+31+53ab44c26168
 +
 + -- Sven Eckelmann <sven at narfation.org>  Sun, 04 Sep 2011 13:22:41 +0200
 +
 +mupen64plus-video-glide64 (1.99.4+28+34f0fa1700f5-1) experimental; urgency=low
 +
 +  * New upstream snapshot from revision 34f0fa1700f5b64ded4b84640384b8f74e4417ec
 +  * debian/control:
-     - Add virtual package libsdl-dev as alternative build dependency
 +    - Depend on mupen64plus-*-abi-2
 +    - Build-Depend on libmupen64plus-dev >= 1.99.4+77+8bb0e6b3ae3a-1
 +  * Don't mix implicit and explicit rules to prevent FTBFS with make 3.82
 +  * debian/patches:
 +    - Remore upstream merged patches: default_settings.patch,
 +      portable_mm_store_ps.patch, rewrite_makefile.patch
 +    - Rebase printf_fixup.patch against 1.99.4+28+34f0fa1700f5
 +  * Add debian/get-orig-source.sh for snapshots
 +
 + -- Sven Eckelmann <sven at narfation.org>  Mon, 29 Aug 2011 17:06:50 +0200
 +
+ mupen64plus-video-glide64 (1.99.4-4) unstable; urgency=low
+ 
+   * debian/control:
+     - Add virtual package libsdl-dev as alternative build dependency
+   * Don't mix implicit and explicit rules to prevent FTBFS with make
+     3.82
+   * 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:50:26 +0100
+ 
  mupen64plus-video-glide64 (1.99.4-3) unstable; urgency=low
  
    * Upload to unstable
diff --cc debian/control
index b2a1e60,f1198d7..6e071c0
--- a/debian/control
+++ b/debian/control
@@@ -11,9 -11,8 +11,8 @@@ Vcs-Browser: http://anonscm.debian.org/
  Build-Depends:
   debhelper (>= 8.1.3),
   dpkg-dev (>= 1.16.0),
-  hardening-includes,
   libgl1-mesa-dev | libgl-dev,
 - libmupen64plus-dev,
 + libmupen64plus-dev (>= 1.99.4+77+8bb0e6b3ae3a),
   libsdl1.2-dev | libsdl-dev,
   pkg-config,
  

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