From 4989bd76a09fc69766d821bcb22fd0f021612ca8 Mon Sep 17 00:00:00 2001 From: djcj Date: Mon, 13 Jul 2015 17:32:18 +0200 Subject: [PATCH] Update Debian packaging files, move manpage to section 6 Modified application of pull request #43 by bartbes - Kept binary in /usr/bin - Remove postinst/postrm scripts --- platform/unix/Makefile.am | 2 +- platform/unix/debian/control.in | 45 ++++++++----------- platform/unix/debian/copyright | 43 ++++++++++-------- platform/unix/debian/liblove-unstable0.docs | 1 + .../unix/debian/liblove-unstable0.install | 1 + platform/unix/debian/liblove0.docs | 1 + platform/unix/debian/liblove0.install | 1 + platform/unix/debian/love-unstable.manpages | 1 + platform/unix/debian/love.install | 11 +++-- platform/unix/debian/love.manpages | 2 +- platform/unix/debian/rules.in | 29 +++++++++--- platform/unix/{love.1 => love.6} | 6 +-- platform/unix/postinst | 5 --- platform/unix/postrm | 4 -- 14 files changed, 81 insertions(+), 71 deletions(-) create mode 100644 platform/unix/debian/liblove-unstable0.docs create mode 100644 platform/unix/debian/liblove-unstable0.install create mode 100644 platform/unix/debian/liblove0.docs create mode 100644 platform/unix/debian/liblove0.install create mode 100644 platform/unix/debian/love-unstable.manpages rename platform/unix/{love.1 => love.6} (96%) delete mode 100755 platform/unix/postinst delete mode 100755 platform/unix/postrm diff --git a/platform/unix/Makefile.am b/platform/unix/Makefile.am index 5bde88606..f54a08e9c 100644 --- a/platform/unix/Makefile.am +++ b/platform/unix/Makefile.am @@ -2,7 +2,7 @@ ACLOCAL_AMFLAGS = -I platform/unix/m4 SUBDIRS = src EXTRA_DIST = changes.txt license.txt readme.md \ platform/unix/love.desktop.in -dist_man1_MANS = platform/unix/love.1 +dist_man1_MANS = platform/unix/love.6 applicationsdir=$(datarootdir)/applications mimeinfodir=$(datarootdir)/mime/packages diff --git a/platform/unix/debian/control.in b/platform/unix/debian/control.in index 8922eafc7..3a3c36fd5 100644 --- a/platform/unix/debian/control.in +++ b/platform/unix/debian/control.in @@ -3,13 +3,15 @@ Section: games Priority: extra Maintainer: Bart van Strien Build-Depends: debhelper (>= 9), - autotools-dev, - autoconf, - automake, - libtool, + dh-autoreconf, pkg-config, + libtool, libfreetype6-dev, + luajit, libluajit-5.1-dev, + libmodplug-dev, + libmpg123-dev, + libopenal-dev, libphysfs-dev, libsdl2-dev (>= 2.0.0), libopenal-dev, @@ -17,42 +19,33 @@ Build-Depends: debhelper (>= 9), libvorbis-dev, libmodplug-dev, libmpg123-dev, - zlib1g-dev, + zlib1g-dev Standards-Version: 3.9.5 Homepage: http://love2d.org -Package: liblove@LOVE_SUFFIX@ +Package: liblove@LOVE_SUFFIX@0 +Section: libs Architecture: any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: ${misc:Depends}, - ${shlibs:Depends}, - libfreetype6, - libgl1-mesa-glx, - libluajit-5.1-2, - libphysfs-1.0-0, - libsdl2-2.0-0 (>= 2.0.0), - libopenal1, - libogg0, - libvorbis0a, - libvorbisfile3, - libmodplug1, - libmpg123-0, - zlib1g, -Description: LOVE is a free 2D game engine which enables easy game creation in Lua. + ${shlibs:Depends} +Description: 2D game engine - runtime + LOVE is a free 2D game engine which enables easy game creation in Lua. Package: love@LOVE_SUFFIX@ Architecture: any -Multi-Arch: same Depends: ${misc:Depends}, - liblove@LOVE_SUFFIX@ (= ${binary:Version}) -Description: LOVE is a free 2D game engine which enables easy game creation in Lua. + ${shlibs:Depends} +Description: 2D game engine + LOVE is a free 2D game engine which enables easy game creation in Lua. -Package: love@LOVE_SUFFIX@-dbg +Package: liblove@LOVE_SUFFIX@-dbg Priority: extra Section: debug Architecture: any Multi-Arch: same Depends: ${misc:Depends}, - love@LOVE_SUFFIX@ (= ${binary:Version}), -Description: LOVE is a free 2D game engine which enables easy game creation in Lua. + liblove@LOVE_SUFFIX@0 (= ${binary:Version}) +Description: 2D game engine - debug symbols + LOVE is a free 2D game engine which enables easy game creation in Lua. diff --git a/platform/unix/debian/copyright b/platform/unix/debian/copyright index 65dd94b4a..6683e79c8 100644 --- a/platform/unix/debian/copyright +++ b/platform/unix/debian/copyright @@ -1,20 +1,27 @@ -Copyright (c) 2006-2015 LOVE Development Team +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: LÖVE +Upstream-Contact: Bart van Strien +Source: http://www.love2d.org/ -This software is provided 'as-is', without any express or implied -warranty. In no event will the authors be held liable for any damages -arising from the use of this software. +Files: * +Copyright: 2006-2015 LOVE Development Team +License: zlib + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + . + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + . + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + . + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + . + 3. This notice may not be removed or altered from any source + distribution. -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it -freely, subject to the following restrictions: - -1. The origin of this software must not be misrepresented; you must not -claim that you wrote the original software. If you use this software -in a product, an acknowledgment in the product documentation would be -appreciated but is not required. - -2. Altered source versions must be plainly marked as such, and must not be -misrepresented as being the original software. - -3. This notice may not be removed or altered from any source -distribution. diff --git a/platform/unix/debian/liblove-unstable0.docs b/platform/unix/debian/liblove-unstable0.docs new file mode 100644 index 000000000..cdb5f04f1 --- /dev/null +++ b/platform/unix/debian/liblove-unstable0.docs @@ -0,0 +1 @@ +readme.md diff --git a/platform/unix/debian/liblove-unstable0.install b/platform/unix/debian/liblove-unstable0.install new file mode 100644 index 000000000..10a01ed09 --- /dev/null +++ b/platform/unix/debian/liblove-unstable0.install @@ -0,0 +1 @@ +usr/lib/*/liblove-unstable.so.* diff --git a/platform/unix/debian/liblove0.docs b/platform/unix/debian/liblove0.docs new file mode 100644 index 000000000..cdb5f04f1 --- /dev/null +++ b/platform/unix/debian/liblove0.docs @@ -0,0 +1 @@ +readme.md diff --git a/platform/unix/debian/liblove0.install b/platform/unix/debian/liblove0.install new file mode 100644 index 000000000..93beb2897 --- /dev/null +++ b/platform/unix/debian/liblove0.install @@ -0,0 +1 @@ +usr/lib/*/liblove.so.* diff --git a/platform/unix/debian/love-unstable.manpages b/platform/unix/debian/love-unstable.manpages new file mode 100644 index 000000000..31aab1554 --- /dev/null +++ b/platform/unix/debian/love-unstable.manpages @@ -0,0 +1 @@ +platform/unix/love-unstable.6 diff --git a/platform/unix/debian/love.install b/platform/unix/debian/love.install index ac4c7a440..97b36762a 100644 --- a/platform/unix/debian/love.install +++ b/platform/unix/debian/love.install @@ -1,6 +1,5 @@ -usr/bin/love -usr/share/man/man1/love.1 -usr/share/pixmaps/love.svg -usr/share/mime/packages/love.xml -usr/share/icons/hicolor/scalable/mimetypes/application-x-love-game.svg -usr/share/applications/love.desktop +usr/bin +usr/share/applications +usr/share/mime +usr/share/pixmaps +usr/share/icons diff --git a/platform/unix/debian/love.manpages b/platform/unix/debian/love.manpages index a510eb2e1..09688d49c 100644 --- a/platform/unix/debian/love.manpages +++ b/platform/unix/debian/love.manpages @@ -1 +1 @@ -platform/unix/love.1 +platform/unix/love.6 diff --git a/platform/unix/debian/rules.in b/platform/unix/debian/rules.in index 9ed42c92f..f55809f6f 100755 --- a/platform/unix/debian/rules.in +++ b/platform/unix/debian/rules.in @@ -1,16 +1,31 @@ #!/usr/bin/make -f -DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU) -DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) +commonflags = -Wall -Wno-maybe-uninitialized -Wno-strict-aliasing +CFLAGS += $(commonflags) +CXXFLAGS += $(commonflags) + + +%: + dh $@ --parallel --with autoreconf + +override_dh_auto_clean: + dh_auto_clean + rm -f platform/unix/love-unstable.6 override_dh_auto_configure: dh_auto_configure -- --with-lua=luajit -override_dh_link: - dh_link -plove@LOVE_SUFFIX@-dev usr/lib/$(DEB_HOST_MULTIARCH)/liblove@LOVE_SUFFIX@.so.0.0.0 usr/lib/$(DEB_HOST_MULTIARCH)/liblove@LOVE_SUFFIX@.so +override_dh_installdocs: + dh_installdocs --link-doc=liblove@LOVE_SUFFIX@0 + +override_dh_installchangelogs: + dh_installchangelogs changes.txt + +override_dh_installman: + cp -f platform/unix/love.6 platform/unix/love-unstable.6 + dh_installman override_dh_strip: - dh_strip --dbg-package=love@LOVE_SUFFIX@-dbg + dh_strip -pliblove@LOVE_SUFFIX@0 --dbg-package=liblove@LOVE_SUFFIX@-dbg + dh_strip --remaining-packages -%: - dh $@ --parallel diff --git a/platform/unix/love.1 b/platform/unix/love.6 similarity index 96% rename from platform/unix/love.1 rename to platform/unix/love.6 index 539cf9a9c..158f14cb5 100644 --- a/platform/unix/love.1 +++ b/platform/unix/love.6 @@ -15,16 +15,16 @@ .\" - Update version to 0.9 and remove reference to doc dir .\" - Add fused and version flags -.TH "LÖVE" "1" "0.9" "" "" +.TH "LOVE" "6" "0.9.2" .SH "NAME" love \- 2D game development framework .SH "SYNOPSIS" .B love -[--fused] <\fIgame.love\fR> +[\-\-fused] <\fIgame.love\fR> .PP .B love ---version +\-\-version .PP .SH "DESCRIPTION" diff --git a/platform/unix/postinst b/platform/unix/postinst deleted file mode 100755 index 68e87b813..000000000 --- a/platform/unix/postinst +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -update-mime-database /usr/share/mime -gtk-update-icon-cache --force /usr/share/icons/gnome -xdg-mime default love.desktop application/x-love-game diff --git a/platform/unix/postrm b/platform/unix/postrm deleted file mode 100755 index 7cb24e4b3..000000000 --- a/platform/unix/postrm +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -update-mime-database /usr/share/mime -gtk-update-icon-cache --force /usr/share/icons/gnome