This is an automated email from the git hooks/post-receive script. ecsv-guest pushed a commit to branch armhf_test in repository mupen64plus-rsp-hle.
commit cb2d934d33f6c297348949fe08fd9fe2e60f47c3 Merge: 599d831 f3899c7 Author: Sven Eckelmann <[email protected]> Date: Sun Mar 11 12:27:57 2012 +0100 Merge tag 'debian/1.99.4+26+8fd36d9bc293-1' Debian release 1.99.4+26+8fd36d9bc293-1 Conflicts: debian/changelog debian/changelog | 20 +++ debian/control | 4 +- debian/get-orig-source.sh | 26 ++++ debian/patches/big_endian_conflict.patch | 58 ------- debian/patches/endianness_xor.patch | 95 ------------ debian/patches/rewrite_makefile.patch | 207 ------------------------- debian/patches/series | 3 - debian/rules | 2 +- projects/unix/Makefile | 145 ++++++++++-------- src/hle.h | 6 +- src/jpeg.c | 1 + src/main.c | 6 +- src/ucode1.cpp | 18 +-- src/ucode2.cpp | 21 ++- src/ucode3.cpp | 254 ++----------------------------- 15 files changed, 169 insertions(+), 697 deletions(-) diff --cc debian/changelog index a25de18,f096264..c941f6a --- a/debian/changelog +++ b/debian/changelog @@@ -1,12 -1,23 +1,32 @@@ +mupen64plus-rsp-hle (1.99.4-5) 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 <[email protected]> Sun, 01 Jan 2012 20:19:50 +0100 + + mupen64plus-rsp-hle (1.99.4+26+8fd36d9bc293-1) experimental; urgency=low + + * New upstream snapshot from revision 8fd36d9bc2938825a34c1f9758cf95926ce697a9 + + -- Sven Eckelmann <[email protected]> Sat, 12 Nov 2011 21:42:34 +0100 + + mupen64plus-rsp-hle (1.99.4+23+850d9527e48e-1) experimental; urgency=low + + * New upstream snapshot from revision 850d9527e48eb08a9c2d57d97b68b79bef46940e + * debian/control: + - 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: + - Remove upstream merged patches big_endian_conflict.patch, + endianness_xor.patch, rewrite_makefile.patch + * Add debian/get-orig-source.sh for snapshots + + -- Sven Eckelmann <[email protected]> Mon, 29 Aug 2011 17:05:53 +0200 + mupen64plus-rsp-hle (1.99.4-4) unstable; urgency=low * debian/control: diff --cc debian/control index efde757,e5dece0..1eeb6fb --- 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-rsp-hle.git Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/mupen64plus-rsp-hle.git Build-Depends: - debhelper (>= 8.1.3), + debhelper (>= 9), dpkg-dev (>= 1.16.0), - libmupen64plus-dev, + libmupen64plus-dev (>= 1.99.4+77+8bb0e6b3ae3a), libsdl1.2-dev | libsdl-dev, Package: mupen64plus-rsp-hle -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mupen64plus-rsp-hle.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
