[nestopia] 05/11: New upstream release

Sat Sep 9 10:34:47 UTC 2017

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

skitt pushed a commit to branch master
in repository nestopia.

commit 486a944259a733c50f59abebcabebe1683b5d23b
Author: Stephen Kitt <steve at sk2.org>
Date:   Fri Sep 8 22:57:32 2017 +0200

    New upstream release
---
 debian/changelog                      |  5 +++--
 debian/control                        |  3 ++-
 debian/copyright                      |  9 ++-------
 debian/nestopia.docs                  |  1 +
 debian/nestopia.install               |  4 ++--
 debian/patches/buildflags.patch       | 20 --------------------
 debian/patches/format-security.patch  | 13 -------------
 debian/patches/install-location.patch | 32 --------------------------------
 debian/patches/libretro_version.patch |  2 +-
 debian/patches/series                 |  4 ----
 debian/patches/use-system-zlib.patch  | 14 --------------
 11 files changed, 11 insertions(+), 96 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e822167..dbdeef3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,11 @@
-nestopia (1.47-3) UNRELEASED; urgency=medium
+nestopia (1.48-1) UNRELEASED; urgency=medium
 
+  * New upstream release.
   * Copy Appstream metadata from Ubuntu, thanks to Jeremy Bicha (Closes:
     #860427).
   * Update watch file.
 
- -- Stephen Kitt <skitt at debian.org>  Sat, 10 Jun 2017 10:32:07 +0200
+ -- Stephen Kitt <skitt at debian.org>  Fri, 08 Sep 2017 21:27:30 +0200
 
 nestopia (1.47-2) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index e2b785c..335a589 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,8 @@ Uploaders: Stephen Kitt <skitt at debian.org>,
            Sérgio Benjamim <sergio_br2 at yahoo.com.br>
 Section: games
 Priority: optional
-Build-Depends: debhelper (>= 9),
+Build-Depends: cmake,
+               debhelper (>= 9),
                dh-exec,
                libao-dev,
                libarchive-dev,
diff --git a/debian/copyright b/debian/copyright
index 29c7836..106f607 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,7 +4,7 @@ Source: <http://0ldsk00l.ca/nestopia>
 
 Files: *
 Copyright: 2003-2008 Martin Freij
-           2012-2016 R. Danbrook
+           2012-2017 R. Danbrook
 License: GPL-2.0+
 
 Files: libretro/libretro.h
@@ -35,13 +35,8 @@ 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-2016 Stephen Kitt <skitt at debian.org>
+Copyright: 2011-2017 Stephen Kitt <skitt at debian.org>
 License: GPL-2.0+
 
 Files: debian/libretro-nestopia.metainfo.xml
diff --git a/debian/nestopia.docs b/debian/nestopia.docs
index 7c52318..7f47ab4 100644
--- a/debian/nestopia.docs
+++ b/debian/nestopia.docs
@@ -1,2 +1,3 @@
 readme.html
+README.md
 README.unix
diff --git a/debian/nestopia.install b/debian/nestopia.install
index 58c224b..5bef0e3 100644
--- a/debian/nestopia.install
+++ b/debian/nestopia.install
@@ -1,5 +1,5 @@
-usr/games/nestopia
+usr/bin/nestopia usr/games
 usr/share/applications
+usr/share/icons
 usr/share/nestopia
-usr/share/pixmaps
 debian/nestopia.appdata.xml usr/share/metainfo/
diff --git a/debian/patches/buildflags.patch b/debian/patches/buildflags.patch
deleted file mode 100644
index 3b1280b..0000000
--- a/debian/patches/buildflags.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: Preserve externally-provided build flags
-Author: Stephen Kitt <skitt at debian.org>
-
---- a/Makefile
-+++ b/Makefile
-@@ -2,12 +2,12 @@
- CXX ?= c++
- CXXFLAGS ?= -O3 -g3
- CPPFLAGS += -DNST_PRAGMA_ONCE
--CFLAGS = $(shell sdl2-config --cflags)
-+CFLAGS += $(shell sdl2-config --cflags)
- 
- INCLUDES = -Isource
- WARNINGS = -Wno-write-strings
- 
--LDFLAGS = -Wl,--as-needed
-+LDFLAGS += -Wl,--as-needed
- LIBS = -lstdc++ -lm -lz
- LIBS += $(shell sdl2-config --libs)
- 
diff --git a/debian/patches/format-security.patch b/debian/patches/format-security.patch
deleted file mode 100644
index e5c322e..0000000
--- a/debian/patches/format-security.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Description: Use a format specifier with gtk_message_dialog_new
-Author: Stephen Kitt <skitt at debian.org>
-
---- a/source/unix/gtkui/gtkui.cpp
-+++ b/source/unix/gtkui/gtkui.cpp
-@@ -438,6 +438,7 @@
- 				GTK_DIALOG_DESTROY_WITH_PARENT,
- 				GTK_MESSAGE_INFO,
- 				GTK_BUTTONS_OK,
-+				"%s",
- 				message);
- 	gtk_dialog_run(GTK_DIALOG(messagewindow));
- 	gtk_widget_destroy(messagewindow);
diff --git a/debian/patches/install-location.patch b/debian/patches/install-location.patch
deleted file mode 100644
index df1af36..0000000
--- a/debian/patches/install-location.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Description: Install to FHS-compliant locations and handle DESTDIR
-Author: Stephen Kitt <skitt at debian.org>
-
---- a/Makefile
-+++ b/Makefile
-@@ -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)
--	install -m 0644 source/unix/icons/nestopia.desktop $(DATADIR)
--	install -m 0644 NstDatabase.xml $(DATADIR)
--	install -m 0644 source/unix/icons/*.png $(DATADIR)/icons
--	install -m 0644 source/unix/icons/*.svg $(DATADIR)/icons
--	install -m 0644 source/unix/icons/nestopia.svg $(PREFIX)/share/pixmaps
--	xdg-desktop-menu install --novendor $(DATADIR)/nestopia.desktop
-+	mkdir -p $(DESTDIR)/$(BINDIR)
-+	mkdir -p $(DESTDIR)/$(PREFIX)/share/applications
-+	mkdir -p $(DESTDIR)/$(DATADIR)/icons
-+	mkdir -p $(DESTDIR)/$(PREFIX)/share/pixmaps
-+	install -m 0755 $(BIN) $(DESTDIR)/$(BINDIR)
-+	install -m 0644 source/unix/icons/nestopia.desktop $(DESTDIR)/$(PREFIX)/share/applications
-+	install -m 0644 NstDatabase.xml $(DESTDIR)/$(DATADIR)
-+	install -m 0644 source/unix/icons/*.png $(DESTDIR)/$(DATADIR)/icons
-+	install -m 0644 source/unix/icons/*.svg $(DESTDIR)/$(DATADIR)/icons
-+	install -m 0644 source/unix/icons/nestopia.svg $(DESTDIR)/$(PREFIX)/share/pixmaps
- 
- uninstall:
- 	xdg-desktop-menu uninstall $(DATADIR)/nestopia.desktop
diff --git a/debian/patches/libretro_version.patch b/debian/patches/libretro_version.patch
index 96df24b..803df56 100644
--- a/debian/patches/libretro_version.patch
+++ b/debian/patches/libretro_version.patch
@@ -8,7 +8,7 @@ Author: Sérgio Benjamim <sergio_br2 at yahoo.com.br>
  #include "../source/core/api/NstApiFds.hpp"
  
 -#define NST_VERSION "1.48-WIP"
-+#define NST_VERSION "1.47"
++#define NST_VERSION "1.48"
  
  #ifdef _WIN32
  #define snprintf _snprintf
diff --git a/debian/patches/series b/debian/patches/series
index b62781c..ab1516f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1 @@
-install-location.patch
-format-security.patch
-buildflags.patch
-use-system-zlib.patch
 libretro_version.patch
diff --git a/debian/patches/use-system-zlib.patch b/debian/patches/use-system-zlib.patch
deleted file mode 100644
index 1090eaf..0000000
--- a/debian/patches/use-system-zlib.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Description: Use system zlib
-Author: Sérgio Benjamim <sergio_br2 at yahoo.com.br>
-
---- a/source/core/NstZlib.cpp
-+++ b/source/core/NstZlib.cpp
-@@ -37,7 +37,7 @@
- 
-  #endif
- 
-- #include "../zlib/zlib.h"
-+ #include <zlib.h>
- 
- #endif
- 

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

