r15759 - in packages/trunk/gamine/debian: . patches source

Markus Koschany apo at moszumanska.debian.org
Fri Apr 15 10:49:15 UTC 2016


Author: apo
Date: 2016-04-15 10:49:15 +0000 (Fri, 15 Apr 2016)
New Revision: 15759

Added:
   packages/trunk/gamine/debian/patches/desktop-file.patch
   packages/trunk/gamine/debian/patches/hardening.patch
Removed:
   packages/trunk/gamine/debian/gamine.desktop
   packages/trunk/gamine/debian/gamine.manpages
   packages/trunk/gamine/debian/gamine.sgml
   packages/trunk/gamine/debian/gamine.xpm
   packages/trunk/gamine/debian/patches/link-X11.diff
   packages/trunk/gamine/debian/patches/link-libm.patch
   packages/trunk/gamine/debian/patches/makefile-DESTDIR.diff
   packages/trunk/gamine/debian/patches/makefile-flags.patch
   packages/trunk/gamine/debian/patches/preserve_CC_FLAGS.diff
   packages/trunk/gamine/debian/source/local-options
Modified:
   packages/trunk/gamine/debian/changelog
   packages/trunk/gamine/debian/control
   packages/trunk/gamine/debian/copyright
   packages/trunk/gamine/debian/gamine-data.install
   packages/trunk/gamine/debian/gamine.install
   packages/trunk/gamine/debian/patches/series
   packages/trunk/gamine/debian/rules
   packages/trunk/gamine/debian/watch
Log:
Release 1.5-1


Modified: packages/trunk/gamine/debian/changelog
===================================================================
--- packages/trunk/gamine/debian/changelog	2016-04-15 04:43:28 UTC (rev 15758)
+++ packages/trunk/gamine/debian/changelog	2016-04-15 10:49:15 UTC (rev 15759)
@@ -1,14 +1,45 @@
-gamine (1.2-1) experimental; urgency=medium
+gamine (1.5-1) unstable; urgency=medium
 
-  * New upstream release
-    - Switch to Alexey Loginov fork
-    - Use libgtk-3-dev and libgstream1.0-dev
-  * Upload in experimental because of the freeze
-  * Use my @debian email address
-  * Bump du Standard-Version 3.9.6, no change
+  * Team upload.
+  * Acknowledge Moritz Muehlenhoff's NMU. Thank you.
 
- -- Gonéri Le Bouder <goneri at debian.org>  Fri, 19 Dec 2014 23:38:18 +0100
+  [ Gonéri Le Bouder ]
+  * Use my @debian email address.
+  * Switch to Alexey Loginov fork.
+  * Use libgtk-3-dev and libgstreamer1.0-dev.
 
+  [ Markus Koschany ]
+  * Imported Upstream version 1.5. (Closes: #558796)
+    - The game does not crash anymore when screenshots are taken.
+      (Closes: #805580)
+  * Update debian/watch and track new releases at sourceforge.net.
+  * Add get-orig-source target.
+  * wrap-and-sort -sa.
+  * Declare compliance with Debian Policy 3.9.8.
+  * Vcs-Browser: Use https.
+  * Update Homepage field to https://sourceforge.net/projects/gamine-game/.
+  * Drop libgconf2-dev, libx11-dev and libgconf2-dev from Build-Depends.
+  * Drop all patches. They are obsolete now.
+  * Drop source/local-options.
+  * Drop debian/gamine.desktop file and use the upstream one instead.
+  * Build with parallel.
+  * Add build-dependency intltool.
+  * Add hardening.patch and export all hardening build flags.
+  * Drop docbook-to-man build-dependency, remove Debian's man page because it
+    is now part of the upstream tarball.
+  * Remove debian/gamine.xpm. Use upstream's icons.
+  * desktop-file.patch. Add keywords.
+  * Export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed.
+
+ -- Markus Koschany <apo at debian.org>  Fri, 15 Apr 2016 10:47:22 +0200
+
+gamine (1.1-3.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Port to gstreamer 1.0 (Closes: #785832)
+
+ -- Moritz Muehlenhoff <jmm at debian.org>  Sat, 14 Nov 2015 23:56:11 +0100
+
 gamine (1.1-3) unstable; urgency=low
 
   * Add myself to uploaders.

Modified: packages/trunk/gamine/debian/control
===================================================================
--- packages/trunk/gamine/debian/control	2016-04-15 04:43:28 UTC (rev 15758)
+++ packages/trunk/gamine/debian/control	2016-04-15 10:49:15 UTC (rev 15759)
@@ -2,18 +2,26 @@
 Section: games
 Priority: optional
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
-Uploaders: Barry deFreese <bdefreese at debian.org>, 
-           Gonéri Le Bouder <goneri at debian.org>
-Build-Depends: debhelper (>= 9), libgtk-3-dev, libcairo2-dev,
- libgstreamer1.0-dev, docbook-to-man, libgconf2-dev, libx11-dev
-Standards-Version: 3.9.6
+Uploaders:
+ Barry deFreese <bdefreese at debian.org>,
+ Gonéri Le Bouder <goneri at debian.org>
+Build-Depends:
+ debhelper (>= 9),
+ libgstreamer1.0-dev,
+ libgtk-3-dev,
+ intltool
+Standards-Version: 3.9.8
 Vcs-Svn: svn://anonscm.debian.org/pkg-games/packages/trunk/gamine/
-Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-games/packages/trunk/gamine/
-Homepage: https://gitorious.org/gamine
+Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-games/packages/trunk/gamine/
+Homepage: https://sourceforge.net/projects/gamine-game/
 
 Package: gamine
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, gamine-data (= ${source:Version}), gstreamer0.10-plugins-good
+Depends:
+ gamine-data (= ${source:Version}),
+ gstreamer1.0-plugins-good,
+ ${misc:Depends},
+ ${shlibs:Depends}
 Description: Interactive game for young children
  Gamine is a game designed for 2 years old children who are not able to use
  a keyboard.
@@ -22,8 +30,10 @@
 
 Package: gamine-data
 Architecture: all
-Suggests: gamine
-Depends: ${misc:Depends}
+Suggests:
+ gamine
+Depends:
+ ${misc:Depends}
 Description: data files for gamine game
  gamine is a game for young children.
  .

Modified: packages/trunk/gamine/debian/copyright
===================================================================
--- packages/trunk/gamine/debian/copyright	2016-04-15 04:43:28 UTC (rev 15758)
+++ packages/trunk/gamine/debian/copyright	2016-04-15 10:49:15 UTC (rev 15759)
@@ -1,79 +1,55 @@
-This package was debianized by Gonéri Le Bouder on
-Sun, 25 Nov 2007 23:49:49 +0100
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: Gamine
+Source: https://sourceforge.net/projects/gamine-game/
 
-The maintainer is the Debian Games Team:
-http://wiki.debian.org/Games/Development
-The debian files are licensed under gamine license.
-Copyright 2007 The Debian Games Team
+Files: *
+Copyright: Emmanuel Garette <gnunux at gnunux.info>
+           Simon Kågedal Reimer <skagedal at gmail.com>
+           Alex Panin <alex at linuxonly.ru>
+           Alexey Loginov <loginov.alex.valer at gmail.com>
+License: GPL-3+
 
-It was downloaded from https://gitorious.org/gamine
-The former upstream homepage was: http://gnunux.info/projets/gamine/ 
+Files: sounds/*
+Copyright: gcompris: 2004-2007  Bruno Coudoin <bruno.coudoin at free.fr>
+           TUXPAINT: 2002-2004 by Bill Kendrick <bill at newbreedsoftware.com>
+           Project gaim
+License: GPL-2+
 
-Upstream Author: The upstream author for gamine is GARETTE Emmanuel
-Copyright 2007 GARETTE Emmanuel
+Files: sounds/eat.wav
+Copyright: childsplay: 2002-2004 Stas Zytkiewicz
+License: GPL-3
 
-            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
-                    Version 2, December 2004
+Files: sounds/BachJSBrandenburgConcertNo2inFMajorBWV1047mvmt1.ogg
+Copyright: T. Willhoite
+License: public-domain
+ This tune was made from a public domain music score found at Project Gutenberg,
+ Music site: http://gutenberg.net/music/ and http://www.archive.org.
+ The "performance" is by my computer and is released into the public domain. T. Willhoite
 
-   Copyright (C) 2004 Sam Hocevar
-  14 rue de Plaisance, 75014 Paris, France 
+Files: pencil.png
+Copyright: 2006, Giuseppe Benigno <ebengio at gmail.com>
+License: GPL-2+
+Comment:
+ Downloaded from http://www.egregorion.net/works/Chameleon-SkyBlue-0.5.tar.bz2
+ Also available at
+ ftp://ftp.tw.freebsd.org/pub/FreeBSD/distfiles/Chameleon-SkyBlue-0.5.tar.bz2
 
- Everyone is permitted to copy and distribute verbatim or modified
- copies of this license document, and changing it is allowed as long
- as the name is changed.
+Files: debian/*
+Copyright: 2007-2011, Gonéri Le Bouder <goneri at debian.org>
+           2011,      Ansgar Burchardt <ansgar at debian.org>
+           2013,      Barry deFreese <bdefreese at debian.org>
+           2015,      Moritz Muehlenhoff <jmm at debian.org>
+           2016,      Markus Koschany <apo at debian.org>
+License: GPL-3+
 
-            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+License: GPL-3+
+ On Debian systems, the complete text of the GNU General Public License version
+ 3 can be found in `/usr/share/common-licenses/GPL-3'.
 
-  0. You just DO WHAT THE FUCK YOU WANT TO.
+License: GPL-3
+ On Debian systems, the complete text of the GNU General Public License version
+ 3 can be found in `/usr/share/common-licenses/GPL-3'.
 
-The sound directory is covered by these licenses:
-
-BachJSBrandenburgConcertNo2inFMajorBWV1047mvmt1.ogg:
-This tune was made from a public domain music score found at Project Gutenberg,
-Music site: http://gutenberg.net/music/ and http://www.archive.org.
-The "performance" is by my computer and is released into the public domain. T. Willhoite
-
-- from gcompris: tri.ogg plick.ogg
-  Copyright (C) 2004-2007  Bruno Coudoin <bruno.coudoin at free.fr>
-   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.
-
-- from TUXPAINT: bleep.wav brick.wav bubble.wav drip.wav
-               eraser1.wav eraser2.wav flip.wav grow.wav paint1.wav prompt.wav
-               line_end.wav brick.wav tuxok.wav youcannot.wav
-  Copyright (C) 2002-2004 by Bill Kendrick <bill at newbreedsoftware.com>
-   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.
-
-- from gaim: receive.wav
-  Referee to Pidgin copyright file to get the list of the copyright holder
-   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.
-
-- from childsplay: eat.wav
-  Copyright: (c) 2002-2004 Stas Zytkiewicz
-   This program is free software; you can redistribute it and/or modify it under
-   the terms of the GNU General Public License Version 2
-
-- from http://www.egregorion.net/works/Chameleon-SkyBlue-0.5.tar.bz2: pencil.png 
-  Chameleon Xcursor Set version 0.1
-  Copyright (C) 2006  Giuseppe Benigno <ebengio at gmail.com>
-
-    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.
-
-License, version 2, can be found in /usr/share/common-licenses/GPL-2.
+License: GPL-2+
+ On Debian systems, the complete text of the GNU General Public License version
+ 2 can be found in `/usr/share/common-licenses/GPL-2'.

Modified: packages/trunk/gamine/debian/gamine-data.install
===================================================================
--- packages/trunk/gamine/debian/gamine-data.install	2016-04-15 04:43:28 UTC (rev 15758)
+++ packages/trunk/gamine/debian/gamine-data.install	2016-04-15 10:49:15 UTC (rev 15759)
@@ -1 +1 @@
-usr/share/games/gamine
+usr/share

Deleted: packages/trunk/gamine/debian/gamine.desktop
===================================================================
--- packages/trunk/gamine/debian/gamine.desktop	2016-04-15 04:43:28 UTC (rev 15758)
+++ packages/trunk/gamine/debian/gamine.desktop	2016-04-15 10:49:15 UTC (rev 15759)
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Name=Gamine
-Comment= simple interactive game for young children
-Icon=gamine
-Exec=gamine
-Terminal=false
-Type=Application
-Categories=Game;ArcadeGame;

Modified: packages/trunk/gamine/debian/gamine.install
===================================================================
--- packages/trunk/gamine/debian/gamine.install	2016-04-15 04:43:28 UTC (rev 15758)
+++ packages/trunk/gamine/debian/gamine.install	2016-04-15 10:49:15 UTC (rev 15759)
@@ -1,3 +1,4 @@
-debian/gamine.xpm /usr/share/pixmaps
-usr/games
-gamine.conf etc
+etc
+usr/games/gamine
+gamine.xpm              usr/share/pixmaps
+usr/share/applications

Deleted: packages/trunk/gamine/debian/gamine.manpages
===================================================================
--- packages/trunk/gamine/debian/gamine.manpages	2016-04-15 04:43:28 UTC (rev 15758)
+++ packages/trunk/gamine/debian/gamine.manpages	2016-04-15 10:49:15 UTC (rev 15759)
@@ -1 +0,0 @@
-gamine.6

Deleted: packages/trunk/gamine/debian/gamine.sgml
===================================================================
--- packages/trunk/gamine/debian/gamine.sgml	2016-04-15 04:43:28 UTC (rev 15758)
+++ packages/trunk/gamine/debian/gamine.sgml	2016-04-15 10:49:15 UTC (rev 15759)
@@ -1,91 +0,0 @@
-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
-
-<!ENTITY dhfirstname "<firstname>Goneri</firstname>">
-<!ENTITY dhsurname   "<surname>Le Bouder</surname>">
-<!ENTITY dhdate      "<date>Mon, 26 Nov 2007 00:19:51 +0100</date>">
-<!ENTITY dhsection   "<manvolnum>6</manvolnum>">
-<!ENTITY dhemail     "<email>goneri at rulezlan.org</email>">
-<!ENTITY dhusername  "Goneri Le Bouder">
-<!ENTITY dhucpackage "<refentrytitle>gamine</refentrytitle>">
-<!ENTITY dhpackage   "gamine">
-
-<!ENTITY debian      "<productname>Debian</productname>">
-<!ENTITY gnu         "<acronym>GNU</acronym>">
-<!ENTITY gpl         "&gnu; <acronym>GPL</acronym>">
-]>
-
-<refentry>
-    <refentryinfo>
-        <address>
-            &dhemail;
-        </address>
-        <author>
-            &dhfirstname;
-            &dhsurname;
-        </author>
-        <copyright>
-            <year>2007</year>
-            <holder>&dhusername;</holder>
-        </copyright>
-        &dhdate;
-    </refentryinfo>
-    <refmeta>
-        &dhucpackage;
-
-        &dhsection;
-    </refmeta>
-    <refnamediv>
-        <refname>&dhpackage;</refname>
-
-	<refpurpose>a simple game for young children</refpurpose>
-    </refnamediv>
-    <refsynopsisdiv>
-        <cmdsynopsis>
-            <command>&dhpackage;</command>
-
-        </cmdsynopsis>
-    </refsynopsisdiv>
-    <refsect1>
-        <title>DESCRIPTION</title>
-
-        <para>This manual page documents briefly the
-            <command>&dhpackage;</command> and program.</para>
-
-        <para> Gamine is a game designed for 2 years old children but is suitable for
-            older. The player uses it's mouse to draw colored dot and line on the screen.
-        </para>
-
-        <para>This manual page was written for the &debian; distribution
-            because the original program does not have a manual page.</para>
-
-
-    </refsect1>
-    <refsect1>
-        <title>OPTION</title>
-
-        <para>The <command>gamine</command> command accept no special parameter.
-        </para>
-
-
-    </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:2
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:nil
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->
-
-

Deleted: packages/trunk/gamine/debian/gamine.xpm
===================================================================
--- packages/trunk/gamine/debian/gamine.xpm	2016-04-15 04:43:28 UTC (rev 15758)
+++ packages/trunk/gamine/debian/gamine.xpm	2016-04-15 10:49:15 UTC (rev 15759)
@@ -1,318 +0,0 @@
-/* XPM */
-static char * gamine_xpm[] = {
-"32 32 283 2",
-"  	c None",
-". 	c #050402",
-"+ 	c #514328",
-"@ 	c #846D42",
-"# 	c #927949",
-"$ 	c #8E7647",
-"% 	c #836C41",
-"& 	c #76623B",
-"* 	c #6E5B37",
-"= 	c #312919",
-"- 	c #5C4C2E",
-"; 	c #413520",
-"> 	c #AB8D55",
-", 	c #DDB76E",
-"' 	c #DFB86F",
-") 	c #AF9157",
-"! 	c #9D824E",
-"~ 	c #BC9B5E",
-"{ 	c #EBC275",
-"] 	c #C7A563",
-"^ 	c #5F4F2F",
-"/ 	c #BF9E5F",
-"( 	c #EAC174",
-"_ 	c #4D3F26",
-": 	c #E7BF73",
-"< 	c #E6BE72",
-"[ 	c #CAA765",
-"} 	c #D6B16B",
-"| 	c #E8BF73",
-"1 	c #E5BD72",
-"2 	c #EAC275",
-"3 	c #BA9A5D",
-"4 	c #CFAB67",
-"5 	c #C6A462",
-"6 	c #D2AD68",
-"7 	c #E9C074",
-"8 	c #4E4027",
-"9 	c #917748",
-"0 	c #725E39",
-"a 	c #685D32",
-"b 	c #7B6F3B",
-"c 	c #917E46",
-"d 	c #BA9F5B",
-"e 	c #887A41",
-"f 	c #6E6335",
-"g 	c #605030",
-"h 	c #7A653D",
-"i 	c #725E38",
-"j 	c #826D40",
-"k 	c #948547",
-"l 	c #958648",
-"m 	c #CDAD65",
-"n 	c #CBAA64",
-"o 	c #968648",
-"p 	c #736139",
-"q 	c #6D5A36",
-"r 	c #302718",
-"s 	c #E1BA70",
-"t 	c #D6B16A",
-"u 	c #BEA05E",
-"v 	c #987F4B",
-"w 	c #E0B96F",
-"x 	c #A0864F",
-"y 	c #B19856",
-"z 	c #CEAB67",
-"A 	c #D0AB67",
-"B 	c #E4BC71",
-"C 	c #C2A161",
-"D 	c #A08450",
-"E 	c #352C1A",
-"F 	c #493D25",
-"G 	c #8D7446",
-"H 	c #D3AE69",
-"I 	c #625131",
-"J 	c #4F4127",
-"K 	c #A38651",
-"L 	c #58492C",
-"M 	c #B8985C",
-"N 	c #E2BA70",
-"O 	c #8B7245",
-"P 	c #DBB56D",
-"Q 	c #DCB56D",
-"R 	c #715D38",
-"S 	c #AA8D55",
-"T 	c #D5B06A",
-"U 	c #070603",
-"V 	c #CBA765",
-"W 	c #715E39",
-"X 	c #292114",
-"Y 	c #B8985B",
-"Z 	c #E6BE73",
-"` 	c #BB9A5D",
-" .	c #DAB46D",
-"..	c #59492C",
-"+.	c #665433",
-"@.	c #CCA966",
-"#.	c #B5965A",
-"$.	c #907748",
-"%.	c #17130B",
-"&.	c #E4BC72",
-"*.	c #5D4D2E",
-"=.	c #3C321E",
-"-.	c #C7A463",
-";.	c #EAC175",
-">.	c #E4BD72",
-",.	c #B5955A",
-"'.	c #9F844F",
-").	c #C4A262",
-"!.	c #E8C074",
-"~.	c #C09E60",
-"{.	c #6F5C37",
-"].	c #B49459",
-"^.	c #C6A463",
-"/.	c #433721",
-"(.	c #DCB66E",
-"_.	c #CDAA66",
-":.	c #7F6B3F",
-"<.	c #524828",
-"[.	c #8B7D43",
-"}.	c #887941",
-"|.	c #C0A15F",
-"1.	c #E3BC71",
-"2.	c #493C24",
-"3.	c #DDB66E",
-"4.	c #AC8E56",
-"5.	c #5A4B2D",
-"6.	c #CEAA67",
-"7.	c #79643C",
-"8.	c #C9A664",
-"9.	c #E2BC70",
-"0.	c #9B8A4B",
-"a.	c #7A6E3B",
-"b.	c #514927",
-"c.	c #7C703C",
-"d.	c #8C7E43",
-"e.	c #D0AE67",
-"f.	c #B9995C",
-"g.	c #0D0A06",
-"h.	c #C4A261",
-"i.	c #E2BB70",
-"j.	c #B79D59",
-"k.	c #918245",
-"l.	c #3F391E",
-"m.	c #82753F",
-"n.	c #9A844B",
-"o.	c #E2BB71",
-"p.	c #AD8F56",
-"q.	c #2C2416",
-"r.	c #6E5A36",
-"s.	c #CDA966",
-"t.	c #D6B36A",
-"u.	c #B19A57",
-"v.	c #988849",
-"w.	c #81743E",
-"x.	c #8A7C42",
-"y.	c #675D32",
-"z.	c #977D4B",
-"A.	c #020101",
-"B.	c #131009",
-"C.	c #D9B36C",
-"D.	c #CEAA66",
-"E.	c #9F834F",
-"F.	c #907A47",
-"G.	c #77653A",
-"H.	c #726038",
-"I.	c #9B804D",
-"J.	c #E9C174",
-"K.	c #685634",
-"L.	c #9A7E4C",
-"M.	c #937243",
-"N.	c #DBB36C",
-"O.	c #C59F5F",
-"P.	c #644527",
-"Q.	c #564025",
-"R.	c #856E42",
-"S.	c #C09E5F",
-"T.	c #010100",
-"U.	c #927848",
-"V.	c #7B643C",
-"W.	c #A02703",
-"X.	c #CC3204",
-"Y.	c #CD4413",
-"Z.	c #CC390A",
-"`.	c #CD3204",
-" +	c #9B2603",
-".+	c #5E4D2F",
-"++	c #695734",
-"@+	c #040302",
-"#+	c #120F09",
-"$+	c #BE9D5E",
-"%+	c #7F683F",
-"&+	c #9D2603",
-"*+	c #8C2404",
-"=+	c #BB9B5D",
-"-+	c #CCA865",
-";+	c #251E12",
-">+	c #2E2617",
-",+	c #4B331C",
-"'+	c #CB3204",
-")+	c #986134",
-"!+	c #272114",
-"~+	c #876F43",
-"{+	c #8D6F42",
-"]+	c #99320E",
-"^+	c #BC4F1F",
-"/+	c #DEB76F",
-"(+	c #5E4E2F",
-"_+	c #524429",
-":+	c #272013",
-"<+	c #0A0805",
-"[+	c #A28651",
-"}+	c #E0B970",
-"|+	c #E3BB71",
-"1+	c #D98A4A",
-"2+	c #E8B56B",
-"3+	c #DAB46C",
-"4+	c #BD9C5E",
-"5+	c #5F4E2F",
-"6+	c #0C0A06",
-"7+	c #57482B",
-"8+	c #E0BA6F",
-"9+	c #E6BF73",
-"0+	c #8A7245",
-"a+	c #645332",
-"b+	c #2D2516",
-"c+	c #655432",
-"d+	c #716636",
-"e+	c #B89E5A",
-"f+	c #856D42",
-"g+	c #C4A660",
-"h+	c #A89252",
-"i+	c #766739",
-"j+	c #7A663D",
-"k+	c #1F1A10",
-"l+	c #D8B46B",
-"m+	c #2F2718",
-"n+	c #362D1B",
-"o+	c #C0A45E",
-"p+	c #857740",
-"q+	c #75623A",
-"r+	c #977F4B",
-"s+	c #5B522C",
-"t+	c #C6A362",
-"u+	c #000000",
-"v+	c #342B1A",
-"w+	c #514627",
-"x+	c #695634",
-"y+	c #55462A",
-"z+	c #C1A060",
-"A+	c #36301A",
-"B+	c #BBA15C",
-"C+	c #C5A861",
-"D+	c #857840",
-"E+	c #675633",
-"F+	c #19140C",
-"G+	c #493D24",
-"H+	c #695E32",
-"I+	c #867840",
-"J+	c #9A884A",
-"K+	c #DDB86E",
-"L+	c #B4955A",
-"M+	c #C0A05F",
-"N+	c #7E713C",
-"O+	c #918346",
-"P+	c #756938",
-"Q+	c #423820",
-"R+	c #2C2516",
-"S+	c #6D5B36",
-"T+	c #594C2B",
-"U+	c #675833",
-"V+	c #AD9056",
-"W+	c #A98C54",
-"X+	c #A78A53",
-"Y+	c #8F7747",
-"Z+	c #897144",
-"`+	c #423621",
-" @	c #79643D",
-".@	c #070604",
-"+@	c #130F09",
-"@@	c #392F1C",
-"#@	c #4A3D25",
-"$@	c #6C5936",
-"%@	c #1E190F",
-"              .         + @ # $ % & *       = - ;               ",
-"          ; > , ' ) ! ~ { { { { { { { ] ^ / { { ( %             ",
-"        _ : < [ } | { 1 2 { { { { { { 3 ' 4 5 6 7 { 8           ",
-"        9 { 0 a b c } : { { { { { { { { | d e f g { h           ",
-"        i { j k l m { { { { { { { { { { { n o k p { q           ",
-"        r s t u v ' { { { { { { { { { { { w x y z '             ",
-"          A { { { { { { { { { { { { { { { { { { B               ",
-"          C { { { { D E F G { { { H I J K { { { 1               ",
-"          L { { { M I N ( @ : { { O P Q R S { { T               ",
-"          U V { { W M ! X Y Z { { ` R 0  ...{ { D               ",
-"          +.+.{ { @.#.$.%. .{ { { &.- *.A ` { { L               ",
-"          Z =.-.{ { { ;.s >.,.'.).7 !.7 { { { ~.{.              ",
-"        ].{ ^./.(.{ { _.:.<.f [.}.c |.1.{ { B 2.3.1 4.          ",
-"      5.: { { 6.7.8.9.0.k k a.b.c.d.l e.{ : * f.{ { { H =.      ",
-"    g.h.{ { { { { T i.j.k k k.l.m.k k n.o.p.t { { { { { (.q.    ",
-"    r.{ { { { { s.{ { { t.u.v.w.x.k y.z.{ 2 ;.{ { { { { { p.A.  ",
-"  B.C.{ { { { D.E.{ { { { 7 h.F.G.H.I.;.{ J.I.{ { { { { { ( E   ",
-"  K.{ { { { { $.} { { { : L.M.N.O.P.Q.h.{ { R.S.{ { { { { { R.  ",
-"T.` { { { { { U.{ { { { V.W.X.Y.Z.`. +.+{ { N ++{ { { { { { V @+",
-"#+Z { { { { { $+{ { { { %+&+`.`.`.`.*+#.{ { { =+-+{ { { { { ;.;+",
-">+{ { { { { { Z { { { { , ,+W.`.`.'+)+{ { { { { 1.( { { { { Z !+",
-"= { { { { { { , E.~+K A { < {+]+`.^+B { { /+,.K p.4   (+- _+:+  ",
-"<+).{ { { { [+(+4.}+;.{ { { { |+1+2+i.!.;.} P 3+4+5+T.          ",
-"  6+7+    % % { ;.V i.8+9+{ { { { | 0+{ { { { { { ;.a+          ",
-"          b+: { c+d+k k l e+&.f+;.p.#.{ 7 g+h+i+j+1 o.k+        ",
-"          I { 5 b.k k k k k l+G m+n+Z { o+k k k p+q+{ 5.        ",
-"          * { r+s+k k k k k o+t+u+v+{ { e+k k k k w+!.x+        ",
-"          y+{ z+A+k k k k k B+, u+#+}+{ C+k k k D+E+{ -         ",
-"          F+w { G+H+k k I+J+K+Q     L+{ M+N+O+P+Q+C.| R+        ",
-"            (+!.3.S+T+U+V+: { A     W+{ { X+* Y+s { Z+          ",
-"              `+4.1 { { { { {         { { { { { |+ @.@          ",
-"                  +@@@#@                B 8.[+$@%@              "};

Added: packages/trunk/gamine/debian/patches/desktop-file.patch
===================================================================
--- packages/trunk/gamine/debian/patches/desktop-file.patch	                        (rev 0)
+++ packages/trunk/gamine/debian/patches/desktop-file.patch	2016-04-15 10:49:15 UTC (rev 15759)
@@ -0,0 +1,18 @@
+From: Markus Koschany <apo at debian.org>
+Date: Fri, 15 Apr 2016 11:51:01 +0200
+Subject: desktop file
+
+Forwarded: https://sourceforge.net/p/gamine-game/tickets/2/
+---
+ gamine.desktop.in | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/gamine.desktop.in b/gamine.desktop.in
+index d47f05b..5b74086 100644
+--- a/gamine.desktop.in
++++ b/gamine.desktop.in
+@@ -7,3 +7,4 @@ Icon=gamine
+ Terminal=false
+ Type=Application
+ Categories=Game;KidsGame;
++Keywords=children;kids;mouse;

Added: packages/trunk/gamine/debian/patches/hardening.patch
===================================================================
--- packages/trunk/gamine/debian/patches/hardening.patch	                        (rev 0)
+++ packages/trunk/gamine/debian/patches/hardening.patch	2016-04-15 10:49:15 UTC (rev 15759)
@@ -0,0 +1,27 @@
+From: Markus Koschany <apo at debian.org>
+Date: Fri, 15 Apr 2016 08:10:21 +0200
+Subject: hardening
+
+Forwarded: no
+---
+ Makefile | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 95d7712..8701495 100644
+--- a/Makefile
++++ b/Makefile
+@@ -10,10 +10,11 @@ ICONDIR = $(DATADIR)/icons/hicolor/scalable/apps
+ LOCALEDIR = $(DATADIR)/locale
+ MANDIR = $(DATADIR)/man/man6
+ 
+-CFLAGS = -Wall -g
++CFLAGS = -Wall -g `dpkg-buildflags --get CFLAGS`
+ CPPFLAGS = $(shell pkg-config --cflags gtk+-3.0 cairo glib-2.0 gstreamer-1.0)  -DDATADIR=\""$(PKGDATADIR)"\"  -DLOCALDIR=\""$(LOCALEDIR)"\" -DSYSCONFDIR=\""$(SYSCONFDIR)"\"
++CPPFLAGS += `dpkg-buildflags --get CPPFLAGS`
+ LDLIBS = $(shell pkg-config --libs gtk+-3.0 cairo glib-2.0 gstreamer-1.0)  -DDATADIR=\""$(PKGDATADIR)"\"  -DLOCALDIR=\""$(LOCALEDIR)"\" -DSYSCONFDIR=\""$(SYSCONFDIR)"\" -lm
+-LDFLAGS = -g 
++LDFLAGS = `dpkg-buildflags --get LDFLAGS`
+ CC = gcc
+ target = gamine
+ objs = gamine.o

Deleted: packages/trunk/gamine/debian/patches/link-X11.diff
===================================================================
--- packages/trunk/gamine/debian/patches/link-X11.diff	2016-04-15 04:43:28 UTC (rev 15758)
+++ packages/trunk/gamine/debian/patches/link-X11.diff	2016-04-15 10:49:15 UTC (rev 15759)
@@ -1,15 +0,0 @@
-From: Ansgar Burchardt <ansgar at debian.org>
-Date: Mon, 14 Mar 2011 16:15:28 +0100
-Subject: Link with -lX11 as gamine uses XGrabKeyboard
-Bug-Debian: http://bugs.debian.org/615717
---- gamine.orig/Makefile
-+++ gamine/Makefile
-@@ -16,7 +16,7 @@
- CFLAGS = -Wall
- #CFLAGS = -Wall -g 
- CPPFLAGS = $(shell pkg-config --cflags gtk+-2.0 cairo glib-2.0 gstreamer-0.10 gconf-2.0)  -DDATADIR=\""$(PKGDATADIR)"\"  -DLOCALDIR=\""$(LOCALEDIR)"\"
--LDLIBS = $(shell pkg-config --libs gtk+-2.0 cairo glib-2.0 gstreamer-0.10 gconf-2.0)  -DDATADIR=\""$(PKGDATADIR)"\"  -DLOCALDIR=\""$(LOCALEDIR)"\"
-+LDLIBS = $(shell pkg-config --libs gtk+-2.0 cairo glib-2.0 gstreamer-0.10 gconf-2.0) -lX11 -DDATADIR=\""$(PKGDATADIR)"\"  -DLOCALDIR=\""$(LOCALEDIR)"\"
- LDFLAGS = -g 
- CC = gcc
- target = gamine

Deleted: packages/trunk/gamine/debian/patches/link-libm.patch
===================================================================
--- packages/trunk/gamine/debian/patches/link-libm.patch	2016-04-15 04:43:28 UTC (rev 15758)
+++ packages/trunk/gamine/debian/patches/link-libm.patch	2016-04-15 10:49:15 UTC (rev 15759)
@@ -1,16 +0,0 @@
-Description: Explicitely link libm.
-Bug-Debian: http://bugs.debian.org/713699
-Author: Barry deFreese <bdefreese at debian.org>
-Index: gamine-1.1/Makefile
-===================================================================
---- gamine-1.1.orig/Makefile	2013-06-22 14:25:00.000000000 -0400
-+++ gamine-1.1/Makefile	2013-06-22 14:27:12.000000000 -0400
-@@ -16,7 +16,7 @@
- CFLAGS = -Wall
- #CFLAGS = -Wall -g 
- CPPFLAGS = $(shell pkg-config --cflags gtk+-2.0 cairo glib-2.0 gstreamer-0.10 gconf-2.0)  -DDATADIR=\""$(PKGDATADIR)"\"  -DLOCALDIR=\""$(LOCALEDIR)"\"
--LDLIBS = $(shell pkg-config --libs gtk+-2.0 cairo glib-2.0 gstreamer-0.10 gconf-2.0) -lX11 -DDATADIR=\""$(PKGDATADIR)"\"  -DLOCALDIR=\""$(LOCALEDIR)"\"
-+LDLIBS = $(shell pkg-config --libs gtk+-2.0 cairo glib-2.0 gstreamer-0.10 gconf-2.0) -lX11 -lm -DDATADIR=\""$(PKGDATADIR)"\"  -DLOCALDIR=\""$(LOCALEDIR)"\"
- LDFLAGS = -g 
- CC = gcc
- target = gamine

Deleted: packages/trunk/gamine/debian/patches/makefile-DESTDIR.diff
===================================================================
--- packages/trunk/gamine/debian/patches/makefile-DESTDIR.diff	2016-04-15 04:43:28 UTC (rev 15758)
+++ packages/trunk/gamine/debian/patches/makefile-DESTDIR.diff	2016-04-15 10:49:15 UTC (rev 15759)
@@ -1,101 +0,0 @@
-Description: Fix DESTDIR in upstream makefile.
-Author: Unknown.
---- gamine-1.1.orig/Makefile
-+++ gamine-1.1/Makefile
-@@ -1,21 +1,22 @@
- PREFIX = /usr/local
--bindir = $(PREFIX)/bin
--datadir = $(PREFIX)/share
--pkgdatadir = $(datadir)/gamine
--docdir = $(datadir)/doc/gamine
--sysconfdir = $(PREFIX)/etc
--desktopdir = $(datadir)/applications
--icondir = $(datadir)/icons/hicolor/scalable/apps
--localedir = $(datadir)/locale
-+DESTDIR = 
-+BINDIR = $(PREFIX)/bin
-+DATADIR = $(PREFIX)/share
-+PKGDATADIR = $(DATADIR)/gamine
-+DOCDIR = $(DATADIR)/doc/gamine
-+SYSCONFDIR = $(PREFIX)/etc
-+DESKTOPDIR = $(DATADIR)/applications
-+ICONDIR = $(DATADIR)/icons/hicolor/scalable/apps
-+LOCALEDIR = $(DATADIR)/locale
- 
- GCONFTOOL = /usr/bin/gconftool-2
- GCONF_SCHEMA_CONFIG_SOURCE = xml:merged:/etc/gconf/gconf.xml.defaults
--GCONF_SCHEMA_FILE_DIR = $(sysconfdir)/gconf/schemas
-+GCONF_SCHEMA_FILE_DIR = $(SYSCONFDIR)/gconf/schemas
- GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL = 0
- CFLAGS = -Wall
- #CFLAGS = -Wall -g 
--CPPFLAGS = $(shell pkg-config --cflags gtk+-2.0 cairo glib-2.0 gstreamer-0.10 gconf-2.0)  -DDATADIR=\""$(pkgdatadir)"\"  -DLOCALDIR=\""$(localedir)"\"
--LDLIBS = $(shell pkg-config --libs gtk+-2.0 cairo glib-2.0 gstreamer-0.10 gconf-2.0)  -DDATADIR=\""$(pkgdatadir)"\"  -DLOCALDIR=\""$(localedir)"\"
-+CPPFLAGS = $(shell pkg-config --cflags gtk+-2.0 cairo glib-2.0 gstreamer-0.10 gconf-2.0)  -DDATADIR=\""$(PKGDATADIR)"\"  -DLOCALDIR=\""$(LOCALEDIR)"\"
-+LDLIBS = $(shell pkg-config --libs gtk+-2.0 cairo glib-2.0 gstreamer-0.10 gconf-2.0)  -DDATADIR=\""$(PKGDATADIR)"\"  -DLOCALDIR=\""$(LOCALEDIR)"\"
- LDFLAGS = -g 
- CC = gcc
- target = gamine
-@@ -23,7 +24,7 @@
- 
- $(target): $(objs)
- 	$(CC) -o $@ $^ $(LDFLAGS) $(LDLIBS)
--	sed 's at BINDIR@$(bindir)@' gamine.desktop.in > gamine.desktop
-+	sed 's at BINDIR@$(BINDIR)@' gamine.desktop.in > gamine.desktop
- 	msgfmt -c -o locale/fr.mo locale/fr.po
- 
- %.o: %.c
-@@ -32,28 +33,30 @@
- 	rm -f $(target) $(objs) gamine.desktop *~ locale/*.mo
- 
- install:
--	mkdir -p $(bindir)
--	mkdir -p $(pkgdatadir)/sounds
--	mkdir -p $(docdir)
--	mkdir -p $(icondir)
--	mkdir -p $(desktopdir)
--	mkdir -p $(GCONF_SCHEMA_FILE_DIR)
--	mkdir -p $(localedir)/fr/LC_MESSAGES
--	install -m 755 gamine $(bindir)/
--	install -m 644 pencil.png $(pkgdatadir)/
--	install -m 644 gamine.png $(pkgdatadir)/
--	install -m 644 sounds/* $(pkgdatadir)/sounds/
--	install -m 644 README.pencil README.sounds README ChangeLog COPYING $(docdir)/
--	install -m 644 gamine.schemas $(GCONF_SCHEMA_FILE_DIR)/
--	install -m 644 locale/fr.mo $(localedir)/fr/LC_MESSAGES/gamine.mo
--	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(GCONF_SCHEMA_FILE_DIR)/gamine.schemas
--	install -m 644 gamine.desktop $(desktopdir)/
--	install -m 644 gamine.svg $(icondir)/
-+	mkdir -p $(DESTDIR)$(BINDIR)
-+	mkdir -p $(DESTDIR)$(PKGDATADIR)/sounds
-+	mkdir -p $(DESTDIR)$(DOCDIR)
-+	mkdir -p $(DESTDIR)$(ICONDIR)
-+	mkdir -p $(DESTDIR)$(DESKTOPDIR)
-+	mkdir -p $(DESTDIR)$(GCONF_SCHEMA_FILE_DIR)
-+	mkdir -p $(DESTDIR)$(LOCALEDIR)/fr/LC_MESSAGES
-+	install -m 755 gamine $(DESTDIR)$(BINDIR)/
-+	install -m 644 pencil.png $(DESTDIR)$(PKGDATADIR)/
-+	install -m 644 gamine.png $(DESTDIR)$(PKGDATADIR)/
-+	install -m 644 sounds/* $(DESTDIR)$(PKGDATADIR)/sounds/
-+	install -m 644 README.pencil README.sounds README ChangeLog COPYING $(DESTDIR)$(DOCDIR)/
-+	install -m 644 gamine.schemas $(DESTDIR)$(GCONF_SCHEMA_FILE_DIR)/
-+	install -m 644 locale/fr.mo $(DESTDIR)$(LOCALEDIR)/fr/LC_MESSAGES/gamine.mo
-+	install -m 644 gamine.desktop $(DESTDIR)$(DESKTOPDIR)/
-+	install -m 644 gamine.svg $(DESTDIR)$(ICONDIR)/
-+ifeq ($(DESTDIR), "")
-+	[ ! -z "$(DESTDIR)" ] || GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(GCONF_SCHEMA_FILE_DIR)/gamine.schemas
-+endif
- 
- uninstall:
--	rm -rf $(bindir)/gamine
--	rm -rf $(pkgdatadir)
--	rm -rf $(docdir)
--	rm -rf $(GCONF_SCHEMA_FILE_DIR)/gamine.schemas
--	rm -rf $(desktopdir)/gamine.desktop
--	rm -rf $(icondir)/gamine.svg
-+	rm -rf $(DESTDIR)$(BINDIR)/gamine
-+	rm -rf $(DESTDIR)$(PKGDATADIR)
-+	rm -rf $(DESTDIR)$(DOCDIR)
-+	rm -rf $(DESTDIR)$(GCONF_SCHEMA_FILE_DIR)/gamine.schemas
-+	rm -rf $(DESTDIR)$(DESKTOPDIR)/gamine.desktop
-+	rm -rf $(DESTDIR)$(ICONDIR)/gamine.svg

Deleted: packages/trunk/gamine/debian/patches/makefile-flags.patch
===================================================================
--- packages/trunk/gamine/debian/patches/makefile-flags.patch	2016-04-15 04:43:28 UTC (rev 15758)
+++ packages/trunk/gamine/debian/patches/makefile-flags.patch	2016-04-15 10:49:15 UTC (rev 15759)
@@ -1,21 +0,0 @@
-Description: Modify Makefile to allow passing of CFLAGS, CPPFLAGS, LDFLAGS.
-Author: Barry deFreese <bdefreese at debian.org>
-Index: gamine-1.1/Makefile
-===================================================================
---- gamine-1.1.orig/Makefile	2013-06-23 05:24:42.000000000 -0400
-+++ gamine-1.1/Makefile	2013-06-23 05:27:37.000000000 -0400
-@@ -13,11 +13,11 @@
- GCONF_SCHEMA_CONFIG_SOURCE = xml:merged:/etc/gconf/gconf.xml.defaults
- GCONF_SCHEMA_FILE_DIR = $(SYSCONFDIR)/gconf/schemas
- GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL = 0
--CFLAGS = -Wall
-+CFLAGS += -Wall
- #CFLAGS = -Wall -g 
--CPPFLAGS = $(shell pkg-config --cflags gtk+-2.0 cairo glib-2.0 gstreamer-0.10 gconf-2.0)  -DDATADIR=\""$(PKGDATADIR)"\"  -DLOCALDIR=\""$(LOCALEDIR)"\"
-+CPPFLAGS += $(shell pkg-config --cflags gtk+-2.0 cairo glib-2.0 gstreamer-0.10 gconf-2.0)  -DDATADIR=\""$(PKGDATADIR)"\"  -DLOCALDIR=\""$(LOCALEDIR)"\"
- LDLIBS = $(shell pkg-config --libs gtk+-2.0 cairo glib-2.0 gstreamer-0.10 gconf-2.0) -lX11 -lm -DDATADIR=\""$(PKGDATADIR)"\"  -DLOCALDIR=\""$(LOCALEDIR)"\"
--LDFLAGS = -g 
-+LDFLAGS += -g 
- CC = gcc
- target = gamine
- objs = gamine.o

Deleted: packages/trunk/gamine/debian/patches/preserve_CC_FLAGS.diff
===================================================================
--- packages/trunk/gamine/debian/patches/preserve_CC_FLAGS.diff	2016-04-15 04:43:28 UTC (rev 15758)
+++ packages/trunk/gamine/debian/patches/preserve_CC_FLAGS.diff	2016-04-15 10:49:15 UTC (rev 15759)
@@ -1,47 +0,0 @@
-Description: <short summary of the patch>
- TODO: Put a short summary on the line above and replace this paragraph
- with a longer explanation of this change. Complete the meta-information
- with other relevant fields (see below for details). To make it easier, the
- information below has been extracted from the changelog. Adjust it or drop
- it.
- .
- gamine (1.2-1) experimental; urgency=medium
- .
-   * New upstream release
-     - Switch to Alexey Loginov fork
-     - Use libgtk-3-dev and libgstream1.0-dev
-   * Upload in experimental because of the freeze
-   * Use my @debian email address
-   * Bump du Standard-Version 3.9.6, no change
-Author: Gonéri Le Bouder <goneri at debian.org>
-
----
-The information above should follow the Patch Tagging Guidelines, please
-checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
-are templates for supplementary fields that you might want to add:
-
-Origin: <vendor|upstream|other>, <url of original patch>
-Bug: <url in upstream bugtracker>
-Bug-Debian: https://bugs.debian.org/<bugnumber>
-Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
-Forwarded: <no|not-needed|url proving that it has been forwarded>
-Reviewed-By: <name and email of someone who approved the patch>
-Last-Update: <YYYY-MM-DD>
-
---- gamine-1.2.orig/Makefile
-+++ gamine-1.2/Makefile
-@@ -10,10 +10,10 @@ ICONDIR = $(DATADIR)/icons/hicolor/scala
- LOCALEDIR = $(DATADIR)/locale
- MANDIR = $(DATADIR)/man/man6
- 
--CFLAGS = -Wall -g
--CPPFLAGS = $(shell pkg-config --cflags gtk+-3.0 cairo glib-2.0 gstreamer-1.0)  -DDATADIR=\""$(PKGDATADIR)"\"  -DLOCALDIR=\""$(LOCALEDIR)"\" -DSYSCONFDIR=\""$(SYSCONFDIR)"\"
--LDLIBS = $(shell pkg-config --libs gtk+-3.0 cairo glib-2.0 gstreamer-1.0)  -DDATADIR=\""$(PKGDATADIR)"\"  -DLOCALDIR=\""$(LOCALEDIR)"\" -DSYSCONFDIR=\""$(SYSCONFDIR)"\" -lm
--LDFLAGS = -g 
-+CFLAGS += -Wall -g
-+CPPFLAGS += $(shell pkg-config --cflags gtk+-3.0 cairo glib-2.0 gstreamer-1.0)  -DDATADIR=\""$(PKGDATADIR)"\"  -DLOCALDIR=\""$(LOCALEDIR)"\" -DSYSCONFDIR=\""$(SYSCONFDIR)"\"
-+LDLIBS += $(shell pkg-config --libs gtk+-3.0 cairo glib-2.0 gstreamer-1.0)  -DDATADIR=\""$(PKGDATADIR)"\"  -DLOCALDIR=\""$(LOCALEDIR)"\" -DSYSCONFDIR=\""$(SYSCONFDIR)"\" -lm
-+LDFLAGS += -g
- CC = gcc
- target = gamine
- objs = gamine.o

Modified: packages/trunk/gamine/debian/patches/series
===================================================================
--- packages/trunk/gamine/debian/patches/series	2016-04-15 04:43:28 UTC (rev 15758)
+++ packages/trunk/gamine/debian/patches/series	2016-04-15 10:49:15 UTC (rev 15759)
@@ -1 +1,2 @@
-preserve_CC_FLAGS.diff
+hardening.patch
+desktop-file.patch

Modified: packages/trunk/gamine/debian/rules
===================================================================
--- packages/trunk/gamine/debian/rules	2016-04-15 04:43:28 UTC (rev 15758)
+++ packages/trunk/gamine/debian/rules	2016-04-15 10:49:15 UTC (rev 15759)
@@ -1,12 +1,31 @@
 #!/usr/bin/make -f
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
 
-LDFLAGS += "-Wl,--as-needed"
-
 %:
-	dh $@
+	dh $@ --parallel
 
 override_dh_auto_build:
-	$(MAKE) PREFIX=/usr BINDIR=/usr/games DESTDIR=$(CURDIR)/debian/tmp PKGDATADIR=/usr/share/games/gamine SYSCONFDIR=/etc
+	dh_auto_build -- \
+		PREFIX=/usr \
+		BINDIR=/usr/games \
+		DESTDIR=$(CURDIR)/debian/tmp \
+		PKGDATADIR=/usr/share/games/gamine \
+		SYSCONFDIR=/etc
 
 override_dh_auto_install:
-	$(MAKE) install PREFIX=/usr BINDIR=/usr/games DESTDIR=$(CURDIR)/debian/tmp PKGDATADIR=/usr/share/games/gamine
+	$(MAKE) \
+		install \
+		PREFIX=/usr \
+		BINDIR=/usr/games \
+		DESTDIR=$(CURDIR)/debian/tmp \
+		PKGDATADIR=/usr/share/games/gamine
+
+override_dh_install:
+	cd debian/tmp/usr/share/doc/gamine/ && $(RM) COPYING ChangeLog README*
+	dh_install --fail-missing
+	$(RM) -r debian/gamine-data/usr/share/applications
+
+get-orig-source:
+	uscan --verbose --download-current-version --force-download
+

Deleted: packages/trunk/gamine/debian/source/local-options
===================================================================
--- packages/trunk/gamine/debian/source/local-options	2016-04-15 04:43:28 UTC (rev 15758)
+++ packages/trunk/gamine/debian/source/local-options	2016-04-15 10:49:15 UTC (rev 15759)
@@ -1,2 +0,0 @@
-abort-on-upstream-changes
-unapply-patches

Modified: packages/trunk/gamine/debian/watch
===================================================================
--- packages/trunk/gamine/debian/watch	2016-04-15 04:43:28 UTC (rev 15758)
+++ packages/trunk/gamine/debian/watch	2016-04-15 10:49:15 UTC (rev 15759)
@@ -1,9 +1,2 @@
-# Watch control file for uscan
-# See uscan(1) for format
-
-# Compulsory line, this is a version 3 file
-version=3
-
-# Avoid a false positive with the 0.0.1-1 release
-opts="uversionmangle=s/rc/~rc/" \
-http://gnunux.info/projets/gamine/ gamine-([0-9a-z.]+)\.tar\.gz
+version=4
+http://sf.net/gamine-game/gamine-(\d\S*)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))




More information about the Pkg-games-commits mailing list