This is an automated email from the git hooks/post-receive script. ecsv-guest pushed a commit to branch armhf_test in repository mupen64plus-audio-sdl.
commit 801435e7939a3dc4ccd3fa08d66a65e9ff50be81 Merge: 5f0f70c adbeefa Author: Sven Eckelmann <[email protected]> Date: Mon Oct 31 14:40:00 2011 +0100 Merge commit 'debian/1.99.4-4' into experimental Conflicts: debian/changelog debian/control debian/changelog | 224 +++++++++++++++++++++++++++++++------------------------ debian/control | 1 - debian/copyright | 2 +- debian/rules | 6 -- 4 files changed, 126 insertions(+), 107 deletions(-) diff --cc debian/changelog index 00b446c,8acc964..3e4d5ec --- a/debian/changelog +++ b/debian/changelog @@@ -1,18 -1,18 +1,31 @@@ +mupen64plus-audio-sdl (1.99.4+23+a5074e99bdcc-1) experimental; urgency=low + + * New upstream snapshot from revision a5074e99bdcc24d43548ac3d9409bd7603b3b53b + * debian/control: - - Add virtual package libsamplerate-dev as alternative build dependency - - 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 rewrite_makefile.patch + * Add debian/get-orig-source.sh for snapshots + + -- Sven Eckelmann <[email protected]> Mon, 29 Aug 2011 17:00:51 +0200 + + mupen64plus-audio-sdl (1.99.4-4) unstable; urgency=low + + * debian/control: + - Add virtual package libsamplerate-dev as alternative build + dependency + - 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:48:39 +0100 + mupen64plus-audio-sdl (1.99.4-3) unstable; urgency=low * Upload to unstable diff --cc debian/control index 706cb01,f6d827a..79024c4 --- a/debian/control +++ b/debian/control @@@ -11,8 -11,7 +11,7 @@@ Vcs-Browser: http://anonscm.debian.org/ Build-Depends: debhelper (>= 8.1.3), dpkg-dev (>= 1.16.0), - hardening-includes, - libmupen64plus-dev, + libmupen64plus-dev (>= 1.99.4+77+8bb0e6b3ae3a), libsamplerate0-dev | libsamplerate-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-audio-sdl.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
