[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#768176: marked as done (unblock: pioneers/15.3-1)

Your message dated Sat, 27 Dec 2014 19:31:37 +0100
with message-id <549EFB09.2040502@thykier.net>
and subject line Re: Bug#768176: Bug#765319: marked as done (missing license in debian/copyright)
has caused the Debian Bug report #768176,
regarding unblock: pioneers/15.3-1
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
768176: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=768176
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

Please unblock package pioneers

Bug #765319 (non-free license for artwork) is RC in the current version in
pioneers.  Upstream has contacted the artist and they relicensed it under
CC-BY-SA-4.0.  Upstream has released a new version with this fix.

I asked on IRC if this could get a freeze exception, or if I should backport
the change.  I was told a new upstream version is not a problem, as long as
there aren't other changes in it.

However, I didn't know it also includes whitespace and sorting changes to files
in debian/ and a buffer overflow fix (which is probably not a security issue,
but I didn't investigate), and while changing debian/copyright it was changed
to follow DEP-5.  I'm guessing this is still not a problem?  If it is, I can
either prepare 15.2-2, or downgrade the bug severity to wishlist (the problem
is solved; it is now a documentation issue that the license mentioned in the
package is not accurate).

The debdiff only shows version and sorting differences.  I've attached a
cleaned diff of both upstream trees.

Thanks,
Bas

unblock pioneers/15.3-1

-- System Information:
Debian Release: jessie/sid
  APT prefers unstable
  APT policy: (500, 'unstable')
Architecture: amd64 (x86_64)
Foreign Architectures: mipsel
armhf

Kernel: Linux 3.16-1-amd64 (SMP w/2 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

diff -urp pioneers-15.2/ChangeLog pioneers-15.3/ChangeLog
--- pioneers-15.2/ChangeLog	2014-07-07 13:05:32.000000000 -0400
+++ pioneers-15.3/ChangeLog	2014-10-26 09:49:02.000000000 -0400
@@ -1,3 +1,19 @@
+2014-10-26  Roland Clobus <rclobus@rclobus.nl>
+	* editor/gtk/editor.c: Fixed a read beyond the array size.
+	* NEWS, client/ai/lobbybot.c: Prepare for the release of 15.2.
+
+2014-10-24  Roland Clobus <rclobus@rclobus.nl>
+	* docs/Relicense question about icons from the Gorilla theme.eml:
+	Email about the relicensing of derived work from the Gorilla theme.
+        With many thanks to Jakub Steiner for allowing his work to be
+	relicensed.
+	* client/gtk/data/style-ai.svg, server/gtk/pioneers-server.svg,
+	editor/gtk/pioneers-editor.svg, client/gtk/data/pioneers.svg:
+	Relicensed as CC-BY-SA 4.0
+
+2014-07-07  Roland Clobus <rclobus@rclobus.nl>
+	* configure.ac: Work version is 15.3.
+
 2014-07-07  Roland Clobus <rclobus@rclobus.nl>
 	* Released 15.2.
 
diff -urp pioneers-15.2/client/ai/lobbybot.c pioneers-15.3/client/ai/lobbybot.c
--- pioneers-15.2/client/ai/lobbybot.c	2014-07-07 13:04:31.000000000 -0400
+++ pioneers-15.3/client/ai/lobbybot.c	2014-10-26 09:49:02.000000000 -0400
@@ -129,7 +129,7 @@ static void lobbybot_chat_parser(gint pl
 	if (!strncmp(chat, "/news", 5)) {
 		ai_chat(N_("The last released version of Pioneers is"));
 		/* Update this string when releasing a new version */
-		ai_chat("15.2");
+		ai_chat("15.3");
 		return;
 	}
 }
diff -urp pioneers-15.2/client/gtk/data/pioneers.svg pioneers-15.3/client/gtk/data/pioneers.svg
--- pioneers-15.2/client/gtk/data/pioneers.svg	2013-05-20 14:48:28.000000000 -0400
+++ pioneers-15.3/client/gtk/data/pioneers.svg	2014-10-24 11:36:38.000000000 -0400
@@ -22,9 +22,9 @@
    id="metadata3867"><rdf:RDF><cc:Work
        rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
          rdf:resource="http://purl.org/dc/dcmitype/StillImage"; /><cc:license
-         rdf:resource="http://creativecommons.org/licenses/by-sa/3.0/"; /><dc:title /><dc:creator><cc:Agent><dc:title>Roland Clobus</dc:title></cc:Agent></dc:creator><dc:description>Icon for Pioneers.
+         rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/"; /><dc:title /><dc:creator><cc:Agent><dc:title>Roland Clobus</dc:title></cc:Agent></dc:creator><dc:description>Icon for Pioneers.
 The colours are similar to the colours in the Classic theme.</dc:description></cc:Work><cc:License
-       rdf:about="http://creativecommons.org/licenses/by-sa/3.0/";><cc:permits
+       rdf:about="http://creativecommons.org/licenses/by-sa/4.0/";><cc:permits
          rdf:resource="http://creativecommons.org/ns#Reproduction"; /><cc:permits
          rdf:resource="http://creativecommons.org/ns#Distribution"; /><cc:requires
          rdf:resource="http://creativecommons.org/ns#Notice"; /><cc:requires
@@ -170,4 +170,4 @@ The colours are similar to the colours i
      style="font-size:6.86722279px;font-weight:normal;stroke-width:1;font-family:FreeSans"
      id="text633-1"><tspan
        id="tspan634-5">9</tspan></text>
-</g></svg>
\ No newline at end of file
+</g></svg>
diff -urp pioneers-15.2/client/gtk/data/style-ai.svg pioneers-15.3/client/gtk/data/style-ai.svg
--- pioneers-15.2/client/gtk/data/style-ai.svg	2013-06-07 07:03:48.000000000 -0400
+++ pioneers-15.3/client/gtk/data/style-ai.svg	2014-10-24 11:36:38.000000000 -0400
@@ -19,40 +19,17 @@
    height="48.000000px"
    width="48.000000px"
    version="1.1"><metadata
-   id="metadata22510">
-  <rdf:RDF>
-    <cc:Work
-   rdf:about="">
-      <dc:format>image/svg+xml</dc:format>
-      <dc:type
-   rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
-      <dc:title></dc:title>
-      <dc:creator>
-        <cc:Agent>
-          <dc:title>Jakub Steiner</dc:title>
-        </cc:Agent>
-      </dc:creator>
-      <cc:license
-   rdf:resource="http://creativecommons.org/licenses/by-sa/2.5/"; />
-      <dc:subject>
-        <rdf:Bag>
-          <rdf:li>workstation</rdf:li>
-          <rdf:li>desktop</rdf:li>
-          <rdf:li>computer</rdf:li>
-        </rdf:Bag>
-      </dc:subject>
-      <dc:source>http://jimmac.musichall.cz</dc:source>
-    <dc:description>The is computer.svg from the Gorilla theme. The contents is modified by Roland Clobus, to make use of the chromakey feature in Pioneers.</dc:description></cc:Work>
-    
-  <cc:License
-   rdf:about="http://creativecommons.org/licenses/by-sa/2.5/";><cc:permits
-     rdf:resource="http://web.resource.org/cc/Reproduction"; /><cc:permits
-     rdf:resource="http://web.resource.org/cc/Distribution"; /><cc:requires
-     rdf:resource="http://web.resource.org/cc/Notice"; /><cc:requires
-     rdf:resource="http://web.resource.org/cc/Attribution"; /><cc:permits
-     rdf:resource="http://web.resource.org/cc/DerivativeWorks"; /><cc:requires
-     rdf:resource="http://web.resource.org/cc/ShareAlike"; /></cc:License></rdf:RDF>
-</metadata>
+   id="metadata22510"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage"; /><cc:license
+         rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/"; /><dc:title /><dc:creator><cc:Agent><dc:title>Roland Clobus</dc:title></cc:Agent></dc:creator><dc:description>Icon for the computer player in Pioneers.</dc:description><dc:contributor><cc:Agent><dc:title>The computer is taken from the image 'computer.svg' from the GNOME icon theme 'Gorilla' (https://download.gnome.org/teams/art.gnome.org/themes/icon/ICON-Gorilla.tar.bz2) which is created by Jakub Steiner and relicensed to CC-BY-SA 4.0.</dc:title></cc:Agent></dc:contributor></cc:Work><cc:License
+       rdf:about="http://creativecommons.org/licenses/by-sa/4.0/";><cc:permits
+         rdf:resource="http://creativecommons.org/ns#Reproduction"; /><cc:permits
+         rdf:resource="http://creativecommons.org/ns#Distribution"; /><cc:requires
+         rdf:resource="http://creativecommons.org/ns#Notice"; /><cc:requires
+         rdf:resource="http://creativecommons.org/ns#Attribution"; /><cc:permits
+         rdf:resource="http://creativecommons.org/ns#DerivativeWorks"; /><cc:requires
+         rdf:resource="http://creativecommons.org/ns#ShareAlike"; /></cc:License></rdf:RDF></metadata>
 <defs
    id="defs22508"><radialGradient
      id="aigrd18"
@@ -1495,4 +1472,4 @@
 </g>
 
 	
-</svg>
\ No newline at end of file
+</svg>
diff -urp pioneers-15.2/configure.ac pioneers-15.3/configure.ac
--- pioneers-15.2/configure.ac	2014-05-11 07:12:26.000000000 -0400
+++ pioneers-15.3/configure.ac	2014-07-07 13:07:35.000000000 -0400
@@ -20,7 +20,7 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 AC_PREREQ([2.68])
-AC_INIT([pioneers],[15.2],[pio-develop@lists.sourceforge.net])
+AC_INIT([pioneers],[15.3],[pio-develop@lists.sourceforge.net])
 AC_CONFIG_AUX_DIR([.])
 AM_INIT_AUTOMAKE
 AC_CONFIG_SRCDIR([client])
diff -urp pioneers-15.2/debian/changelog pioneers-15.3/debian/changelog
--- pioneers-15.2/debian/changelog	2014-10-13 11:17:04.000000000 -0400
+++ pioneers-15.3/debian/changelog	2014-10-26 10:30:45.000000000 -0400
@@ -1,3 +1,12 @@
+pioneers (15.3-1) unstable; urgency=medium
+
+  * New upstream release.
+  * Updated copyright which clarifies the license for the images.
+    (closes: #765319)
+  * Applied 'wrap-and-sort' to all debian/* files.
+
+ -- Roland Clobus <rclobus@rclobus.nl>  Sun, 26 Oct 2014 15:30:00 +0100
+
 pioneers (15.2-1) unstable; urgency=medium
 
   * New upstream release.
diff -urp pioneers-15.2/debian/control pioneers-15.3/debian/control
--- pioneers-15.2/debian/control	2014-10-13 10:22:16.000000000 -0400
+++ pioneers-15.3/debian/control	2014-10-26 09:40:35.000000000 -0400
@@ -3,7 +3,23 @@ Section: games
 Priority: optional
 Maintainer: Roland Clobus <rclobus@rclobus.nl>
 Uploaders: Bas Wijnen <wijnen@debian.org>, Steve Langasek <vorlon@debian.org>
-Build-Depends: debhelper (>= 9), libgnome2-dev, scrollkeeper, gnome-common, librsvg2-bin, netpbm, libgtk-3-dev, automake, autoconf, po-debconf, intltool, libtool, libavahi-glib-dev, libavahi-client-dev, gob2, libnotify-dev, xfonts-scalable
+Build-Depends: autoconf,
+               automake,
+               debhelper (>= 9),
+               gnome-common,
+               gob2,
+               intltool,
+               libavahi-client-dev,
+               libavahi-glib-dev,
+               libgnome2-dev,
+               libgtk-3-dev,
+               libnotify-dev,
+               librsvg2-bin,
+               libtool,
+               netpbm,
+               po-debconf,
+               scrollkeeper,
+               xfonts-scalable
 Standards-Version: 3.9.6
 Homepage: http://pio.sourceforge.net/
 Vcs-Svn: svn://svn.code.sf.net/p/pio/code/trunk/pioneers
@@ -11,8 +27,12 @@ Vcs-Browser: https://sourceforge.net/p/p
 
 Package: pioneers
 Architecture: any
-Depends: pioneers-console (=${binary:Version}), pioneers-data (=${source:Version}), librsvg2-common, ${shlibs:Depends}, ${misc:Depends}
-Recommends: yelp, beep
+Depends: librsvg2-common,
+         pioneers-console (=${binary:Version}),
+         pioneers-data (=${source:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
+Recommends: beep, yelp
 Suggests: pioneers-metaserver
 Description: Settlers of Catan board game
  Pioneers is a computer implementation of the Settlers of Catan board game.
@@ -23,7 +43,9 @@ Description: Settlers of Catan board gam
 
 Package: pioneers-console
 Architecture: any
-Depends: pioneers-console-data (=${source:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: pioneers-console-data (=${source:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
 Suggests: pioneers
 Description: Settlers of Catan board game - console parts
  Pioneers is a computer implementation of the Settlers of Catan board game.
@@ -34,7 +56,7 @@ Description: Settlers of Catan board gam
 
 Package: pioneers-meta-server
 Architecture: all
-Depends: ${misc:Depends}, pioneers-metaserver (>= 14.2-1~)
+Depends: pioneers-metaserver (>= 14.2-1~), ${misc:Depends}
 Description: Transitional dummy package to pioneers-metaserver
  Pioneers is a computer implementation of the Settlers of Catan board game.
  It can be played over the internet.
@@ -46,7 +68,10 @@ Package: pioneers-metaserver
 Replaces: pioneers-meta-server (<< 14.2-1~)
 Breaks: pioneers-meta-server (<< 14.2-1~)
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, lsb-base, initscripts (>= 2.88dsf-13.3)
+Depends: initscripts (>= 2.88dsf-13.3),
+         lsb-base,
+         ${misc:Depends},
+         ${shlibs:Depends}
 Description: Settlers of Catan board game - metaserver
  Pioneers is a computer implementation of the Settlers of Catan board game.
  It can be played over the internet.
diff -urp pioneers-15.2/debian/copyright pioneers-15.3/debian/copyright
--- pioneers-15.2/debian/copyright	2012-11-01 07:41:15.000000000 -0400
+++ pioneers-15.3/debian/copyright	2014-10-26 10:45:28.000000000 -0400
@@ -1,53 +1,112 @@
-This package was first debianized by Dave Cole dave@dccs.com.au on
-Sat,  8 May 1999 20:35:36 +1000.
-
-It was downloaded from 
-  http://sourceforge.net/projects/pio/files/
-
-Although the debian packaging is not in the release tarball, it is part of the
-upstream source, and is covered by the same license.  Copyright holders of the
-packaging are:
-Dave Cole
-Andy Heroff
-Jeff Breidenbach
-Bas Wijnen
-Roland Clobus
-
-This software is copyright (c) 2000-2012 by:
-Dave Cole <dave@dccs.com.au>
-Andy Heroff <aheroff@mediaone.net>
-Roman Hodek <roman@hodek.net>
-Dan Egnor <egnor@ofb.net>
-Steve Langasek <vorlon@dodds.net>
-Bibek Sahu <scorpio@dodds.net>
-Roderick Schertler <roderick@argon.org>
-Jeff Breidenbach <jab@debian.org>
-David Fallon <davef@tetsubo.com>
-Matt Waggoner <matt@waggoner.com>
-Geoff Hanson <gwhizz@usa.net>
-Bas Wijnen <shevek@fmf.nl>
-Roland Clobus <rclobus@bigfoot.com>
-Brian Wellington <bwelling@xbill.org>
-
-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 2 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, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
-
-On Debian systems, the complete text of the GNU General Public
-License can be found in the following files:
-Version 2: /usr/share/common-licenses/GPL-2
-Version 3: /usr/share/common-licenses/GPL-3
-
-Note that you can choose any version later than 3 as well once they are
-released.  The above links are only provided for your convenience, not to
-suggest an complete list.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: Pioneers
+Upstream-Contact: Roland Clobus <rclobus@rclobus.nl>
+Source: https://sourceforge.net/projects/pio/files/
+
+Files: *
+Copyright: 2000-2014 by the following authors
+ Dave Cole <dave@dccs.com.au>
+ Andy Heroff <aheroff@mediaone.net>
+ Roman Hodek <roman@hodek.net>
+ Dan Egnor <egnor@ofb.net>
+ Steve Langasek <vorlon@dodds.net>
+ Bibek Sahu <scorpio@dodds.net>
+ Roderick Schertler <roderick@argon.org>
+ Jeff Breidenbach <jab@debian.org>
+ David Fallon <davef@tetsubo.com>
+ Matt Waggoner <matt@waggoner.com>
+ Geoff Hanson <gwhizz@usa.net>
+ Bas Wijnen <shevek@fmf.nl>
+ Roland Clobus <rclobus@rclobus.nl>
+ Brian Wellington <bwelling@xbill.org>
+License: GPL-2+
+ 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 2 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 package; if not, write to the Free
+ Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ Boston, MA  02110-1301 USA
+ .
+ On Debian systems, the full text of the GNU General Public
+ License version 2 can be found in the file
+ `/usr/share/common-licenses/GPL-2'.
+
+Files: debian/*
+Comment:
+ This package was first debianized by Dave Cole dave@dccs.com.au on
+ 1999-05-08T20:35:36+1000.
+ .
+ Although the debian packaging is not in the release tarball, it is part of the
+ upstream source, and is covered by the same license.
+Copyright: The copyright holders of the packaging are:
+ Dave Cole <dave@dccs.com.au>
+ Andy Heroff <aheroff@mediaone.net>
+ Jeff Breidenbach <jab@debian.org>
+ Bas Wijnen <shevek@fmf.nl>
+ Roland Clobus <rclobus@rclobus.nl>
+License: GPL-2+
+ 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 2 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 package; if not, write to the Free
+ Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ Boston, MA  02110-1301 USA
+ .
+ On Debian systems, the full text of the GNU General Public
+ License version 2 can be found in the file
+ `/usr/share/common-licenses/GPL-2'.
+
+Files:
+ client/gtk/data/style-ai.svg
+ editor/gtk/pioneers-editor.svg
+ server/gtk/pioneers-server.svg
+Copyright: Roland Clobus <rclobus@rclobus.nl>
+Comment:
+ It contains artwork (computer and pencil) from the Gorilla theme
+ from the "GNOME Project", http://www.gnome.org, which has been
+ relicensed to CC-BY-SA-4.0.
+License: CC-BY-SA-4.0
+ This work is licenced under the terms of Creative Commons Attribution-Share
+ Alike 4.0 License.
+ .
+ To view a copy of the CC-BY-SA licence, visit
+ http://creativecommons.org/licenses/by-sa/4.0/ or send a letter to Creative
+ Commons, 171 Second Street, Suite 300, San Francisco, California 94105, USA.
+
+Files: client/gtk/data/pioneers.svg
+Copyright: Roland Clobus <rclobus@rclobus.nl>
+License: CC-BY-SA-4.0
+ This desktop icon is licensed under the terms of Creative Commons
+ Attribution-Share Alike 4.0 License.
+ .
+ To view a copy of the CC-BY-SA licence, visit
+ http://creativecommons.org/licenses/by-sa/4.0/ or send a letter to Creative
+ Commons, 171 Second Street, Suite 300, San Francisco, California 94105, USA.
+
+Files: client/gtk/data/themes/ccFlickr/*
+Copyright: Aaron Williamson <aaron@copiesofcopies.org>
+License: CC-BY-SA
+ The images in this theme are licensed under the terms of Creative Commons
+ Attribution-Share Alike License.
+ .
+ See client/gtk/data/themes/ccFlickr/ATTRIB for the details.
diff -urp pioneers-15.2/debian/pioneers-builddep pioneers-15.3/debian/pioneers-builddep
--- pioneers-15.2/debian/pioneers-builddep	2013-10-22 17:06:27.000000000 -0400
+++ pioneers-15.3/debian/pioneers-builddep	2014-10-26 10:29:55.000000000 -0400
@@ -8,10 +8,10 @@
 Section: misc
 Priority: optional
 # Homepage: <enter URL here; no default>
-Standards-Version: 3.9.4
+Standards-Version: 3.9.6
 
 Package: pioneers-builddep
-Version: 15.1-1
+Version: 15.3-1
 Maintainer: Roland Clobus <rclobus@rclobus.nl>
 # Suggests: <comma-separated list of packages>
 # Provides: <comma-separated list of packages>
diff -urp pioneers-15.2/debian/pioneers-console-data.install pioneers-15.3/debian/pioneers-console-data.install
--- pioneers-15.2/debian/pioneers-console-data.install	2007-11-08 06:07:38.000000000 -0500
+++ pioneers-15.3/debian/pioneers-console-data.install	2014-10-26 09:40:35.000000000 -0400
@@ -1,3 +1,3 @@
-debian/tmp/usr/share/locale
 debian/tmp/usr/share/games/pioneers/*.game
 debian/tmp/usr/share/games/pioneers/computer_names
+debian/tmp/usr/share/locale
diff -urp pioneers-15.2/debian/pioneers-console.install pioneers-15.3/debian/pioneers-console.install
--- pioneers-15.2/debian/pioneers-console.install	2010-03-18 05:04:30.000000000 -0400
+++ pioneers-15.3/debian/pioneers-console.install	2014-10-26 09:40:35.000000000 -0400
@@ -1,2 +1,2 @@
-debian/tmp/usr/games/pioneersai
 debian/tmp/usr/games/pioneers-server-console
+debian/tmp/usr/games/pioneersai
diff -urp pioneers-15.2/debian/pioneers-data.install pioneers-15.3/debian/pioneers-data.install
--- pioneers-15.2/debian/pioneers-data.install	2012-02-09 02:23:02.000000000 -0500
+++ pioneers-15.3/debian/pioneers-data.install	2014-10-26 09:40:35.000000000 -0400
@@ -1,8 +1,8 @@
 debian/tmp/usr/share/games/pioneers/themes
 debian/tmp/usr/share/gnome/help/pioneers
+debian/tmp/usr/share/icons/hicolor
 debian/tmp/usr/share/omf/pioneers
 debian/tmp/usr/share/pixmaps/pioneers
 debian/tmp/usr/share/pixmaps/pioneers-editor.png
 debian/tmp/usr/share/pixmaps/pioneers-server.png
 debian/tmp/usr/share/pixmaps/pioneers.png
-debian/tmp/usr/share/icons/hicolor
diff -urp pioneers-15.2/debian/pioneers.install pioneers-15.3/debian/pioneers.install
--- pioneers-15.2/debian/pioneers.install	2007-11-08 06:07:38.000000000 -0500
+++ pioneers-15.3/debian/pioneers.install	2014-10-26 09:40:35.000000000 -0400
@@ -1,9 +1,9 @@
 debian/tmp/usr/games/pioneers
-debian/tmp/usr/games/pioneers-server-gtk
 debian/tmp/usr/games/pioneers-editor
-debian/tmp/usr/share/pixmaps/pioneers-client.xpm
-debian/tmp/usr/share/pixmaps/pioneers-server.xpm
-debian/tmp/usr/share/pixmaps/pioneers-editor.xpm
+debian/tmp/usr/games/pioneers-server-gtk
 debian/tmp/usr/share/applications/pioneers-editor.desktop
 debian/tmp/usr/share/applications/pioneers-server.desktop
 debian/tmp/usr/share/applications/pioneers.desktop
+debian/tmp/usr/share/pixmaps/pioneers-client.xpm
+debian/tmp/usr/share/pixmaps/pioneers-editor.xpm
+debian/tmp/usr/share/pixmaps/pioneers-server.xpm
diff -urp pioneers-15.2/editor/gtk/editor.c pioneers-15.3/editor/gtk/editor.c
--- pioneers-15.2/editor/gtk/editor.c	2014-03-09 11:40:37.000000000 -0400
+++ pioneers-15.3/editor/gtk/editor.c	2014-10-26 09:47:15.000000000 -0400
@@ -1201,8 +1201,10 @@ static GtkWidget *build_port_menu(void)
 				 G_CALLBACK(select_port_resource_cb),
 				 GINT_TO_POINTER(i));
 
+		if (i >= NO_RESOURCE)
+			continue;
 		pixbuf = theme->port_tiles[i];
-		if (i >= NO_RESOURCE || pixbuf == NULL)
+		if (pixbuf == NULL)
 			continue;
 
 		image = gtk_image_new_from_pixbuf(pixbuf);
diff -urp pioneers-15.2/editor/gtk/pioneers-editor.svg pioneers-15.3/editor/gtk/pioneers-editor.svg
--- pioneers-15.2/editor/gtk/pioneers-editor.svg	2013-05-20 14:48:28.000000000 -0400
+++ pioneers-15.3/editor/gtk/pioneers-editor.svg	2014-10-24 11:36:38.000000000 -0400
@@ -22,9 +22,9 @@
    id="metadata36"><rdf:RDF><cc:Work
        rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
          rdf:resource="http://purl.org/dc/dcmitype/StillImage"; /><dc:title /><cc:license
-         rdf:resource="http://creativecommons.org/licenses/by-sa/3.0/"; /><dc:creator><cc:Agent><dc:title>Roland Clobus</dc:title></cc:Agent></dc:creator><dc:contributor><cc:Agent><dc:title>The pencil is taken from the image 'edit-find-replace.svg' from the GNOME icon theme 'Gorilla' (http://art.gnome.org/themes/icon/1297) which is created by Jakub Steiner (CC-BY-SA). </dc:title></cc:Agent></dc:contributor><dc:description>Icon for the Pioneers editor.
+         rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/"; /><dc:creator><cc:Agent><dc:title>Roland Clobus</dc:title></cc:Agent></dc:creator><dc:contributor><cc:Agent><dc:title>The pencil is taken from the image 'edit-find-replace.svg' from the GNOME icon theme 'Gorilla' (https://download.gnome.org/teams/art.gnome.org/themes/icon/ICON-Gorilla.tar.bz2) which is created by Jakub Steiner and relicensed to CC-BY-SA 4.0.</dc:title></cc:Agent></dc:contributor><dc:description>Icon for the Pioneers editor.
 The colours are similar to the colours in the Classic theme.</dc:description></cc:Work><cc:License
-       rdf:about="http://creativecommons.org/licenses/by-sa/3.0/";><cc:permits
+       rdf:about="http://creativecommons.org/licenses/by-sa/4.0/";><cc:permits
          rdf:resource="http://creativecommons.org/ns#Reproduction"; /><cc:permits
          rdf:resource="http://creativecommons.org/ns#Distribution"; /><cc:requires
          rdf:resource="http://creativecommons.org/ns#Notice"; /><cc:requires
@@ -194,4 +194,4 @@ The colours are similar to the colours i
      inkscape:connector-curvature="0"
      d="m 8.9,7.9 c 0,0.9 -0.5,1.4 -1.4,1.4 l -1.1,-2.7 2.5,1.3 0,0 z"
      style="fill:url(#linearGradient4318);stroke:none"
-     id="path808" /></g></svg>
\ No newline at end of file
+     id="path808" /></g></svg>
diff -urp pioneers-15.2/NEWS pioneers-15.3/NEWS
--- pioneers-15.2/NEWS	2014-07-07 13:04:31.000000000 -0400
+++ pioneers-15.3/NEWS	2014-10-26 09:49:02.000000000 -0400
@@ -1,3 +1,7 @@
+Subversion release 15.3
+
+* Relicense of the desktop icons to CC-BY-SA-4.0
+
 Subversion release 15.2
 
 * Ported from GTK+2 to GTK+3
diff -urp pioneers-15.2/server/gtk/pioneers-server.svg pioneers-15.3/server/gtk/pioneers-server.svg
--- pioneers-15.2/server/gtk/pioneers-server.svg	2013-05-20 14:48:28.000000000 -0400
+++ pioneers-15.3/server/gtk/pioneers-server.svg	2014-10-24 11:36:38.000000000 -0400
@@ -22,9 +22,9 @@
    id="metadata4829"><rdf:RDF><cc:Work
        rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
          rdf:resource="http://purl.org/dc/dcmitype/StillImage"; /><cc:license
-         rdf:resource="http://creativecommons.org/licenses/by-sa/3.0/"; /><dc:title /><dc:creator><cc:Agent><dc:title>Roland Clobus</dc:title></cc:Agent></dc:creator><dc:description>Icon for the Pioneers server.
-The colours are similar to the colours in the Classic theme.</dc:description><dc:contributor><cc:Agent><dc:title>The computer is taken from the image 'computer.svg' from the GNOME icon theme 'Gorilla' (http://art.gnome.org/themes/icon/1297) which is created by Jakub Steiner (CC-BY-SA). </dc:title></cc:Agent></dc:contributor></cc:Work><cc:License
-       rdf:about="http://creativecommons.org/licenses/by-sa/3.0/";><cc:permits
+         rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/"; /><dc:title /><dc:creator><cc:Agent><dc:title>Roland Clobus</dc:title></cc:Agent></dc:creator><dc:description>Icon for the Pioneers server.
+The colours are similar to the colours in the Classic theme.</dc:description><dc:contributor><cc:Agent><dc:title>The computer is taken from the image 'computer.svg' from the GNOME icon theme 'Gorilla' (https://download.gnome.org/teams/art.gnome.org/themes/icon/ICON-Gorilla.tar.bz2) which is created by Jakub Steiner and relicensed to CC-BY-SA 4.0.</dc:title></cc:Agent></dc:contributor></cc:Work><cc:License
+       rdf:about="http://creativecommons.org/licenses/by-sa/4.0/";><cc:permits
          rdf:resource="http://creativecommons.org/ns#Reproduction"; /><cc:permits
          rdf:resource="http://creativecommons.org/ns#Distribution"; /><cc:requires
          rdf:resource="http://creativecommons.org/ns#Notice"; /><cc:requires
@@ -1860,4 +1860,4 @@ The colours are similar to the colours i
      id="tspan634-1">9</tspan></text>
 
 
-</g></g></svg>
\ No newline at end of file
+</g></g></svg>

Attachment: signature.asc
Description: Digital signature


--- End Message ---
--- Begin Message --- 
On 2014-12-25 19:41, Bas Wijnen wrote:
> Hi,
> 
> Strictly speaking this doesn't count as "before cristmas", but I've just
> uploaded the new package to testing-proposed-updates.
> 
> Thanks,
> Bas
> 
> [...]

Works for me, approved.

Thanks,
~Niels

--- End Message ---
Reply to: