[mupen64plus-audio-sdl] 86/163: Merge tag 'debian/1.99.4+27+7f357ca0893f-1'
Sven Eckelmann
ecsv-guest at moszumanska.debian.org
Thu Nov 26 05:53:20 UTC 2015
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 a5d48590200a012aa39e7f70ff4e4aeba628b212
Merge: 86e975d 81d232b
Author: Sven Eckelmann <sven at narfation.org>
Date: Sun Mar 11 11:35:15 2012 +0100
Merge tag 'debian/1.99.4+27+7f357ca0893f-1'
Debian release 1.99.4+27+7f357ca0893f-1
Conflicts:
debian/changelog
debian/changelog | 20 +++
debian/control | 4 +-
debian/get-orig-source.sh | 26 ++++
debian/patches/rewrite_makefile.patch | 244 ----------------------------------
debian/patches/series | 1 -
debian/rules | 5 +-
projects/unix/Makefile | 160 ++++++++++++----------
src/main.c | 52 +++++---
src/main.h | 4 +
src/osal_preproc.h | 2 +-
10 files changed, 179 insertions(+), 339 deletions(-)
diff --cc debian/changelog
index eef5fd9,e384bc1..11183d3
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,22 +1,31 @@@
+mupen64plus-audio-sdl (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 <sven at narfation.org> Sun, 01 Jan 2012 20:19:31 +0100
++
+ mupen64plus-audio-sdl (1.99.4+27+7f357ca0893f-1) experimental; urgency=low
+
+ * New upstream snapshot from revision 7f357ca0893fde479dd1ba2308fef8ea4775a412
+ * Remove unnecessary --as-needed from linker flags in debian/rules
+
+ -- Sven Eckelmann <sven at narfation.org> Sat, 12 Nov 2011 21:36:28 +0100
+
+ mupen64plus-audio-sdl (1.99.4+23+a5074e99bdcc-1) experimental; urgency=low
+
+ * New upstream snapshot from revision a5074e99bdcc24d43548ac3d9409bd7603b3b53b
+ * 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 rewrite_makefile.patch
+ * Add debian/get-orig-source.sh for snapshots
+
+ -- Sven Eckelmann <sven at narfation.org> Mon, 29 Aug 2011 17:00:51 +0200
mupen64plus-audio-sdl (1.99.4-4) unstable; urgency=low
diff --cc debian/control
index 6c174c5,79024c4..473bd2c
--- 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-audio-sdl.git
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/mupen64plus-audio-sdl.git
Build-Depends:
- debhelper (>= 8.1.3),
+ debhelper (>= 9),
dpkg-dev (>= 1.16.0),
- libmupen64plus-dev,
+ libmupen64plus-dev (>= 1.99.4+77+8bb0e6b3ae3a),
libsamplerate0-dev | libsamplerate-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-audio-sdl.git
More information about the Pkg-games-commits
mailing list