r14654 - in packages/trunk/lmemory/debian: . patches
Markus Koschany
apo-guest at alioth.debian.org
Thu Oct 24 15:56:38 UTC 2013
Author: apo-guest
Date: 2013-10-24 15:56:38 +0000 (Thu, 24 Oct 2013)
New Revision: 14654
Removed:
packages/trunk/lmemory/debian/dirs
packages/trunk/lmemory/debian/patches/ac_local_program.diff
packages/trunk/lmemory/debian/patches/as-needed.patch
Modified:
packages/trunk/lmemory/debian/README.Debian
packages/trunk/lmemory/debian/changelog
packages/trunk/lmemory/debian/compat
packages/trunk/lmemory/debian/control
packages/trunk/lmemory/debian/copyright
packages/trunk/lmemory/debian/lmemory.desktop
packages/trunk/lmemory/debian/lmemory.install
packages/trunk/lmemory/debian/menu
packages/trunk/lmemory/debian/patches/fixes.patch
packages/trunk/lmemory/debian/patches/gtk2.patch
packages/trunk/lmemory/debian/patches/series
packages/trunk/lmemory/debian/rules
packages/trunk/lmemory/debian/watch
Log:
Debian release 0.6c-7
Fix FTBFS #724197
Update dh_auto_clean override
Build with dh-autoreconf
Drop ac_local_program.diff and as-needed.patch, not needed.
Instead export -Wl, -as-needed
See also changelog
Modified: packages/trunk/lmemory/debian/README.Debian
===================================================================
--- packages/trunk/lmemory/debian/README.Debian 2013-10-23 17:41:02 UTC (rev 14653)
+++ packages/trunk/lmemory/debian/README.Debian 2013-10-24 15:56:38 UTC (rev 14654)
@@ -6,7 +6,7 @@
I have provided some default images in:
- /usr/share/games/lmemory/pixmaps
+ /usr/share/games/lmemory/pixmaps
taken from the "lletters" package, scaled, and converted to .xpm
format with this command:
Modified: packages/trunk/lmemory/debian/changelog
===================================================================
--- packages/trunk/lmemory/debian/changelog 2013-10-23 17:41:02 UTC (rev 14653)
+++ packages/trunk/lmemory/debian/changelog 2013-10-24 15:56:38 UTC (rev 14654)
@@ -1,13 +1,29 @@
-lmemory (0.6c-7) UNRELEASED; urgency=low
+lmemory (0.6c-7) unstable; urgency=low
- [ Bas Wijnen ]
- * NOT RELEASED YET
-
[ Evgeni Golov ]
* Correct Vcs-* URLs to point to anonscm.debian.org
- -- Bas Wijnen <wijnen at debian.org> Thu, 21 Jul 2011 21:21:06 +0200
+ [ Markus Koschany ]
+ * Add myself to Uploaders.
+ * Bump compat level to 9 and require debhelper >= 9.
+ * Bump Standards-Version to 3.9.4, no changes.
+ * Drop autoconf, automake and libtool from Build-Depends. Use dh-autoreconf
+ instead.
+ * Build with --parallel and with autoreconf to recreate the build system at
+ build time and to avoid a FTBFS. (Closes: #724197)
+ * Update dh_auto_clean target for allowing lmemory to build twice in a row.
+ * Drop dirs file, not needed.
+ * Add keywords to desktop file.
+ * Add longtitle to menu file.
+ * Drop ac_local_programm.diff, it is not needed.
+ * Drop as-needed.patch. Export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
+ instead, so that all LDFLAGS via dpkg-buildflags can be appended.
+ * Add DEP3 header to patches.
+ * Update debian/copyright to copyright format 1.0.
+ * Run wrap-and-sort -sa
+ -- Markus Koschany <apo at gambaru.de> Thu, 24 Oct 2013 17:41:45 +0200
+
lmemory (0.6c-6) unstable; urgency=low
* Team upload.
Modified: packages/trunk/lmemory/debian/compat
===================================================================
--- packages/trunk/lmemory/debian/compat 2013-10-23 17:41:02 UTC (rev 14653)
+++ packages/trunk/lmemory/debian/compat 2013-10-24 15:56:38 UTC (rev 14654)
@@ -1 +1 @@
-8
+9
Modified: packages/trunk/lmemory/debian/control
===================================================================
--- packages/trunk/lmemory/debian/control 2013-10-23 17:41:02 UTC (rev 14653)
+++ packages/trunk/lmemory/debian/control 2013-10-24 15:56:38 UTC (rev 14654)
@@ -2,16 +2,24 @@
Section: games
Priority: optional
Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
-Uploaders: Miriam Ruiz <little_miry at yahoo.es>, Evgeny Dolgikh <marcondream at gmail.com>
-Build-Depends: debhelper (>= 8), libgtk2.0-dev, autoconf, automake, libtool
-Standards-Version: 3.9.2
+Uploaders:
+ Miriam Ruiz <little_miry at yahoo.es>,
+ Evgeny Dolgikh <marcondream at gmail.com>,
+ Markus Koschany <apo at gambaru.de>
+Build-Depends:
+ debhelper (>= 9),
+ dh-autoreconf,
+ libgtk2.0-dev
+Standards-Version: 3.9.4
Homepage: http://home.comcast.net/~x.zhang1/linux_game.html
Vcs-Svn: svn://anonscm.debian.org/pkg-games/packages/trunk/lmemory/
Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-games/packages/trunk/lmemory/
Package: lmemory
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends}
Description: Children's game based on the "memory" card game
The Linux Memory Game is an X11 game for children ages 3 and up, based on
the card game "Memory". It is written using GTK+ library. Although it is a
Modified: packages/trunk/lmemory/debian/copyright
===================================================================
--- packages/trunk/lmemory/debian/copyright 2013-10-23 17:41:02 UTC (rev 14653)
+++ packages/trunk/lmemory/debian/copyright 2013-10-24 15:56:38 UTC (rev 14654)
@@ -1,30 +1,33 @@
-This package was debianized by Ben Armstrong <synrg at sanctuary.nslug.ns.ca> on
-Sat, 11 Nov 2000 13:14:25 -0400.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: LMemory
+Source: http://home.comcast.net/~x.zhang1/linux_game.html
-It was downloaded from http://mywebpages.comcast.net/x.zhang1/linux_game.html
+Files: *
+Copyright: 1999-2003, Xiaoguang Zhang
+License: GPL-2+
-Upstream Author:
+Files: debian/*
+Copyright: 2000-2004, 2008 Ben Armstrong <synrg at sanctuary.nslug.ns.ca>
+ 2006, Marc 'HE' Brockschmidt <he at debian.org>
+ 2008, Andreas Tille <tille at debian.org>
+ 2008, Miriam Ruiz <little_miry at yahoo.es>
+ 2009, Gonéri Le Bouder <goneri at rulezlan.org>
+ 2011, Bas Wijnen <wijnen at debian.org>
+ 2011, Evgeny Dolgikh <marcondream at gmail.com>
+ 2013, Markus Koschany <apo at gambaru.de>
+License: GPL-2+
- Xiaoguang Zhang <xiaoguangz at home.com>
-Copyright:
-
- Copyright (c) 2000-2001 Xiaoguang Zhang
-
-License:
-
- This package 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 package 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.
-
-On Debian systems, the complete text of version 2 of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL-2'.
-
-The Debian packaging is licensed under the same license as the
-program, see above.
+License: GPL-2+
+ This package 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 package 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.
+ .
+ On Debian systems, the complete text of version 2 of the GNU General
+ Public License can be found in `/usr/share/common-licenses/GPL-2'.
Deleted: packages/trunk/lmemory/debian/dirs
===================================================================
--- packages/trunk/lmemory/debian/dirs 2013-10-23 17:41:02 UTC (rev 14653)
+++ packages/trunk/lmemory/debian/dirs 2013-10-24 15:56:38 UTC (rev 14654)
@@ -1,2 +0,0 @@
-usr/games
-usr/share/games/lmemory
Modified: packages/trunk/lmemory/debian/lmemory.desktop
===================================================================
--- packages/trunk/lmemory/debian/lmemory.desktop 2013-10-23 17:41:02 UTC (rev 14653)
+++ packages/trunk/lmemory/debian/lmemory.desktop 2013-10-24 15:56:38 UTC (rev 14654)
@@ -6,3 +6,4 @@
Exec=lmemory
Terminal=false
Categories=Game;KidsGame;
+Keywords=memory;logic;game;kids;puzzle;gtk;
Modified: packages/trunk/lmemory/debian/lmemory.install
===================================================================
--- packages/trunk/lmemory/debian/lmemory.install 2013-10-23 17:41:02 UTC (rev 14653)
+++ packages/trunk/lmemory/debian/lmemory.install 2013-10-24 15:56:38 UTC (rev 14654)
@@ -1,3 +1,3 @@
-debian/pixmaps /usr/share/games/lmemory/
debian/lmemory.desktop /usr/share/applications
debian/lmemory.xpm /usr/share/pixmaps
+debian/pixmaps /usr/share/games/lmemory/
Modified: packages/trunk/lmemory/debian/menu
===================================================================
--- packages/trunk/lmemory/debian/menu 2013-10-23 17:41:02 UTC (rev 14653)
+++ packages/trunk/lmemory/debian/menu 2013-10-24 15:56:38 UTC (rev 14654)
@@ -1,3 +1,6 @@
-?package(lmemory):needs="X11" section="Games/Puzzles"\
+?package(lmemory):needs="X11" \
+ section="Games/Puzzles" \
icon="/usr/share/pixmaps/lmemory.xpm" \
- title="lmemory" command="/usr/games/lmemory"
+ title="LMemory" \
+ longtitle="LMemory - Children's game based on the memory(R) card game" \
+ command="/usr/games/lmemory"
Deleted: packages/trunk/lmemory/debian/patches/ac_local_program.diff
===================================================================
--- packages/trunk/lmemory/debian/patches/ac_local_program.diff 2013-10-23 17:41:02 UTC (rev 14653)
+++ packages/trunk/lmemory/debian/patches/ac_local_program.diff 2013-10-24 15:56:38 UTC (rev 14654)
@@ -1,10 +0,0 @@
---- lmemory-0.6c.orig/configure.in
-+++ lmemory-0.6c/configure.in
-@@ -23,7 +23,6 @@
- AC_PROG_INSTALL
- AC_PROG_MAKE_SET
- AC_STDC_HEADERS
--AC_ARG_PROGRAM
-
- AM_PATH_GTK_2_0(,,
- AC_MSG_ERROR(Cannot find correct version of GTK))
Deleted: packages/trunk/lmemory/debian/patches/as-needed.patch
===================================================================
--- packages/trunk/lmemory/debian/patches/as-needed.patch 2013-10-23 17:41:02 UTC (rev 14653)
+++ packages/trunk/lmemory/debian/patches/as-needed.patch 2013-10-24 15:56:38 UTC (rev 14654)
@@ -1,12 +0,0 @@
-Index: lmemory/Makefile.am
-===================================================================
---- lmemory.orig/Makefile.am 2011-07-21 21:01:40.025414093 +0200
-+++ lmemory/Makefile.am 2011-07-21 21:02:08.049585767 +0200
-@@ -13,6 +13,7 @@
-
- SUBDIRS =
-
-+LDFLAGS = -Wl,--as-needed
- LDADD = @GTK_LIBS@
-
- INCLUDES = @GTK_CFLAGS@ -I. -DLIBDIR=\"@libdir@\" -DDATADIR=\"@datadir@\"
Modified: packages/trunk/lmemory/debian/patches/fixes.patch
===================================================================
--- packages/trunk/lmemory/debian/patches/fixes.patch 2013-10-23 17:41:02 UTC (rev 14653)
+++ packages/trunk/lmemory/debian/patches/fixes.patch 2013-10-24 15:56:38 UTC (rev 14654)
@@ -1,17 +1,19 @@
---- lmemory-0.6c.orig/help.c
-+++ lmemory-0.6c/help.c
-@@ -39,7 +39,7 @@
-
- /* Set the about box labels */
- label = lookup_widget (window_about, "label_about_version");
-- gtk_label_set_text(GTK_LABEL(label), VERSION);
-+ gtk_label_set_text(GTK_LABEL(label), "0.6c");
- label = lookup_widget (window_about, "label_about_date");
- gtk_label_set_text(GTK_LABEL(label), __DATE__);
-
---- lmemory-0.6c.orig/Makefile.am
-+++ lmemory-0.6c/Makefile.am
-@@ -5,8 +5,10 @@
+From: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
+Date: Thu, 24 Oct 2013 15:24:07 +0200
+Subject: fixes
+
+---
+ Makefile.am | 4 ++-
+ help.c | 2 +-
+ help.h | 84 +++++++++++++++++++++++++++++------------------------------
+ lmem_window.c | 3 +++
+ 4 files changed, 49 insertions(+), 44 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index ea58853..e1802ed 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -5,8 +5,10 @@ lmemory_SOURCES = list.c \
mmain.c \
lmem_window.c \
lmem_menu.c \
@@ -23,9 +25,23 @@
lmemory.h
SUBDIRS =
-diff -ruN lmemory-0.6c.orig/help.h lmemory-0.6c/help.h
---- lmemory-0.6c.orig/help.h 2003-07-29 16:40:00.000000000 +0200
-+++ lmemory-0.6c/help.h 2008-09-05 18:40:40.000000000 +0200
+diff --git a/help.c b/help.c
+index f76338d..0d581b6 100644
+--- a/help.c
++++ b/help.c
+@@ -39,7 +39,7 @@ lmem_about ()
+
+ /* Set the about box labels */
+ label = lookup_widget (window_about, "label_about_version");
+- gtk_label_set_text(GTK_LABEL(label), VERSION);
++ gtk_label_set_text(GTK_LABEL(label), "0.6c");
+ label = lookup_widget (window_about, "label_about_date");
+ gtk_label_set_text(GTK_LABEL(label), __DATE__);
+
+diff --git a/help.h b/help.h
+index 78e5931..70674c5 100644
+--- a/help.h
++++ b/help.h
@@ -1,47 +1,47 @@
char *rule_buf =
-"The aim of the game is to remove the cards in pairs by matching
@@ -116,9 +132,10 @@
+Match two different cards at a time. This option needs the icon files\n\
+to be set up properly so that two related icons are next to each other\n\
in the file list. This option can be used for teaching and association.";
-diff -ruN lmemory-0.6c.orig/lmem_window.c lmemory-0.6c/lmem_window.c
---- lmemory-0.6c.orig/lmem_window.c 2003-07-30 17:36:35.000000000 +0200
-+++ lmemory-0.6c/lmem_window.c 2008-09-05 18:40:40.000000000 +0200
+diff --git a/lmem_window.c b/lmem_window.c
+index f0325b0..0715604 100644
+--- a/lmem_window.c
++++ b/lmem_window.c
@@ -11,6 +11,9 @@
#include <stdlib.h>
#include "lmemory.h"
Modified: packages/trunk/lmemory/debian/patches/gtk2.patch
===================================================================
--- packages/trunk/lmemory/debian/patches/gtk2.patch 2013-10-23 17:41:02 UTC (rev 14653)
+++ packages/trunk/lmemory/debian/patches/gtk2.patch 2013-10-24 15:56:38 UTC (rev 14654)
@@ -1,6 +1,16 @@
---- lmemory-0.6c.orig/configure.in
-+++ lmemory-0.6c/configure.in
-@@ -25,8 +25,8 @@
+From: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
+Date: Thu, 24 Oct 2013 15:24:07 +0200
+Subject: gtk2
+
+---
+ configure.in | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index fe0aa2c..958d6f4 100644
+--- a/configure.in
++++ b/configure.in
+@@ -25,8 +25,8 @@ AC_PROG_MAKE_SET
AC_STDC_HEADERS
AC_ARG_PROGRAM
Modified: packages/trunk/lmemory/debian/patches/series
===================================================================
--- packages/trunk/lmemory/debian/patches/series 2013-10-23 17:41:02 UTC (rev 14653)
+++ packages/trunk/lmemory/debian/patches/series 2013-10-24 15:56:38 UTC (rev 14654)
@@ -1,4 +1,2 @@
fixes.patch
gtk2.patch
-ac_local_program.diff
-as-needed.patch
Modified: packages/trunk/lmemory/debian/rules
===================================================================
--- packages/trunk/lmemory/debian/rules 2013-10-23 17:41:02 UTC (rev 14653)
+++ packages/trunk/lmemory/debian/rules 2013-10-24 15:56:38 UTC (rev 14654)
@@ -1,16 +1,18 @@
#!/usr/bin/make -f
+export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
+JUNK = configure config.h.in ltmain.sh mkinstalldirs config.guess config.sub aclocal.m4 depcomp install-sh Makefile.in missing INSTALL COPYING config.status libtool lmemory Makefile config.h config.log stamp-h1
+
+
%:
- dh $@
+ dh $@ --parallel --with autoreconf
override_dh_auto_configure:
- autoreconf --force --install --symlink
- ./configure --prefix=/usr --bindir=/usr/games --datadir=/usr/share/games/lmemory
+ dh_auto_configure -- \
+ --prefix=/usr \
+ --bindir=/usr/games \
+ --datadir=/usr/share/games/lmemory
-JUNK = configure config.h.in ltmain.sh mkinstalldirs config.guess config.sub aclocal.m4 depcomp install-sh Makefile.in missing INSTALL COPYING
-
override_dh_auto_clean:
- test ! -e Makefile || test -e config.status || (autoreconf -fis && ./configure)
- test ! -e Makefile || make maintainer-clean
- rm -rf $(JUNK)
- dh_auto_clean
+ $(RM) -r $(JUNK)
+ $(RM) *.o
Modified: packages/trunk/lmemory/debian/watch
===================================================================
--- packages/trunk/lmemory/debian/watch 2013-10-23 17:41:02 UTC (rev 14653)
+++ packages/trunk/lmemory/debian/watch 2013-10-24 15:56:38 UTC (rev 14654)
@@ -1,4 +1,3 @@
version=3
-
http://home.comcast.net/~x.zhang1/linux_game.html \
http://mywebpages.comcast.net/x.zhang1/lmemory-([0-9.]+[a-z]?).tar.gz
More information about the Pkg-games-commits
mailing list