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 5267bd9887db038b0ced203cd82a62fa3a2f9b57 Merge: 72730e2 986f5b7 Author: Sven Eckelmann <[email protected]> Date: Sun Mar 11 19:56:45 2012 +0100 Merge tag 'debian/1.99.4+34+84c051341841-1' Debian release 1.99.4+34+84c051341841-1 Conflicts: debian/changelog data/Glide64.ini | 5110 ++++++++++++++--------------- debian/changelog | 23 + debian/control | 4 +- debian/get-orig-source.sh | 26 + debian/patches/default_settings.patch | 19 - debian/patches/portable_mm_store_ps.patch | 45 - debian/patches/printf_fixup.patch | 103 +- debian/patches/rewrite_makefile.patch | 259 -- debian/patches/series | 3 - debian/rules | 2 +- projects/unix/Makefile | 188 +- src/3dmath.cpp | 10 +- src/Combine.cpp | 1 + src/Debugger.cpp | 1 + src/Gfx1.3.h | 2 +- src/Ini.cpp | 1 + src/Main.cpp | 40 +- src/TexBuffer.cpp | 1 + src/TexCache.cpp | 1 + src/TexMod.h | 6 +- src/UcodeFB.h | 2 +- src/Util.cpp | 3 +- src/m64p.h | 165 +- src/rdp.cpp | 11 +- src/ucode02.h | 5 +- src/wrapper/combiner.cpp | 18 +- src/wrapper/main.cpp | 4 +- src/wrapper/textures.cpp | 2 +- 28 files changed, 2884 insertions(+), 3171 deletions(-) diff --cc debian/changelog index 0f1952a,8fba2f9..7798cef --- a/debian/changelog +++ b/debian/changelog @@@ -1,12 -1,26 +1,35 @@@ +mupen64plus-video-glide64 (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:20:16 +0100 + + mupen64plus-video-glide64 (1.99.4+34+84c051341841-1) experimental; urgency=low + + * New upstream snapshot from revision 84c051341841912c0965aaf0f81b8d107e0f7be6 + * debian/patches: + - Rebase printf_fixup.patch against 1.99.4+34+84c051341841 + + -- Sven Eckelmann <[email protected]> Sat, 12 Nov 2011 21:49:42 +0100 + + mupen64plus-video-glide64 (1.99.4+28+34f0fa1700f5-1) experimental; urgency=low + + * New upstream snapshot from revision 34f0fa1700f5b64ded4b84640384b8f74e4417ec + * 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: + - 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 <[email protected]> Mon, 29 Aug 2011 17:06:50 +0200 + mupen64plus-video-glide64 (1.99.4-4) unstable; urgency=low * debian/control: diff --cc debian/control index a030c50,6e071c0..d3e1286 --- a/debian/control +++ b/debian/control @@@ -9,10 -9,10 +9,10 @@@ Homepage: http://code.google.com/p/mupe Vcs-Git: git://anonscm.debian.org/collab-maint/mupen64plus-video-glide64.git Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/mupen64plus-video-glide64.git Build-Depends: - debhelper (>= 8.1.3), + debhelper (>= 9), dpkg-dev (>= 1.16.0), 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 _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
