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 3bbd7a34f116640c3adf3422883f73bb5cb303b3 Merge: 1d81fed adbf9ea Author: Sven Eckelmann <[email protected]> Date: Sun Mar 11 19:46:24 2012 +0100 Merge tag 'debian/1.99.4+42+cb6f27f358cc-1' Debian release 1.99.4+42+cb6f27f358cc-1 Conflicts: debian/changelog debian/control debian/changelog | 25 ++ debian/control | 4 +- debian/copyright | 4 + debian/get-orig-source.sh | 26 +++ debian/patches/divide_by_zero.patch | 19 -- debian/patches/highres_memcorruption.patch | 74 ------ debian/patches/infinit_loop.patch | 26 --- debian/patches/mipmapping.patch | 139 ----------- debian/patches/png_truecolor_conversation.patch | 50 ---- debian/patches/portable_movsxl.patch | 34 --- debian/patches/rewrite_makefile.patch | 294 ------------------------ debian/patches/series | 10 - debian/patches/undefined_functions.patch | 117 ---------- debian/patches/wom_corruption.patch | 70 ------ debian/patches/z_coordinate_lines.patch | 20 -- debian/rules | 5 +- projects/unix/Makefile | 188 ++++++++------- src/CSortedList.h | 6 +- src/Config.cpp | 11 +- src/Config.h | 4 +- src/Debugger.cpp | 1 + src/DirectXDecodedMux.cpp | 10 +- src/FrameBuffer.cpp | 18 +- src/GeneralCombiner.cpp | 22 -- src/GraphicsContext.cpp | 50 +--- src/GraphicsContext.h | 4 - src/OGLExtRender.cpp | 35 ++- src/OGLGraphicsContext.cpp | 31 ++- src/OGLRender.cpp | 8 +- src/OGLRender.h | 2 - src/OGLTexture.cpp | 8 +- src/RDP_Texture.h | 12 +- src/RSP_S2DEX.cpp | 4 +- src/Render.cpp | 32 +-- src/RenderBase.cpp | 2 +- src/RenderExt.cpp | 7 - src/TextureFilters.cpp | 52 +++-- src/TextureManager.cpp | 2 - src/Video.cpp | 34 ++- src/Video.h | 3 + src/liblinux/BMGImage.c | 42 ++-- src/liblinux/BMGUtils.c | 18 +- src/liblinux/bmp.c | 2 +- src/liblinux/pngrw.c | 8 +- src/osal_preproc.h | 2 +- src/version.h | 7 +- 46 files changed, 383 insertions(+), 1159 deletions(-) diff --cc debian/changelog index 4b6ff67,a80aa51..c88eb34 --- a/debian/changelog +++ b/debian/changelog @@@ -1,18 -1,28 +1,43 @@@ +mupen64plus-video-rice (1.99.4-7) UNRELEASED; urgency=low + + * 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]> Wed, 07 Mar 2012 22:30:57 +0100 + + mupen64plus-video-rice (1.99.4+42+cb6f27f358cc-1) experimental; urgency=low + + * New upstream snapshot from revision cb6f27f358ccf6ffbaa8fed19d864770aaa82a0b + * Remove unnecessary --as-needed from linker flags in debian/rules + + -- Sven Eckelmann <[email protected]> Sat, 12 Nov 2011 21:49:59 +0100 + + mupen64plus-video-rice (1.99.4+38+d1cc49eac47d-1) experimental; urgency=low + + * New upstream snapshot from revision d1cc49eac47d5d7d64989611f5565cc81d2433f4 + * 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 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-6) unstable; urgency=low + + * Update copyright years in debian/copyright + * Change dependency libpng12-dev to new name libpng-dev (Closes: #662440) + + -- Sven Eckelmann <[email protected]> Mon, 05 Mar 2012 09:34:33 +0100 + mupen64plus-video-rice (1.99.4-5) unstable; urgency=low * debian/control: diff --cc debian/control index 974ab6d,c758b48..375c7c3 --- a/debian/control +++ b/debian/control @@@ -9,11 -9,11 +9,11 @@@ Homepage: http://code.google.com/p/mupe Vcs-Git: git://anonscm.debian.org/collab-maint/mupen64plus-video-rice.git Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/mupen64plus-video-rice.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), - libpng12-dev | libpng-dev, + libpng-dev, libsdl1.2-dev | libsdl-dev, pkg-config, diff --cc debian/rules index fe3625c,46f3c19..87e7305 --- a/debian/rules +++ b/debian/rules @@@ -1,12 -1,12 +1,9 @@@ #!/usr/bin/make -f # -*- makefile -*- -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,-pie 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/ LIBDIR="/usr/lib/$(DEB_HOST_MULTIARCH)" PIC=1 OPTFLAGS="" -- 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
