r12082 - in packages/tags/openyahtzee: . 1.9-1/debian 1.9-1/debian/patches
Paul Wise
pabs at alioth.debian.org
Fri Apr 1 14:52:47 UTC 2011
Author: pabs
Date: 2011-04-01 14:52:47 +0000 (Fri, 01 Apr 2011)
New Revision: 12082
Added:
packages/tags/openyahtzee/1.9-1/
packages/tags/openyahtzee/1.9-1/debian/changelog
packages/tags/openyahtzee/1.9-1/debian/clean
packages/tags/openyahtzee/1.9-1/debian/compat
packages/tags/openyahtzee/1.9-1/debian/control
packages/tags/openyahtzee/1.9-1/debian/copyright
packages/tags/openyahtzee/1.9-1/debian/install
packages/tags/openyahtzee/1.9-1/debian/manpages
packages/tags/openyahtzee/1.9-1/debian/menu
packages/tags/openyahtzee/1.9-1/debian/openyahtzee.6
packages/tags/openyahtzee/1.9-1/debian/openyahtzee.desktop
packages/tags/openyahtzee/1.9-1/debian/patches/
packages/tags/openyahtzee/1.9-1/debian/patches/fix-ftbfs-with-new-gcc.patch
packages/tags/openyahtzee/1.9-1/debian/patches/series
packages/tags/openyahtzee/1.9-1/debian/patches/use-system-sqlite3.patch
packages/tags/openyahtzee/1.9-1/debian/rules
packages/tags/openyahtzee/1.9-1/debian/source/
packages/tags/openyahtzee/1.9-1/debian/watch
Removed:
packages/tags/openyahtzee/1.9-1/debian/changelog
packages/tags/openyahtzee/1.9-1/debian/compat
packages/tags/openyahtzee/1.9-1/debian/control
packages/tags/openyahtzee/1.9-1/debian/copyright
packages/tags/openyahtzee/1.9-1/debian/install
packages/tags/openyahtzee/1.9-1/debian/menu
packages/tags/openyahtzee/1.9-1/debian/openyahtzee.6
packages/tags/openyahtzee/1.9-1/debian/openyahtzee.desktop
packages/tags/openyahtzee/1.9-1/debian/patches/fix-ftbfs-with-new-gcc.patch
packages/tags/openyahtzee/1.9-1/debian/patches/series
packages/tags/openyahtzee/1.9-1/debian/rules
packages/tags/openyahtzee/1.9-1/debian/watch
Log:
[svn-buildpackage] Tagging openyahtzee 1.9-1
Deleted: packages/tags/openyahtzee/1.9-1/debian/changelog
===================================================================
--- packages/trunk/openyahtzee/debian/changelog 2011-04-01 11:43:58 UTC (rev 12058)
+++ packages/tags/openyahtzee/1.9-1/debian/changelog 2011-04-01 14:52:47 UTC (rev 12082)
@@ -1,14 +0,0 @@
-openyahtzee (1.8.1-2) UNRELEASED; urgency=low
-
- [ Barry deFreese ]
- * Update package description. (Closes: #504432).
-
- -- Barry deFreese <bdefreese at debian.org> Tue, 04 Nov 2008 12:03:57 -0500
-
-openyahtzee (1.8.1-1) unstable; urgency=low
-
- [ Barry deFreese ]
- * Initial Release (Closes: #405825)
- + Using Zak B. Eleps packaging work
-
- -- Barry deFreese <bdefreese at debian.org> Sat, 27 Sep 2008 22:22:28 -0400
Copied: packages/tags/openyahtzee/1.9-1/debian/changelog (from rev 12079, packages/trunk/openyahtzee/debian/changelog)
===================================================================
--- packages/tags/openyahtzee/1.9-1/debian/changelog (rev 0)
+++ packages/tags/openyahtzee/1.9-1/debian/changelog 2011-04-01 14:52:47 UTC (rev 12082)
@@ -0,0 +1,33 @@
+openyahtzee (1.9-1) unstable; urgency=low
+
+ * Team upload.
+
+ [ Barry deFreese ]
+ * Update package description. (Closes: #504432).
+
+ [ Paul Wise ]
+ * New upstream release
+ - Remove new embedded code copy of sqlite3
+ * Wrap build-deps one per line
+ * Add ${misc:Depends} to dependencies just in case
+ * Fix the watch file to find latest release
+ * Correct the Homepage link
+ * Drop unneeded comments from the manual page
+ * Switch to dpkg-source v3
+ * Add a patch to fix FTBFS with new GCC (Closes: #565080)
+ * Update copyright information & refer to the correct GPL version
+ * Switch to debhelper 7 & dh
+ * Bump Standards-Version, no changes needed
+ * Install an XPM icon for the Debian menu entry
+ * Improve the Debian menu file
+ * Improve the freedesktop menu file
+
+ -- Paul Wise <pabs at debian.org> Fri, 01 Apr 2011 22:31:41 +0800
+
+openyahtzee (1.8.1-1) unstable; urgency=low
+
+ [ Barry deFreese ]
+ * Initial Release (Closes: #405825)
+ + Using Zak B. Eleps packaging work
+
+ -- Barry deFreese <bdefreese at debian.org> Sat, 27 Sep 2008 22:22:28 -0400
Copied: packages/tags/openyahtzee/1.9-1/debian/clean (from rev 12073, packages/trunk/openyahtzee/debian/clean)
===================================================================
--- packages/tags/openyahtzee/1.9-1/debian/clean (rev 0)
+++ packages/tags/openyahtzee/1.9-1/debian/clean 2011-04-01 14:52:47 UTC (rev 12082)
@@ -0,0 +1 @@
+openyahtzee.xpm
Deleted: packages/tags/openyahtzee/1.9-1/debian/compat
===================================================================
--- packages/trunk/openyahtzee/debian/compat 2011-04-01 11:43:58 UTC (rev 12058)
+++ packages/tags/openyahtzee/1.9-1/debian/compat 2011-04-01 14:52:47 UTC (rev 12082)
@@ -1 +0,0 @@
-5
Copied: packages/tags/openyahtzee/1.9-1/debian/compat (from rev 12069, packages/trunk/openyahtzee/debian/compat)
===================================================================
--- packages/tags/openyahtzee/1.9-1/debian/compat (rev 0)
+++ packages/tags/openyahtzee/1.9-1/debian/compat 2011-04-01 14:52:47 UTC (rev 12082)
@@ -0,0 +1 @@
+7
Deleted: packages/tags/openyahtzee/1.9-1/debian/control
===================================================================
--- packages/trunk/openyahtzee/debian/control 2011-04-01 11:43:58 UTC (rev 12058)
+++ packages/tags/openyahtzee/1.9-1/debian/control 2011-04-01 14:52:47 UTC (rev 12082)
@@ -1,25 +0,0 @@
-Source: openyahtzee
-Section: games
-Priority: extra
-Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
-Uploaders: Barry deFreese <bdefreese at debian.org>
-Build-Depends: autotools-dev, debhelper (>= 5), libsqlite3-dev, libwxgtk2.8-dev, pkg-config
-Standards-Version: 3.8.0
-Homepage: http://openyahtzee.sourceforge.net
-Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/openyahtzee/
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/openyahtzee/?op=log
-
-Package: openyahtzee
-Architecture: any
-Depends: ${shlibs:Depends}
-Description: classic dice game of Yahtzee
- Open Yahtzee is a version of the classic dice game
- Yahtzee. Also known as Knubbel or Pasch.
- .
- Open Yahtzee is built to be a full-featured Yahtzee
- implementation, with a user-friendly interface
- including animated dice rolls.
- .
- For other implementations see the gtali game in the
- gnome-games package.
-
Copied: packages/tags/openyahtzee/1.9-1/debian/control (from rev 12071, packages/trunk/openyahtzee/debian/control)
===================================================================
--- packages/tags/openyahtzee/1.9-1/debian/control (rev 0)
+++ packages/tags/openyahtzee/1.9-1/debian/control 2011-04-01 14:52:47 UTC (rev 12082)
@@ -0,0 +1,30 @@
+Source: openyahtzee
+Section: games
+Priority: extra
+Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
+Uploaders: Barry deFreese <bdefreese at debian.org>
+Build-Depends: debhelper (>= 7.0.50~),
+ dh-autoreconf,
+ autotools-dev,
+ libsqlite3-dev,
+ libwxgtk2.8-dev,
+ pkg-config
+Standards-Version: 3.9.1
+Homepage: http://www.openyahtzee.org/
+Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/openyahtzee/
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/openyahtzee/?op=log
+
+Package: openyahtzee
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: classic dice game of Yahtzee
+ Open Yahtzee is a version of the classic dice game
+ Yahtzee. Also known as Knubbel or Pasch.
+ .
+ Open Yahtzee is built to be a full-featured Yahtzee
+ implementation, with a user-friendly interface
+ including animated dice rolls.
+ .
+ For other implementations see the gtali game in the
+ gnome-games package.
+
Deleted: packages/tags/openyahtzee/1.9-1/debian/copyright
===================================================================
--- packages/trunk/openyahtzee/debian/copyright 2011-04-01 11:43:58 UTC (rev 12058)
+++ packages/tags/openyahtzee/1.9-1/debian/copyright 2011-04-01 14:52:47 UTC (rev 12082)
@@ -1,34 +0,0 @@
-This package was debianized by Zak B. Elep <zakame at spunge.org> on
-Sat, 6 Jan 2007 17:32:28 +0800.
-
-It was downloaded from http://openyahtzee.sourceforge.net
-
-Upstream Author: Guy Rutenberg <guyrutenberg at gmail.com>
-
-Copyright: (from src/openyahtzee.cpp)
-
-/***************************************************************************
- * Copyright (C) 2006 by Guy Rutenberg *
- * guyrutenberg 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. *
- * *
- * 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 `/usr/share/common-licenses/GPL'.
-
-The Debian packaging is (C) 2007, Zak B. Elep <zakame at spunge.org> and
-is licensed under the GPL, see above.
Copied: packages/tags/openyahtzee/1.9-1/debian/copyright (from rev 12070, packages/trunk/openyahtzee/debian/copyright)
===================================================================
--- packages/tags/openyahtzee/1.9-1/debian/copyright (rev 0)
+++ packages/tags/openyahtzee/1.9-1/debian/copyright 2011-04-01 14:52:47 UTC (rev 12082)
@@ -0,0 +1,34 @@
+This package was debianized by Zak B. Elep <zakame at spunge.org> on
+Sat, 6 Jan 2007 17:32:28 +0800.
+
+It was downloaded from http://openyahtzee.sourceforge.net
+
+Upstream Author: Guy Rutenberg <guyrutenberg at gmail.com>
+
+Copyright: (from src/openyahtzee.cpp)
+
+/***************************************************************************
+ * Copyright 2006-2008 by Guy Rutenberg *
+ * guyrutenberg 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. *
+ * *
+ * 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 `/usr/share/common-licenses/GPL-2'.
+
+The Debian packaging is Copyright 2007, Zak B. Elep <zakame at spunge.org> and
+is licensed under the GPL, see above.
Deleted: packages/tags/openyahtzee/1.9-1/debian/install
===================================================================
--- packages/trunk/openyahtzee/debian/install 2011-04-01 11:43:58 UTC (rev 12058)
+++ packages/tags/openyahtzee/1.9-1/debian/install 2011-04-01 14:52:47 UTC (rev 12082)
@@ -1 +0,0 @@
-debian/openyahtzee.desktop usr/share/applications/
Copied: packages/tags/openyahtzee/1.9-1/debian/install (from rev 12073, packages/trunk/openyahtzee/debian/install)
===================================================================
--- packages/tags/openyahtzee/1.9-1/debian/install (rev 0)
+++ packages/tags/openyahtzee/1.9-1/debian/install 2011-04-01 14:52:47 UTC (rev 12082)
@@ -0,0 +1,2 @@
+openyahtzee.xpm usr/share/pixmaps
+debian/openyahtzee.desktop usr/share/applications/
Copied: packages/tags/openyahtzee/1.9-1/debian/manpages (from rev 12069, packages/trunk/openyahtzee/debian/manpages)
===================================================================
--- packages/tags/openyahtzee/1.9-1/debian/manpages (rev 0)
+++ packages/tags/openyahtzee/1.9-1/debian/manpages 2011-04-01 14:52:47 UTC (rev 12082)
@@ -0,0 +1 @@
+debian/openyahtzee.6
Deleted: packages/tags/openyahtzee/1.9-1/debian/menu
===================================================================
--- packages/trunk/openyahtzee/debian/menu 2011-04-01 11:43:58 UTC (rev 12058)
+++ packages/tags/openyahtzee/1.9-1/debian/menu 2011-04-01 14:52:47 UTC (rev 12082)
@@ -1,2 +0,0 @@
-?package(openyahtzee):needs="X11" section="Games/Strategy"\
- title="Open Yahtzee" command="/usr/games/openyahtzee"
Copied: packages/tags/openyahtzee/1.9-1/debian/menu (from rev 12075, packages/trunk/openyahtzee/debian/menu)
===================================================================
--- packages/tags/openyahtzee/1.9-1/debian/menu (rev 0)
+++ packages/tags/openyahtzee/1.9-1/debian/menu 2011-04-01 14:52:47 UTC (rev 12082)
@@ -0,0 +1,6 @@
+?package(openyahtzee):needs="X11" \
+ section="Games/Strategy" \
+ title="Open Yahtzee" \
+ longtitle="The classic dice game Yahtzee" \
+ icon="/usr/share/pixmaps/openyahtzee.xpm" \
+ command="/usr/games/openyahtzee"
Deleted: packages/tags/openyahtzee/1.9-1/debian/openyahtzee.6
===================================================================
--- packages/trunk/openyahtzee/debian/openyahtzee.6 2011-04-01 11:43:58 UTC (rev 12058)
+++ packages/tags/openyahtzee/1.9-1/debian/openyahtzee.6 2011-04-01 14:52:47 UTC (rev 12082)
@@ -1,31 +0,0 @@
-.\" Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH OPENYAHTZEE 6 "January 6, 2007"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh disable hyphenation
-.\" .hy enable hyphenation
-.\" .ad l left justify
-.\" .ad b justify to both left and right margins
-.\" .nf disable filling
-.\" .fi enable filling
-.\" .br insert line break
-.\" .sp <n> insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-openyahtzee \- play a classic game of Yahtzee
-.SH SYNOPSIS
-.B openyahtzee
-.SH DESCRIPTION
-\fBopenyahtzee\fP lets you play a game of Yahtzee.
-.SH OPTIONS
-This program does not accept any options at the moment.
-.SH AUTHOR
-openyahtzee was written by Guy Rutenberg <guyrutenberg at gmail.com>
-.PP
-This manual page was written by Zak B. Elep <zakame at spunge.org>,
-for the Debian project (but may be used by others).
-
Copied: packages/tags/openyahtzee/1.9-1/debian/openyahtzee.6 (from rev 12076, packages/trunk/openyahtzee/debian/openyahtzee.6)
===================================================================
--- packages/tags/openyahtzee/1.9-1/debian/openyahtzee.6 (rev 0)
+++ packages/tags/openyahtzee/1.9-1/debian/openyahtzee.6 2011-04-01 14:52:47 UTC (rev 12082)
@@ -0,0 +1,17 @@
+.\" Hey, EMACS: -*- nroff -*-
+.\" Forwarded: Guy Rutenberg <guyrutenberg at gmail.com>
+.TH OPENYAHTZEE 6 "January 6, 2007"
+.SH NAME
+openyahtzee \- play a classic game of Yahtzee
+.SH SYNOPSIS
+.B openyahtzee
+.SH DESCRIPTION
+\fBopenyahtzee\fP lets you play a game of Yahtzee.
+.SH OPTIONS
+This program does not accept any options at the moment.
+.SH AUTHOR
+openyahtzee was written by Guy Rutenberg <guyrutenberg at gmail.com>
+.PP
+This manual page was written by Zak B. Elep <zakame at spunge.org>,
+for the Debian project (but may be used by others).
+
Deleted: packages/tags/openyahtzee/1.9-1/debian/openyahtzee.desktop
===================================================================
--- packages/trunk/openyahtzee/debian/openyahtzee.desktop 2011-04-01 11:43:58 UTC (rev 12058)
+++ packages/tags/openyahtzee/1.9-1/debian/openyahtzee.desktop 2011-04-01 14:52:47 UTC (rev 12082)
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Open Yahtzee
-GenericName=openyahtzee
-Comment=Roll the dice
-Exec=openyahtzee
-Terminal=false
-Categories=Game;BoardGame;
-
Copied: packages/tags/openyahtzee/1.9-1/debian/openyahtzee.desktop (from rev 12077, packages/trunk/openyahtzee/debian/openyahtzee.desktop)
===================================================================
--- packages/tags/openyahtzee/1.9-1/debian/openyahtzee.desktop (rev 0)
+++ packages/tags/openyahtzee/1.9-1/debian/openyahtzee.desktop 2011-04-01 14:52:47 UTC (rev 12082)
@@ -0,0 +1,11 @@
+# Forwarded: Guy Rutenberg <guyrutenberg at gmail.com>
+[Desktop Entry]
+Type=Application
+Name=Open Yahtzee
+GenericName=Yahtzee
+Comment=The classic dice game Yahtzee
+Exec=openyahtzee
+TryExec=openyahtzee
+Icon=openyahtzee
+Terminal=false
+Categories=Game;BoardGame;
Deleted: packages/tags/openyahtzee/1.9-1/debian/patches/fix-ftbfs-with-new-gcc.patch
===================================================================
--- packages/trunk/openyahtzee/debian/patches/fix-ftbfs-with-new-gcc.patch 2011-04-01 12:59:58 UTC (rev 12067)
+++ packages/tags/openyahtzee/1.9-1/debian/patches/fix-ftbfs-with-new-gcc.patch 2011-04-01 14:52:47 UTC (rev 12082)
@@ -1,51 +0,0 @@
-Author: Paul Wise <pabs at debian.org>
-Description: Fix FTBFS with newer GCC
-Bug-Debian: http://bugs.debian.org/565080
---- a/src/DBwrapper.cpp
-+++ b/src/DBwrapper.cpp
-@@ -96,7 +96,7 @@
- cerr << "sqlite3_compile error:" <<endl;
- cerr << sqlite3_errmsg( m_db ) <<endl;
- cerr << "on insert: " << query <<endl;
-- values = list<string>::list();
-+ values = list<string>();
- } else {
- int busyCnt = 0;
- int number = sqlite3_column_count( stmt );
-@@ -138,7 +138,7 @@
- cerr << "sqlite_step error.\n";
- cerr << sqlite3_errmsg( m_db ) << endl;
- cerr << "on query: " << query << endl;
-- values = list<string>::list();
-+ values = list<string>();
- }
- }
-
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -42,4 +42,4 @@
- openyahtzee.rc
-
- AM_CXXFLAGS = @WX_CXXFLAGS@
--openyahtzee_LDFLAGS = @WX_LIBS@
-+openyahtzee_LDADD = @WX_LIBS@ -ldl
---- a/src/Makefile.in
-+++ b/src/Makefile.in
-@@ -54,7 +54,7 @@
- openyahtzee_OBJECTS = $(am_openyahtzee_OBJECTS)
- openyahtzee_LDADD = $(LDADD)
- openyahtzee_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-- $(openyahtzee_LDFLAGS) $(LDFLAGS) -o $@
-+ $(openyahtzee_LDADD) $(LDFLAGS) -o $@
- DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
-@@ -211,7 +211,7 @@
- openyahtzee.rc
-
- AM_CXXFLAGS = @WX_CXXFLAGS@
--openyahtzee_LDFLAGS = @WX_LIBS@
-+openyahtzee_LDADD = @WX_LIBS@ -ldl
- all: all-am
-
- .SUFFIXES:
Copied: packages/tags/openyahtzee/1.9-1/debian/patches/fix-ftbfs-with-new-gcc.patch (from rev 12080, packages/trunk/openyahtzee/debian/patches/fix-ftbfs-with-new-gcc.patch)
===================================================================
--- packages/tags/openyahtzee/1.9-1/debian/patches/fix-ftbfs-with-new-gcc.patch (rev 0)
+++ packages/tags/openyahtzee/1.9-1/debian/patches/fix-ftbfs-with-new-gcc.patch 2011-04-01 14:52:47 UTC (rev 12082)
@@ -0,0 +1,24 @@
+Author: Paul Wise <pabs at debian.org>
+Description: Fix FTBFS with newer GCC
+Bug-Debian: http://bugs.debian.org/565080
+Forwarded: Guy Rutenberg <guyrutenberg at gmail.com>
+--- a/src/DBwrapper.cpp
++++ b/src/DBwrapper.cpp
+@@ -96,7 +96,7 @@
+ cerr << "sqlite3_compile error:" <<endl;
+ cerr << sqlite3_errmsg( m_db ) <<endl;
+ cerr << "on insert: " << query <<endl;
+- values = list<string>::list();
++ values = list<string>();
+ } else {
+ int busyCnt = 0;
+ int number = sqlite3_column_count( stmt );
+@@ -138,7 +138,7 @@
+ cerr << "sqlite_step error.\n";
+ cerr << sqlite3_errmsg( m_db ) << endl;
+ cerr << "on query: " << query << endl;
+- values = list<string>::list();
++ values = list<string>();
+ }
+ }
+
Deleted: packages/tags/openyahtzee/1.9-1/debian/patches/series
===================================================================
--- packages/trunk/openyahtzee/debian/patches/series 2011-04-01 12:59:58 UTC (rev 12067)
+++ packages/tags/openyahtzee/1.9-1/debian/patches/series 2011-04-01 14:52:47 UTC (rev 12082)
@@ -1 +0,0 @@
-fix-ftbfs-with-new-gcc.patch
Copied: packages/tags/openyahtzee/1.9-1/debian/patches/series (from rev 12072, packages/trunk/openyahtzee/debian/patches/series)
===================================================================
--- packages/tags/openyahtzee/1.9-1/debian/patches/series (rev 0)
+++ packages/tags/openyahtzee/1.9-1/debian/patches/series 2011-04-01 14:52:47 UTC (rev 12082)
@@ -0,0 +1,2 @@
+fix-ftbfs-with-new-gcc.patch
+use-system-sqlite3.patch
Copied: packages/tags/openyahtzee/1.9-1/debian/patches/use-system-sqlite3.patch (from rev 12081, packages/trunk/openyahtzee/debian/patches/use-system-sqlite3.patch)
===================================================================
--- packages/tags/openyahtzee/1.9-1/debian/patches/use-system-sqlite3.patch (rev 0)
+++ packages/tags/openyahtzee/1.9-1/debian/patches/use-system-sqlite3.patch 2011-04-01 14:52:47 UTC (rev 12082)
@@ -0,0 +1,46 @@
+Author: Paul Wise <pabs at debian.org>
+Description: Use the system sqlite3 instead of an embedded copy
+Forwarded: Guy Rutenberg <guyrutenberg at gmail.com>
+--- a/openyahtzee.vcproj
++++ b/openyahtzee.vcproj
+@@ -208,10 +208,6 @@
+ >
+ </File>
+ <File
+- RelativePath=".\src\sqlite\sqlite3.c"
+- >
+- </File>
+- <File
+ RelativePath=".\src\wxDynamicBitmap.cpp"
+ >
+ </File>
+--- a/src/DBwrapper.h
++++ b/src/DBwrapper.h
+@@ -30,7 +30,7 @@
+ to allow to access different kinds of data bases seamlessly
+ */
+
+-#include "sqlite/sqlite3.h"
++#include <sqlite3.h>
+ #include <string>
+ #include <list>
+
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -21,9 +21,7 @@
+ three.xpm \
+ four.xpm \
+ five.xpm \
+- six.xpm \
+- sqlite/sqlite3.c \
+- sqlite/sqlite3.h
++ six.xpm
+
+ # set the include path found by configure
+ AM_CPPFLAGS = $(all_includes)
+@@ -42,4 +40,4 @@
+ openyahtzee.rc
+
+ AM_CXXFLAGS = @WX_CXXFLAGS@
+-openyahtzee_LDFLAGS = @WX_LIBS@
++openyahtzee_LDADD = @WX_LIBS@ -lsqlite3
Deleted: packages/tags/openyahtzee/1.9-1/debian/rules
===================================================================
--- packages/trunk/openyahtzee/debian/rules 2011-04-01 11:43:58 UTC (rev 12058)
+++ packages/tags/openyahtzee/1.9-1/debian/rules 2011-04-01 14:52:47 UTC (rev 12082)
@@ -1,99 +0,0 @@
-#!/usr/bin/make -f
-# -*- makefile -*-
-# debian/rules for openyahtzee
-# Modified by Zak B. Elep <zakame at spunge.org>
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-
-CXXFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CXXFLAGS += -O0
-else
- CXXFLAGS += -O2
-endif
-
-config.status: configure
- dh_testdir
- # Add here commands to configure the package.
- ./configure --host=$(DEB_HOST_GNU_TYPE) \
- --build=$(DEB_BUILD_GNU_TYPE) \
- --prefix=/usr \
- --bindir=\$${prefix}/games \
- CXXFLAGS="$(CXXFLAGS) -fno-strict-aliasing" \
- LDFLAGS="-Wl,-z,defs"
- test -f debian/stamp-configure-openyahtzee || \
- (touch config.h.in && touch stamp-h1 && touch config.h && \
- touch debian/stamp-configure-openyahtzee)
-
-build: build-stamp
-
-build-stamp: config.status
- dh_testdir
-
- # Add here commands to compile the package.
- $(MAKE)
-
- touch $@
-
-clean:
- dh_testdir
- dh_testroot
- rm -f build-stamp
-
- # Add here commands to clean up after the build process.
- [ ! -f Makefile ] || $(MAKE) distclean
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
- cp -f /usr/share/misc/config.sub config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
- cp -f /usr/share/misc/config.guess config.guess
-endif
-
- rm -f debian/stamp-configure-openyahtzee
-
- dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
-
- # Add here commands to install the package into debian/openyahtzee.
- $(MAKE) DESTDIR=$(CURDIR)/debian/openyahtzee install
-
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
- dh_testdir
- dh_testroot
- dh_install
- dh_installchangelogs ChangeLog
- dh_installdocs
- dh_installmenu
- dh_installman debian/openyahtzee.6
- dh_link
- dh_strip
- dh_compress
- dh_fixperms
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
Copied: packages/tags/openyahtzee/1.9-1/debian/rules (from rev 12073, packages/trunk/openyahtzee/debian/rules)
===================================================================
--- packages/tags/openyahtzee/1.9-1/debian/rules (rev 0)
+++ packages/tags/openyahtzee/1.9-1/debian/rules 2011-04-01 14:52:47 UTC (rev 12082)
@@ -0,0 +1,14 @@
+#!/usr/bin/make -f
+
+#export DH_VERBOSE=1
+
+%:
+ dh $@ --parallel --with autotools_dev --with autoreconf
+
+override_dh_auto_configure:
+ rm -rf src/sqlite*
+ dh_auto_configure -- --bindir=/usr/games
+
+override_dh_auto_build:
+ dh_auto_build
+ cp ./src/icon32.xpm openyahtzee.xpm
Deleted: packages/tags/openyahtzee/1.9-1/debian/watch
===================================================================
--- packages/trunk/openyahtzee/debian/watch 2011-04-01 11:43:58 UTC (rev 12058)
+++ packages/tags/openyahtzee/1.9-1/debian/watch 2011-04-01 14:52:47 UTC (rev 12082)
@@ -1,3 +0,0 @@
-version=3
-http://sf.net/openyahtzee/OpenYahtzee-(.+)\.tar\.gz
-
Copied: packages/tags/openyahtzee/1.9-1/debian/watch (from rev 12061, packages/trunk/openyahtzee/debian/watch)
===================================================================
--- packages/tags/openyahtzee/1.9-1/debian/watch (rev 0)
+++ packages/tags/openyahtzee/1.9-1/debian/watch 2011-04-01 14:52:47 UTC (rev 12082)
@@ -0,0 +1,2 @@
+version=3
+http://sf.net/openyahtzee/[Oo]pen[Yy]ahtzee-([\d\.]+)\.tar\.(?:gz|bz2)
More information about the Pkg-games-commits
mailing list