This is an automated email from the git hooks/post-receive script. ecsv-guest pushed a commit to branch armhf_test in repository mupen64plus-video-rice.
commit 79a0bd5b14807456eff6bdde38a1a662fe9eb474 Merge: 1e5707c 415cd4d Author: Sven Eckelmann <[email protected]> Date: Mon Oct 31 15:15:06 2011 +0100 Merge commit 'debian/1.99.4-5' into experimental Conflicts: debian/changelog debian/changelog | 256 +++++++++++++++++++++++++++++++------------------------ debian/control | 1 - debian/copyright | 2 +- debian/rules | 6 -- 4 files changed, 144 insertions(+), 121 deletions(-) diff --cc debian/changelog index e1e1a67,9aed8ac..40768d3 --- a/debian/changelog +++ b/debian/changelog @@@ -1,28 -1,16 +1,40 @@@ +mupen64plus-video-rice (1.99.4+40+4d1f7a6b4a15-1) UNRELEASED; urgency=low + + * New upstream snapshot from revision 4d1f7a6b4a15022217f7e4f08f053cbaf57f3996 + + -- Sven Eckelmann <[email protected]> Fri, 09 Sep 2011 10:38:57 +0200 + +mupen64plus-video-rice (1.99.4+38+d1cc49eac47d-1) experimental; urgency=low + + * New upstream snapshot from revision d1cc49eac47d5d7d64989611f5565cc81d2433f4 + * 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: + - Remove upstream merged patches divide_by_zero.patch, + highres_memcorruption.patch, infinit_loop.patch, mipmapping.patch, + png_truecolor_conversation.patch, portable_movsxl.patch, + rewrite_makefile.patch, undefined_functions.patch, wom_corruption.patch, + z_coordinate_lines.patch + * Update years in debian/copyright + * Add debian/get-orig-source.sh for snapshots + + -- Sven Eckelmann <[email protected]> Mon, 29 Aug 2011 17:07:04 +0200 + + mupen64plus-video-rice (1.99.4-5) 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 <[email protected]> Mon, 31 Oct 2011 12:50:39 +0100 + mupen64plus-video-rice (1.99.4-4) unstable; urgency=low * debian/patches: diff --cc debian/control index 4c2234e,2115802..c758b48 --- 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), libpng12-dev | libpng-dev, 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-rice.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
