Merge pull request #1736 from sergiobenrocha2/master

Updated debian packaging

debian/copyright

@@ -1,71 +0,0 @@
-This package was debianized by Hunter Kaller (hizzlekizzle) <hunter_kaller@yahoo.com> on
-Mon, 23 Apr 2012 13:24:59 -0500.
-
-It was downloaded from <https://github.com/libretro/RetroArch>
-
-Upstream Authors:
-
-    The RetroArch Team
-        Hans-Kristian Arntzen (Themaister) (main code) <maister@archlinux.us>
-        Daniel De Matteis (Squarepusher aka twinaphex) (maintainer) <libretro@gmail.com>
-        others, see `/usr/share/doc/retroarch/AUTHORS'
-
-Files: *
-Copyright: 2010-2015 The RetroArch Team
-License: GPLv3
-
-Files: libretro.h
-Copyright: 2010-2015 The RetroArch Team
-License: The MIT License (MIT)
-    Permission is hereby granted, free of charge, to any person obtaining a copy
-    of this software and associated documentation files (the "Software"), to deal
-    in the Software without restriction, including without limitation the rights
-    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-    copies of the Software, and to permit persons to whom the Software is
-    furnished to do so, subject to the following conditions:
- .
-    The above copyright notice and this permission notice shall be included in
-    all copies or substantial portions of the Software.
- .
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-    THE SOFTWARE.
-
-Files: performance/performance_android.c
-       performance/performance_android.h
-Copyright: 2010 The Android Open Source Project
-License:
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions
-    are met:
-     * Redistributions of source code must retain the above copyright
-       notice, this list of conditions and the following disclaimer.
-     * Redistributions in binary form must reproduce the above copyright
-       notice, this list of conditions and the following disclaimer in
-       the documentation and/or other materials provided with the
-       distribution.
- .
-    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-    "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-    LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-    FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-    COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-    INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-    BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
-    OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-    AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-    OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
-    OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-    SUCH DAMAGE.
-
-The Debian packaging is:
-
-    Copyright (C) 2012-2015 Hunter Kaller (hizzlekizzle) <hunter_kaller@yahoo.com>
-    Copyright (C) 2014-2015 Sergio Benjamim (sergio-br2) <sergio_br2@yahoo.com.br>
-
-and is licensed under the GPL version 3, 
-see `/usr/share/common-licenses/GPL-3'.

dist-scripts/debian/changelog

@@ -1,10 +1,10 @@
-retroarch (1.0.0.3-0ubuntu1) UNRELEASED; urgency=low
+retroarch (1.0.0.3-1) UNRELEASED; urgency=low
 
   * New version release (Beta)
 
  -- Sérgio Benjamim <sergio_br2@yahoo.com.br>  Mon, 27 Oct 2014 13:17:00 -0300
 
-retroarch (1.0.0.2-0ubuntu12) UNRELEASED; urgency=low
+retroarch (1.0.0.2-12) UNRELEASED; urgency=low
 
   * Improve debian packaging
   * Added DSP and video filters to the package
@@ -13,7 +13,7 @@ retroarch (1.0.0.2-0ubuntu12) UNRELEASED; urgency=low
 
  -- Sérgio Benjamim <sergio_br2@yahoo.com.br>  Sun, 17 Aug 2014 23:50:00 -0300
 
-retroarch (1.0.0.2-0ubuntu11) UNRELEASED; urgency=low
+retroarch (1.0.0.2-11) UNRELEASED; urgency=low
 
   * Debian folder from hunterk PPA to upstream
   * Updated /debian:
@@ -27,7 +27,7 @@ retroarch (1.0.0.2-0ubuntu11) UNRELEASED; urgency=low
 
  -- Sérgio Benjamim <sergio_br2@yahoo.com.br>  Fri, 11 Jul 2014 13:33:00 -0300
 
-retroarch (1.0.0.2-0ubuntu10) UNRELEASED; urgency=low
+retroarch (1.0.0.2-10) UNRELEASED; urgency=low
 
   * Update icon (finally) and use SVG instead of PNG.
   * Updated to latest git. Includes recent shader changes.

dist-scripts/debian/control

@@ -2,6 +2,7 @@ Source: retroarch
 Section: otherosfs
 Priority: extra
 Maintainer: Hunter Kaller (hizzlekizzle) <hunter_kaller@yahoo.com>
+Uploaders: Sergio Benjamim (sergio-br2) <sergio_br2@yahoo.com.br>
 Build-Depends:	debhelper (>= 9),
 				pkg-config,
 				libc6-dev (>= 2.13),
@@ -17,14 +18,15 @@ Build-Depends:	debhelper (>= 9),
 				libxxf86vm-dev,
 				libxinerama-dev,
 				libudev-dev,
+				libusb-1.0-0-dev,
 				libasound2-dev,
 				libxv-dev,
 				libopenal-dev,
+				libjack-jackd2-dev,
 				libfreetype6-dev,
 				libgbm-dev,
 				libdrm-dev,
 				libegl1-mesa-dev,
-				libopenvg1-mesa-dev,
 				python3-dev,
 				zlib1g-dev,
 				nvidia-cg-dev [!armhf]
@@ -41,7 +43,7 @@ Depends:		${shlibs:Depends},
 				python3,
 				nvidia-cg-toolkit [!armhf]
 Replaces: ssnes
-Suggests: retroarch-joypad-autoconfig, libretro-common-shaders, retroarch-assets, libretro-database
+Suggests: retroarch-joypad-autoconfig, libretro-common-shaders, libretro-common-overlays, retroarch-assets
 Description: Simple frontend for the libretro library
  RetroArch is an open source, multi-platform frontend for the libretro API. 
  It can be used as a modular multi emulator system, game engine, media player 

dist-scripts/debian/copyright

@@ -0,0 +1,61 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: RetroArch
+Upstream-Contact: Daniel De Matteis (Squarepusher aka twinaphex) <libretro@gmail.com>
+Source: https://github.com/libretro/RetroArch.git
+Comment: This package was debianized by
+ Hunter Kaller (hizzlekizzle) <hunter_kaller@yahoo.com> on Mon, 23 Apr 2012 13:24:59 -0500.
+
+
+Files: *
+Copyright: 2010-2015 The RetroArch Team
+               Hans-Kristian Arntzen (Themaister) (main code) <maister@archlinux.us>
+               Daniel De Matteis (Squarepusher aka twinaphex) (maintainer) <libretro@gmail.com>
+               others, see `/usr/share/doc/retroarch/AUTHORS'
+License: GPL-3+
+
+Files: libretro.h
+Copyright: 2010-2015 The RetroArch Team
+License: Expat
+
+Files: debian/*
+Copyright: 2012-2015 Hunter Kaller (hizzlekizzle) <hunter_kaller@yahoo.com>
+           2014-2015 Sergio Benjamim (sergio-br2) <sergio_br2@yahoo.com.br>
+License: GPL-3+
+
+
+License: Expat
+    Permission is hereby granted, free of charge, to any person obtaining a copy
+    of this software and associated documentation files (the "Software"), to deal
+    in the Software without restriction, including without limitation the rights
+    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+    copies of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+ .
+    The above copyright notice and this permission notice shall be included in
+    all copies or substantial portions of the Software.
+ .
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+    THE SOFTWARE.
+
+License: GPL-3+
+    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
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+ .
+    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, see <http://www.gnu.org/licenses/>.
+ .
+    On Debian systems, the full text of the GNU General Public
+    License version 3 can be found in the file
+    `/usr/share/common-licenses/GPL-3'.

dist-scripts/debian/dirs

@@ -3,13 +3,11 @@ etc
 usr/lib/libretro
 usr/lib/retroarch/filters/video
 usr/lib/retroarch/filters/audio
-usr/share/doc/retroarch
-usr/share/man/man1
 usr/share/applications
 usr/share/libretro/assets
 usr/share/libretro/autoconfig
 usr/share/libretro/cheats
 usr/share/libretro/info
-usr/share/libretro/shaders
 usr/share/libretro/overlays
+usr/share/libretro/shaders
 usr/share/pixmaps

dist-scripts/debian/docs

@@ -0,0 +1,3 @@
+AUTHORS
+CONTRIBUTING.md
+README.md

dist-scripts/debian/retroarch.lintian-overrides

@@ -0,0 +1,2 @@
+# lintian complains about *.dsp files, they aren't windows stuff
+retroarch binary: windows-devel-file-in-package

dist-scripts/debian/rules

@@ -25,38 +25,29 @@
 
 ARCH=$(shell dpkg-architecture -qDEB_HOST_ARCH)
 
-QUILT=QUILT_PATCHES=debian/patches quilt --quiltrc /dev/null
+ifeq ($(ARCH), $(filter $(ARCH), amd64 i386))
-PATCH := $(QUILT) push -a || [ "$$($(QUILT) applied)" = "$$(grep -v '^\#' debian/patches/series)" ]
+CONFIG_EXTRA_FLAGS=--enable-sse
-UNPATCH := $(QUILT) pop -a || [ "$$($(QUILT) applied 2>&1)" = "No patches applied" ]
+else ifeq ($(ARCH),armhf)
-
+CONFIG_EXTRA_FLAGS=--disable-vg --disable-cg --enable-gles --enable-neon --enable-floathard
-patch:
+endif
-	$(PATCH)
-	
-unpatch:
-	$(UNPATCH)
 
 override_dh_auto_configure:
 	# See ./configure --help for valid flags
 	# disable flags (i.e. --disable-ffmpeg for example) if there is no package relative to the feature in Build-Depends
-ifeq ($(ARCH), $(filter $(ARCH), amd64 i386))
+	./configure --prefix=/usr --disable-ffmpeg $(CONFIG_EXTRA_FLAGS)
-	./configure --prefix=/usr --disable-ffmpeg --enable-sse
-else ifeq ($(ARCH),armhf)
-	./configure --prefix=/usr --disable-ffmpeg --disable-vg --disable-cg --enable-gles --enable-neon --enable-floathard
-endif
 
 override_dh_auto_build:
-	$(MAKE)
+	dh_auto_build --
 	# SoftFilters
-	$(MAKE) -C gfx/video_filters/
+	dh_auto_build -- -C gfx/video_filters/
 	# Audio DSP plugins
-	$(MAKE) -C audio/audio_filters/
+	dh_auto_build -- -C audio/audio_filters/
 
 override_dh_auto_install:
 	# Add here commands to install the package into debian/retroarch.
 	$(MAKE) DESTDIR=$(CURDIR)/debian/retroarch PREFIX=/usr install
-	cp $(CURDIR)/AUTHORS $(CURDIR)/debian/retroarch/usr/share/doc/retroarch/
 	cp $(CURDIR)/debian/retroarch.desktop $(CURDIR)/debian/retroarch/usr/share/applications/
-	#cp $(CURDIR)/debian/retroarch.cfg $(CURDIR)/debian/retroarch/etc/
+	cp $(CURDIR)/retroarch.cfg $(CURDIR)/debian/retroarch/etc/
 ifeq ($(ARCH),armhf)
 	rm -f $(CURDIR)/debian/retroarch/usr/bin/retroarch-cg2glsl
 endif
@@ -72,6 +63,6 @@ endif
 
 override_dh_auto_clean:
 	touch config.mk
-	$(MAKE) clean
+	dh_auto_clean --
-	$(MAKE) -C gfx/video_filters/ clean
+	dh_auto_clean -- -C gfx/video_filters/ clean
-	$(MAKE) -C audio/audio_filters/ clean
+	dh_auto_clean -- -C audio/audio_filters/ clean