[mupen64plus-ui-console] 90/172: Merge tag 'debian/1.99.4+27+bdcc13172958-1'

[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 11c132b6e9488df4a259248324760bce3d065107
Merge: 5728d37 a7315de
Author: Sven Eckelmann <sven at narfation.org>
Date:   Sun Mar 11 12:40:16 2012 +0100

    Merge tag 'debian/1.99.4+27+bdcc13172958-1'
    
    Debian release 1.99.4+27+bdcc13172958-1
    
    Conflicts:
    	debian/changelog

 debian/changelog                         |  22 ++++
 debian/control                           |   4 +-
 debian/get-orig-source.sh                |  26 ++++
 debian/patches/big_endian_conflict.patch |  19 ---
 debian/patches/cheat_leading_zeros.patch |  18 ---
 debian/patches/rewrite_makefile.patch    | 200 -------------------------------
 debian/patches/series                    |   3 -
 debian/rules                             |   7 +-
 projects/unix/Makefile                   | 129 +++++++++++---------
 src/cheat.c                              |   5 +-
 src/cheat.h                              |   2 +-
 src/compare_core.c                       |   6 +-
 src/core_interface.c                     |  37 ++++--
 src/core_interface.h                     |   1 +
 src/main.c                               |  14 ++-
 src/version.h                            |   8 +-
 16 files changed, 178 insertions(+), 323 deletions(-)

diff --cc debian/changelog
index 9708ab5,4e8aca3..e25ebe9
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,25 +1,34 @@@
 +mupen64plus-ui-console (1.99.4-6) UNRELEASED; urgency=low
 +
 +  * Update copyright years in debian/copyright
 +  * Enable all hardening flags in debian/rules
 +  * Upgraded to policy 3.9.3, no changes required
 +  * Upgrade debhelper compat to v9
 +
 + -- Sven Eckelmann <sven at narfation.org>  Sun, 01 Jan 2012 20:20:02 +0100
 +
+ mupen64plus-ui-console (1.99.4+27+bdcc13172958-1) experimental; urgency=low
+ 
+   * New upstream snapshot from revision bdcc131729587084653df131e73abd8e435e08a0
+   * debian/rules:
+     - Remove unnecessary --as-needed from linker flags
+     - Force PIE to prevent build failures
+ 
+  -- Sven Eckelmann <sven at narfation.org>  Sat, 12 Nov 2011 22:04:59 +0100
+ 
+ mupen64plus-ui-console (1.99.4+23+86aec84c1b27-1) experimental; urgency=low
+ 
+   * New upstream snapshot from revision 86aec84c1b2735ff5d4d3f4f6b0342497d4dc5ae
+   * 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
diff --cc debian/control
index 802fcd1,d83fd2e..e5fde16
--- a/debian/control
+++ b/debian/control
@@@ -9,9 -9,9 +9,9 @@@ Homepage: http://code.google.com/p/mupe
  Vcs-Git: git://anonscm.debian.org/collab-maint/mupen64plus-ui-console.git
  Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/mupen64plus-ui-console.git
  Build-Depends:
 - debhelper (>= 8.0.0),
 + debhelper (>= 9),
   dpkg-dev (>= 1.16.0),
-  libmupen64plus-dev,
+  libmupen64plus-dev (>= 1.99.4+77+8bb0e6b3ae3a),
  
  Package: mupen64plus-ui-console
  Architecture: any-i386 any-amd64
diff --cc debian/rules
index cb9a175,146218a..fc73585
--- a/debian/rules
+++ b/debian/rules
@@@ -1,15 -1,16 +1,12 @@@
  #!/usr/bin/make -f
  # -*- makefile -*-
  
 -export DEB_BUILD_MAINT_OPTIONS=hardening=+pie
 -export CFLAGS=$(shell dpkg-buildflags --get CFLAGS)
 -export CPPFLAGS=$(shell dpkg-buildflags --get CPPFLAGS)
 -export CXXFLAGS=$(shell dpkg-buildflags --get CXXFLAGS)
 -export LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
 +export DEB_BUILD_MAINT_OPTIONS=hardening=+all
  
  DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
- 
- LDFLAGS += -Wl,--as-needed
- 
  DEB_HOST_GNU_CPU ?= $(shell dpkg-architecture -qDEB_HOST_GNU_CPU)
  DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
- MAKEOPTIONS = V=1 UNAME='$(DEB_HOST_ARCH_OS)' HOST_CPU='$(DEB_HOST_GNU_CPU)' APIDIR=/usr/include/mupen64plus/ DEBUG=1 PREFIX=/usr/ COREDIR="/usr/lib/$(DEB_HOST_MULTIARCH)/" PLUGINDIR="/usr/lib/$(DEB_HOST_MULTIARCH)/mupen64plus" MANDIR=/usr/share/man/ BINDIR=/usr/games/ OPTFLAGS=""
+ MAKEOPTIONS = V=1 UNAME='$(DEB_HOST_ARCH_OS)' HOST_CPU='$(DEB_HOST_GNU_CPU)' APIDIR=/usr/include/mupen64plus/ DEBUG=1 PREFIX=/usr/ COREDIR="/usr/lib/$(DEB_HOST_MULTIARCH)/" PLUGINDIR="/usr/lib/$(DEB_HOST_MULTIARCH)/mupen64plus" MANDIR=/usr/share/man/ BINDIR=/usr/games/ OPTFLAGS="" PIE=1
  
  binary binary-arch binary-indep build build-arch build-indep clean install install-arch install-indep:
  	dh $@ --sourcedirectory="projects/unix" --parallel --list-missing

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