[mupen64plus-video-arachnoid] 71/147: 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-arachnoid.

commit f1049243a65746b84f62b73561fdd1084f6edc51
Merge: c2f1ffc 3cf1279
Author: Sven Eckelmann <sven at narfation.org>
Date:   Mon Oct 31 15:12:06 2011 +0100

    Merge commit 'debian/1.99.4-4' into experimental
    
    Conflicts:
    	debian/changelog
    	debian/patches/rewrite_makefile.patch

 debian/changelog | 216 ++++++++++++++++++++++++++++++-------------------------
 debian/control   |   1 -
 debian/copyright |   2 +-
 debian/rules     |   6 --
 4 files changed, 120 insertions(+), 105 deletions(-)

diff --cc debian/changelog
index bd62233,5f6016d..0ff6184
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,23 -1,14 +1,33 @@@
 +mupen64plus-video-arachnoid (1.99.4+37+db972cfd6e4d-1) UNRELEASED; urgency=low
 +
 +  * New upstream snapshot from revision db972cfd6e4dfeb0a947ae6fb4bd05ae158c02ec
 +
 + -- Sven Eckelmann <sven at narfation.org>  Fri, 09 Sep 2011 10:30:27 +0200
 +
 +mupen64plus-video-arachnoid (1.99.4+33+6bb944b2f66e-1) experimental; urgency=low
 +
 +  * New upstream snapshot from revision 6bb944b2f66eb611972c5b8419341f8fcc886970
-   * 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 array_bounds.patch, mipmapping.patch,
 +      rewrite_makefile.patch
 +  * Add debian/get-orig-source.sh for snapshots
 +
 + -- Sven Eckelmann <sven at narfation.org>  Mon, 29 Aug 2011 17:06:38 +0200
 +
+ mupen64plus-video-arachnoid (1.99.4-4) unstable; urgency=low
+ 
+   * 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:13 +0100
+ 
  mupen64plus-video-arachnoid (1.99.4-3) unstable; urgency=low
  
    * Upload to unstable
diff --cc debian/control
index 4f61fbd,446d625..8e39819
--- a/debian/control
+++ b/debian/control
@@@ -11,10 -11,9 +11,9 @@@ Vcs-Browser: http://anonscm.debian.org/
  Build-Depends:
   debhelper (>= 8.1.3),
   dpkg-dev (>= 1.16.0),
-  hardening-includes,
   libgl1-mesa-dev | libgl-dev,
   libglu1-mesa-dev | libglu-dev,
 - libmupen64plus-dev,
 + libmupen64plus-dev (>= 1.99.4+77+8bb0e6b3ae3a),
   pkg-config,
  
  Package: mupen64plus-video-arachnoid

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