[SCM] multi-platform emulator, including NES, GB/A, Lynx, PC Engine branch, master, updated. debian/0.8.D.3-4-4-gb21b66a
The following commit has been merged in the master branch:
commit cb41ab5c7a9ab46440b5370db562dd80722234e5
Author: Stephen Kitt st...@sk2.org
Date: Sun Jun 17 23:13:03 2012 +0200
Use ${source:Package} to avoid Built-Using mis-calculations with binNMUs
(closes: #677867).
diff --git a/debian/changelog b/debian/changelog
index da31034..3a5c381 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mednafen (0.8.D.3-5) UNRELEASED; urgency=low
+
+ * Use ${source:Package} with dpkg-query to retrieve only the package
+name in the Built-Using field (closes: #677867).
+
+ -- Stephen Kitt st...@sk2.org Sun, 17 Jun 2012 19:57:18 +0200
+
mednafen (0.8.D.3-4) unstable; urgency=low
* Update debian/watch to track stable releases only.
diff --git a/debian/rules b/debian/rules
index ff70095..7fe720e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,7 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-liblzo2_source := $(shell dpkg-query -W -f='$${Source} (= $${source:Version})'
liblzo2-dev)
+liblzo2_source := $(shell dpkg-query -W -f='$${source:Package} (=
$${source:Version})' liblzo2-dev)
%:
--
multi-platform emulator, including NES, GB/A, Lynx, PC Engine
___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[SCM] multi-platform emulator, including NES, GB/A, Lynx, PC Engine branch, master, updated. debian/0.8.D.3-4-4-gb21b66a
The following commit has been merged in the master branch:
commit cb6b757a25a99444ebf0a7dc542430e873f5bbe7
Author: Stephen Kitt st...@sk2.org
Date: Sun Jun 17 23:13:33 2012 +0200
Drop unused GPL-2 license paragraph.
diff --git a/debian/changelog b/debian/changelog
index 3a5c381..2420bc9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ mednafen (0.8.D.3-5) UNRELEASED; urgency=low
* Use ${source:Package} with dpkg-query to retrieve only the package
name in the Built-Using field (closes: #677867).
+ * Drop unused GPL-2 license paragraph from debian/copyright.
-- Stephen Kitt st...@sk2.org Sun, 17 Jun 2012 19:57:18 +0200
diff --git a/debian/copyright b/debian/copyright
index 88f1e15..01dcea7 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -338,23 +338,6 @@ Comment: DSP Utils
Copyright: 2000-2002 Fabrice Bellard
License: LGPL-2+
-License: GPL-2
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2 as
- published by the Free Software Foundation.
- .
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- .
- You should have received a copy of the GNU General Public License along
- with this program; if not, write to the Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- .
- On Debian systems, the complete text of the GNU General Public License
- version 2 can be found in /usr/share/common-licenses/GPL-2
-
License: GPL-2+
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
--
multi-platform emulator, including NES, GB/A, Lynx, PC Engine
___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[SCM] multi-platform emulator, including NES, GB/A, Lynx, PC Engine branch, master, updated. debian/0.8.D.3-4-4-gb21b66a
The following commit has been merged in the master branch:
commit 72d9942dbb583cce78481fdc4675c1d97ff3cb41
Author: Stephen Kitt st...@sk2.org
Date: Mon Jun 18 01:01:03 2012 +0200
Fix configure.ac to ensure dpkg-buildflags' CPPFLAGS make it all the way
through the build.
diff --git a/debian/changelog b/debian/changelog
index 2420bc9..6cf65fe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ mednafen (0.8.D.3-5) UNRELEASED; urgency=low
* Use ${source:Package} with dpkg-query to retrieve only the package
name in the Built-Using field (closes: #677867).
* Drop unused GPL-2 license paragraph from debian/copyright.
+ * Fix configure.ac to ensure dpkg-buildflags' CPPFLAGS make it all the
+way through the build.
-- Stephen Kitt st...@sk2.org Sun, 17 Jun 2012 19:57:18 +0200
diff --git a/debian/patches/hardening-fixes.patch
b/debian/patches/hardening-fixes.patch
index cb0aa65..9fd4257 100644
--- a/debian/patches/hardening-fixes.patch
+++ b/debian/patches/hardening-fixes.patch
@@ -28,3 +28,32 @@ Author: Stephen Kitt st...@sk2.org
if(subcon_tb != subcon_wc)
{
+--- mednafen.orig/configure.ac
mednafen/configure.ac
+@@ -58,7 +58,7 @@
+ else
+ AC_PATH_X
+ CFLAGS=-I${x_includes} ${CFLAGS}
+- CPPFLAGS=-I${x_includes} ${CFLAGS}
++ CPPFLAGS=-I${x_includes} ${CPPFLAGS}
+
+ AC_CHECK_HEADER([GL/gl.h],HAVE_GL_GL_H=true, HAVE_GL_GL_H=false)
+
+@@ -359,7 +359,7 @@
+ CFLAGS_SDLNET_BACK=$CFLAGS
+ CPPFLAGS_SDLNET_BACK=$CPPFLAGS
+ CFLAGS=$CFLAGS $SDL_CFLAGS
+-CPPFLAGS=$CFLAGS $SDL_CFLAGS
++CPPFLAGS=$CPPFLAGS $SDL_CFLAGS
+ AC_CHECK_HEADER([SDL_net.h],[], [HAS_SDL_NET=no])
+ if test x$HAS_SDL_NET = xno; then
+ AC_MSG_ERROR([*** SDL_net not found!])
+@@ -393,7 +393,7 @@
+ AX_CFLAGS_GCC_OPTION([-maltivec], ALTIVEC_FLAGS)
+ if test x$ALTIVEC_FLAGS != x; then
+ CFLAGS=$CFLAGS $ALTIVEC_FLAGS
+-CPPFLAGS=$CFLAGS $ALTIVEC_FLAGS
++CPPFLAGS=$CPPFLAGS $ALTIVEC_FLAGS
+ AC_DEFINE([ARCH_POWERPC_ALTIVEC], [1], [Define if we
are compiling with AltiVec usage.])
+ AM_CONDITIONAL(ARCH_POWERPC_ALTIVEC, true)
+ fi
--
multi-platform emulator, including NES, GB/A, Lynx, PC Engine
___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[SCM] multi-platform emulator, including NES, GB/A, Lynx, PC Engine branch, master, updated. debian/0.8.D.3-4-4-gb21b66a
The following commit has been merged in the master branch:
commit b21b66a19ed184afdd920414691a3544b1d16f89
Author: Stephen Kitt st...@sk2.org
Date: Mon Jun 18 06:46:15 2012 +0200
Release.
diff --git a/debian/changelog b/debian/changelog
index 6cf65fe..ca12dc3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-mednafen (0.8.D.3-5) UNRELEASED; urgency=low
+mednafen (0.8.D.3-5) unstable; urgency=low
* Use ${source:Package} with dpkg-query to retrieve only the package
name in the Built-Using field (closes: #677867).
@@ -6,7 +6,7 @@ mednafen (0.8.D.3-5) UNRELEASED; urgency=low
* Fix configure.ac to ensure dpkg-buildflags' CPPFLAGS make it all the
way through the build.
- -- Stephen Kitt st...@sk2.org Sun, 17 Jun 2012 19:57:18 +0200
+ -- Stephen Kitt st...@sk2.org Mon, 18 Jun 2012 01:01:20 +0200
mednafen (0.8.D.3-4) unstable; urgency=low
--
multi-platform emulator, including NES, GB/A, Lynx, PC Engine
___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
