Control: tags -1 + pending patch
attaching a patch, uploading to delayed.
diff -Nru gltron-0.70final/debian/changelog gltron-0.70final/debian/changelog
--- gltron-0.70final/debian/changelog 2013-08-18 13:37:08.000000000 +0000
+++ gltron-0.70final/debian/changelog 2015-07-09 11:53:25.000000000 +0000
@@ -1,3 +1,20 @@
+gltron (0.70final-12.1) unstable; urgency=medium
+
+ * Non maintainer upload.
+
+ [ Matthias Klose ]
+ * Build-depend on libpng-dev. Closes: #662350.
+ * Fix build with GCC 5. Closes: #777877.
+ * Disable -Werror to fix a FTBFS on Ubuntu and derivatives (fread is still
marked
+ as warn_unused_result).
+
+ [ Markus Koschany ]
+ * Add gltron.desktop file and install it to /usr/share/applications.
+ * Add gltron.links file and link gltron.png to hicolor directory where it is
+ automatically detected and displayed on the user's desktop. Closes:
#737910.
+
+ -- Matthias Klose <d...@debian.org> Thu, 09 Jul 2015 13:38:37 +0200
+
gltron (0.70final-12) unstable; urgency=low
* debian/patches/cflags.patch:
diff -Nru gltron-0.70final/debian/control gltron-0.70final/debian/control
--- gltron-0.70final/debian/control 2013-08-18 02:24:22.000000000 +0000
+++ gltron-0.70final/debian/control 2015-07-09 11:40:03.000000000 +0000
@@ -4,7 +4,7 @@
Maintainer: Ari Pollak <a...@debian.org>
Standards-Version: 3.8.4
Build-Depends: debhelper (>= 7), autotools-dev, dh-autoreconf, zlib1g-dev,
- libpng12-dev, libgl1-mesa-dev | libgl-dev, libsdl-sound1.2-dev, libsdl1.2-dev,
+ libpng-dev, libgl1-mesa-dev | libgl-dev, libsdl-sound1.2-dev, libsdl1.2-dev,
libx11-dev
Package: gltron
diff -Nru gltron-0.70final/debian/dirs gltron-0.70final/debian/dirs
--- gltron-0.70final/debian/dirs 2003-12-14 18:37:43.000000000 +0000
+++ gltron-0.70final/debian/dirs 2015-07-09 11:40:59.000000000 +0000
@@ -1 +1,2 @@
usr/share/pixmaps
+usr/share/applications
diff -Nru gltron-0.70final/debian/gltron.desktop
gltron-0.70final/debian/gltron.desktop
--- gltron-0.70final/debian/gltron.desktop 1970-01-01 00:00:00.000000000
+0000
+++ gltron-0.70final/debian/gltron.desktop 2015-07-09 11:40:59.000000000
+0000
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Version=1.0
+Type=Application
+Name=GLtron
+Comment=3D lightcycle game
+Comment[de]=dreidimensionales Lichtrad-Spiel
+Exec=gltron
+Icon=gltron
+Terminal=false
+Categories=Game;ActionGame;
+Keywords=tron;lightcycle;3D;action;
diff -Nru gltron-0.70final/debian/gltron.links
gltron-0.70final/debian/gltron.links
--- gltron-0.70final/debian/gltron.links 1970-01-01 00:00:00.000000000
+0000
+++ gltron-0.70final/debian/gltron.links 2015-07-09 11:40:59.000000000
+0000
@@ -0,0 +1 @@
+usr/share/games/gltron/art/default/gltron.png
usr/share/icons/hicolor/256x256/apps/gltron.png
diff -Nru gltron-0.70final/debian/patches/gcc5.diff
gltron-0.70final/debian/patches/gcc5.diff
--- gltron-0.70final/debian/patches/gcc5.diff 1970-01-01 00:00:00.000000000
+0000
+++ gltron-0.70final/debian/patches/gcc5.diff 2015-07-09 11:45:41.000000000
+0000
@@ -0,0 +1,13 @@
+Index: b/src/video/gamegraphics.c
+===================================================================
+--- a/src/video/gamegraphics.c
++++ b/src/video/gamegraphics.c
+@@ -376,7 +376,7 @@ void drawCam(Player *p, PlayerVisual* pV
+ int lod = playerVisible(p, game->player + i);
+ if (lod >= 0) {
+ int drawTurn = 1;
+- if (! gSettingsCache.camType == CAM_TYPE_COCKPIT ||
++ if (! (gSettingsCache.camType == CAM_TYPE_COCKPIT) ||
+ p != &game->player[i])
+ drawTurn = 0;
+ drawCycleShadow(gPlayerVisuals + i, game->player + i,
lod, drawTurn);
diff -Nru gltron-0.70final/debian/patches/series
gltron-0.70final/debian/patches/series
--- gltron-0.70final/debian/patches/series 2013-08-18 02:31:30.000000000
+0000
+++ gltron-0.70final/debian/patches/series 2015-07-09 11:44:40.000000000
+0000
@@ -8,3 +8,4 @@
fix-clang-build.patch
fix-prototypes.patch
automake-error.patch
+gcc5.diff
diff -Nru gltron-0.70final/debian/rules gltron-0.70final/debian/rules
--- gltron-0.70final/debian/rules 2013-08-18 03:14:43.000000000 +0000
+++ gltron-0.70final/debian/rules 2015-07-09 11:52:21.000000000 +0000
@@ -31,7 +31,8 @@
--build=$(DEB_BUILD_GNU_TYPE) \
--prefix=/usr --bindir=\$${prefix}/games \
--datadir=\$${prefix}/share/games
--mandir=\$${prefix}/share/man \
- --infodir=\$${prefix}/share/info --enable-network
+ --infodir=\$${prefix}/share/info --enable-network \
+ $(shell dpkg-vendor --derives-from Ubuntu && echo
--enable-warn=no)
build: build-stamp
@@ -66,6 +67,7 @@
#fix bad perms upstream
cp debian/gltron.xpm $(CURDIR)/debian/gltron/usr/share/pixmaps/
+ cp debian/gltron.desktop $(CURDIR)/debian/gltron/usr/share/applications/
# Build architecture-independent files here.
binary-indep: build install
@@ -75,15 +77,9 @@
binary-arch: build install
dh_testdir
dh_testroot
-# dh_installdebconf
dh_installdocs
dh_installexamples
dh_installmenu
-# dh_installlogrotate
-# dh_installemacsen
-# dh_installpam
-# dh_installmime
-# dh_installinit
dh_installcron
dh_installman debian/gltron.6
dh_installchangelogs ChangeLog
@@ -91,9 +87,7 @@
dh_strip
dh_compress
dh_fixperms
-# dh_makeshlibs
dh_installdeb
-# dh_perl
dh_shlibdeps
dh_gencontrol
dh_md5sums
