[nestopia] 04/06: New upstream release.

Wed Jan 13 07:51:16 UTC 2016

This is an automated email from the git hooks/post-receive script.

skitt pushed a commit to branch master
in repository nestopia.

commit 6662de4fccde646f0b409ef1b952e54fae5e2318
Author: Stephen Kitt <steve at sk2.org>
Date:   Tue Jan 12 20:32:55 2016 +0100

    New upstream release.
---
 debian/changelog                      |  8 ++++++--
 debian/control                        |  3 +--
 debian/copyright                      |  8 ++++++--
 debian/patches/buildflags.patch       |  2 +-
 debian/patches/format-security.patch  |  2 +-
 debian/patches/install-location.patch | 14 ++------------
 debian/patches/libretro_version.patch | 16 +++++++---------
 debian/rules                          |  3 +++
 8 files changed, 27 insertions(+), 29 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index db0df15..f034174 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
-nestopia (1.46.2-3) UNRELEASED; urgency=medium
+nestopia (1.47-1) UNRELEASED; urgency=medium
 
+  [ Stephen Kitt ]
+  * New upstream release.
+
+  [ Sérgio Benjamim ]
   * Correct the version for libretro.
 
- -- Sérgio Benjamim <sergio_br2 at yahoo.com.br>  Tue, 22 Sep 2015 16:30:00 -0300
+ -- Stephen Kitt <skitt at debian.org>  Tue, 12 Jan 2016 20:21:32 +0100
 
 nestopia (1.46.2-2) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index 2309ae7..c47adf5 100644
--- a/debian/control
+++ b/debian/control
@@ -7,8 +7,7 @@ Uploaders: Stephen Kitt <skitt at debian.org>,
 Build-Depends: debhelper (>= 9),
                libao-dev,
                libarchive-dev,
-               libgl1-mesa-dev | libgl-dev,
-               libglu1-mesa-dev | libglu-dev,
+               libglew-dev,
                libgtk-3-dev,
                libsdl2-dev
 Standards-Version: 3.9.6
diff --git a/debian/copyright b/debian/copyright
index b534b70..3025bf7 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,7 +4,7 @@ Source: <http://0ldsk00l.ca/nestopia>
 
 Files: *
 Copyright: 2003-2008 Martin Freij
-           2012-2013 R. Danbrook
+           2012-2016 R. Danbrook
 License: GPL-2.0+
 
 Files: libretro/libretro.h
@@ -31,13 +31,17 @@ Files: source/unix/ini.*
 Copyright: 2009 Brush Technology
 License: BSD-3-clause-Brush-Technology
 
+Files: source/unix/png.*
+Copyright: 2005-2015 Lode Vandevenne
+License: Zlib
+
 Files: source/zlib/*
 Copyright: 1995-2005 Jean-loup Gailly and Mark Adler
            1998-2005 Gilles Vollant
 License: Zlib
 
 Files: debian/*
-Copyright: 2011-2015 Stephen Kitt <skitt at debian.org>
+Copyright: 2011-2016 Stephen Kitt <skitt at debian.org>
 License: GPL-2.0+
 
 License: GPL-2.0+
diff --git a/debian/patches/buildflags.patch b/debian/patches/buildflags.patch
index ee7afb0..3b1280b 100644
--- a/debian/patches/buildflags.patch
+++ b/debian/patches/buildflags.patch
@@ -4,7 +4,7 @@ Author: Stephen Kitt <skitt at debian.org>
 --- a/Makefile
 +++ b/Makefile
 @@ -2,12 +2,12 @@
- CXX = c++
+ CXX ?= c++
  CXXFLAGS ?= -O3 -g3
  CPPFLAGS += -DNST_PRAGMA_ONCE
 -CFLAGS = $(shell sdl2-config --cflags)
diff --git a/debian/patches/format-security.patch b/debian/patches/format-security.patch
index b142059..e5c322e 100644
--- a/debian/patches/format-security.patch
+++ b/debian/patches/format-security.patch
@@ -3,7 +3,7 @@ Author: Stephen Kitt <skitt at debian.org>
 
 --- a/source/unix/gtkui/gtkui.cpp
 +++ b/source/unix/gtkui/gtkui.cpp
-@@ -317,6 +317,7 @@
+@@ -438,6 +438,7 @@
  				GTK_DIALOG_DESTROY_WITH_PARENT,
  				GTK_MESSAGE_INFO,
  				GTK_BUTTONS_OK,
diff --git a/debian/patches/install-location.patch b/debian/patches/install-location.patch
index ee71ea4..df1af36 100644
--- a/debian/patches/install-location.patch
+++ b/debian/patches/install-location.patch
@@ -3,21 +3,11 @@ Author: Stephen Kitt <skitt at debian.org>
 
 --- a/Makefile
 +++ b/Makefile
-@@ -15,8 +15,8 @@
- 
- BIN = nestopia
- 
--PREFIX = /usr/local
--BINDIR = $(PREFIX)/bin
-+PREFIX = /usr
-+BINDIR = $(PREFIX)/games
- DATADIR = $(PREFIX)/share/nestopia
- 
- ifneq ($(findstring MINGW,$(UNAME)),)
-@@ -376,15 +376,16 @@
+@@ -395,16 +395,16 @@
  	$(CC) $(LDFLAGS) $^ $(LIBS) -o $(BIN)
  
  install:
+-	mkdir -p $(BINDIR)
 -	mkdir -p $(DATADIR)/icons
 -	mkdir -p $(PREFIX)/share/pixmaps
 -	install -m 0755 $(BIN) $(BINDIR)
diff --git a/debian/patches/libretro_version.patch b/debian/patches/libretro_version.patch
index 6f20d3b..96df24b 100644
--- a/debian/patches/libretro_version.patch
+++ b/debian/patches/libretro_version.patch
@@ -1,16 +1,14 @@
 Description: fix the libretro version
 Author: Sérgio Benjamim <sergio_br2 at yahoo.com.br>
 
-Index: nestopia-1.46.2/libretro/libretro.cpp
-===================================================================
---- nestopia-1.46.2.orig/libretro/libretro.cpp	2014-10-13 19:16:25.000000000 -0300
-+++ nestopia-1.46.2/libretro/libretro.cpp	2015-09-19 14:49:47.464084030 -0300
-@@ -16,7 +16,7 @@
- #include <core/api/NstApiUser.hpp>
- #include <core/api/NstApiFds.hpp>
+--- a/libretro/libretro.cpp
++++ b/libretro/libretro.cpp
+@@ -17,7 +17,7 @@
+ #include "../source/core/api/NstApiUser.hpp"
+ #include "../source/core/api/NstApiFds.hpp"
  
--#define NST_VERSION "1.47-WIP"
-+#define NST_VERSION "1.46.2"
+-#define NST_VERSION "1.48-WIP"
++#define NST_VERSION "1.47"
  
  #ifdef _WIN32
  #define snprintf _snprintf
diff --git a/debian/rules b/debian/rules
index 0872a84..d59e940 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,6 +10,9 @@ ifeq ($(ARCH),armhf)
 	PLATFORM=platform="armv hardfloat"
 endif
 
+export PREFIX=/usr
+export BINDIR=/usr/games
+
 %:
 	dh $@ 
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/nestopia.git

