r15561 - in software/ui: debian libxdgutils src

Markus Koschany apo-guest at moszumanska.debian.org
Wed Oct 28 13:05:31 UTC 2015 

Author: apo-guest
Date: 2015-10-28 13:05:31 +0000 (Wed, 28 Oct 2015)
New Revision: 15561

Modified:
   software/ui/debian/changelog
   software/ui/debian/compat
   software/ui/debian/control
   software/ui/debian/copyright
   software/ui/debian/goadmin.desktop
   software/ui/debian/golearn.desktop
   software/ui/debian/gonet.desktop
   software/ui/debian/gooffice.desktop
   software/ui/debian/goplay.desktop
   software/ui/debian/gosafe.desktop
   software/ui/debian/goscience.desktop
   software/ui/debian/goweb.desktop
   software/ui/libxdgutils/XDGDesktopEntry.cpp
   software/ui/src/Engine.cpp
   software/ui/src/goplay.cpp
Log:
Fix FTBFS with GCC 5

Switch to compat level 9
Use canonical Vcs-URI
Use copyright format 1.0
Add keywords to desktop files



Modified: software/ui/debian/changelog
===================================================================
--- software/ui/debian/changelog	2015-10-27 21:14:15 UTC (rev 15560)
+++ software/ui/debian/changelog	2015-10-28 13:05:31 UTC (rev 15561)
@@ -1,3 +1,16 @@
+goplay (0.9.1) unstable; urgency=medium
+
+  * Team upload.
+  * Fix build error with GCC 5. (Closes: #777888).
+    Thanks to Matthias Klose, Martin Pitt, Greg Pearson and gregor herrmann
+    for the report, testing and the patch.
+  * Add keywords to desktop files.
+  * Use canonical Vcs-URI.
+  * Use copyright format 1.0.
+  * Change to compat level 9 and require debhelper >= 9.
+
+ -- Markus Koschany <apo at gambaru.de>  Wed, 28 Oct 2015 13:34:06 +0100
+
 goplay (0.9) unstable; urgency=low
 
   * Update Standards-Version from 3.9.4 to 3.9.6.

Modified: software/ui/debian/compat
===================================================================
--- software/ui/debian/compat	2015-10-27 21:14:15 UTC (rev 15560)
+++ software/ui/debian/compat	2015-10-28 13:05:31 UTC (rev 15561)
@@ -1 +1 @@
-8
+9

Modified: software/ui/debian/control
===================================================================
--- software/ui/debian/control	2015-10-27 21:14:15 UTC (rev 15560)
+++ software/ui/debian/control	2015-10-28 13:05:31 UTC (rev 15561)
@@ -1,18 +1,18 @@
 Source: goplay
 Section: admin
 Priority: extra
-Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org> 
+Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders:
  Miriam Ruiz <miriam at debian.org>,
  Enrico Zini <enrico at debian.org>,
  Petter Reinholdtsen <pere at debian.org>
-Build-Depends: debhelper (>= 8), pkg-config, dh-autoreconf,
+Build-Depends: debhelper (>= 9), pkg-config, dh-autoreconf,
  libept-dev, libwibble-dev, libfltk1.3-dev, libtagcoll2-dev
  ,imagemagick
  ,libcurl4-gnutls-dev
  ,fluid
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-games/software/ui/
-Vcs-Svn: svn://svn.debian.org/pkg-games/software/ui/
+Vcs-Svn: svn://anonscm.debian.org/pkg-games/software/ui/
 Standards-Version: 3.9.6
 
 Package: goplay

Modified: software/ui/debian/copyright
===================================================================
--- software/ui/debian/copyright	2015-10-27 21:14:15 UTC (rev 15560)
+++ software/ui/debian/copyright	2015-10-28 13:05:31 UTC (rev 15561)
@@ -1,4 +1,4 @@
-Format: http://dep.debian.net/deps/dep5
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 
 Files: *
 Copyright:

Modified: software/ui/debian/goadmin.desktop
===================================================================
--- software/ui/debian/goadmin.desktop	2015-10-27 21:14:15 UTC (rev 15560)
+++ software/ui/debian/goadmin.desktop	2015-10-28 13:05:31 UTC (rev 15561)
@@ -7,3 +7,4 @@
 Exec=goadmin
 Terminal=false
 Categories=Utility;
+Keywords=games;gui;browser;package;installation;screenshots;

Modified: software/ui/debian/golearn.desktop
===================================================================
--- software/ui/debian/golearn.desktop	2015-10-27 21:14:15 UTC (rev 15560)
+++ software/ui/debian/golearn.desktop	2015-10-28 13:05:31 UTC (rev 15561)
@@ -7,3 +7,4 @@
 Exec=golearn
 Terminal=false
 Categories=Utility;
+Keywords=games;gui;browser;package;installation;screenshots;

Modified: software/ui/debian/gonet.desktop
===================================================================
--- software/ui/debian/gonet.desktop	2015-10-27 21:14:15 UTC (rev 15560)
+++ software/ui/debian/gonet.desktop	2015-10-28 13:05:31 UTC (rev 15561)
@@ -7,3 +7,4 @@
 Exec=gonet
 Terminal=false
 Categories=Utility;
+Keywords=games;gui;browser;package;installation;screenshots;

Modified: software/ui/debian/gooffice.desktop
===================================================================
--- software/ui/debian/gooffice.desktop	2015-10-27 21:14:15 UTC (rev 15560)
+++ software/ui/debian/gooffice.desktop	2015-10-28 13:05:31 UTC (rev 15561)
@@ -7,3 +7,4 @@
 Exec=gooffice
 Terminal=false
 Categories=Utility;
+Keywords=games;gui;browser;package;installation;screenshots;

Modified: software/ui/debian/goplay.desktop
===================================================================
--- software/ui/debian/goplay.desktop	2015-10-27 21:14:15 UTC (rev 15560)
+++ software/ui/debian/goplay.desktop	2015-10-28 13:05:31 UTC (rev 15561)
@@ -7,3 +7,4 @@
 Exec=goplay
 Terminal=false
 Categories=Utility;
+Keywords=games;gui;browser;package;installation;screenshots;

Modified: software/ui/debian/gosafe.desktop
===================================================================
--- software/ui/debian/gosafe.desktop	2015-10-27 21:14:15 UTC (rev 15560)
+++ software/ui/debian/gosafe.desktop	2015-10-28 13:05:31 UTC (rev 15561)
@@ -7,3 +7,4 @@
 Exec=gosafe
 Terminal=false
 Categories=Utility;
+Keywords=games;gui;browser;package;installation;screenshots;

Modified: software/ui/debian/goscience.desktop
===================================================================
--- software/ui/debian/goscience.desktop	2015-10-27 21:14:15 UTC (rev 15560)
+++ software/ui/debian/goscience.desktop	2015-10-28 13:05:31 UTC (rev 15561)
@@ -7,3 +7,4 @@
 Exec=goscience
 Terminal=false
 Categories=Utility;
+Keywords=games;gui;browser;package;installation;screenshots;

Modified: software/ui/debian/goweb.desktop
===================================================================
--- software/ui/debian/goweb.desktop	2015-10-27 21:14:15 UTC (rev 15560)
+++ software/ui/debian/goweb.desktop	2015-10-28 13:05:31 UTC (rev 15561)
@@ -7,3 +7,4 @@
 Exec=goweb
 Terminal=false
 Categories=Utility;
+Keywords=games;gui;browser;package;installation;screenshots;

Modified: software/ui/libxdgutils/XDGDesktopEntry.cpp
===================================================================
--- software/ui/libxdgutils/XDGDesktopEntry.cpp	2015-10-27 21:14:15 UTC (rev 15560)
+++ software/ui/libxdgutils/XDGDesktopEntry.cpp	2015-10-28 13:05:31 UTC (rev 15561)
@@ -468,7 +468,7 @@
 
     // Now find missing required keys
     for(i = 0; registeredEntries[i].name != NULL; i++) {
-	if (!registeredEntries[i].type & type)
+	if (!(registeredEntries[i].type & type))
 	    continue;
 
 	if (registeredEntries[i].required) {

Modified: software/ui/src/Engine.cpp
===================================================================
--- software/ui/src/Engine.cpp	2015-10-27 21:14:15 UTC (rev 15560)
+++ software/ui/src/Engine.cpp	2015-10-28 13:05:31 UTC (rev 15561)
@@ -366,6 +366,4 @@
 	m_dirty = true;
 }
 
-#include <ept/debtags/debtags.tcc>
-
 // vim:set ts=4 sw=4:

Modified: software/ui/src/goplay.cpp
===================================================================
--- software/ui/src/goplay.cpp	2015-10-27 21:14:15 UTC (rev 15560)
+++ software/ui/src/goplay.cpp	2015-10-28 13:05:31 UTC (rev 15561)
@@ -569,6 +569,4 @@
 }
 #endif
 
-#include <ept/debtags/debtags.tcc>
-
 // vim:set ts=4 sw=4:

More information about the Pkg-games-commits mailing list