[Pkg-kde-commits] rev 1588 - in branches/kde-3.4.0/packages/kdegames/debian: . patches

Daniel Schepler schepler at costa.debian.org
Fri Aug 26 10:22:45 UTC 2005 

Author: schepler
Date: 2005-08-26 10:22:39 +0000 (Fri, 26 Aug 2005)
New Revision: 1588

Added:
   branches/kde-3.4.0/packages/kdegames/debian/patches/01_kdegames_branch_20050826.diff
Modified:
   branches/kde-3.4.0/packages/kdegames/debian/changelog
   branches/kde-3.4.0/packages/kdegames/debian/control
   branches/kde-3.4.0/packages/kdegames/debian/rules
Log:
Initial kdegames-3.4.2 packaging.


Modified: branches/kde-3.4.0/packages/kdegames/debian/changelog
===================================================================
--- branches/kde-3.4.0/packages/kdegames/debian/changelog	2005-08-26 03:05:02 UTC (rev 1587)
+++ branches/kde-3.4.0/packages/kdegames/debian/changelog	2005-08-26 10:22:39 UTC (rev 1588)
@@ -1,3 +1,13 @@
+kdegames (4:3.4.2-1) unstable; urgency=low
+
+  * New upstream release.
+  * GCC 4.0 transition: Tighten Build-Depends on libarts1-dev and
+    kdelibs4-dev to ensure we get g++-4.0 compiled versions.
+  * Remove obsolete Conflicts/Replaces/Provides against packages not in
+    sarge.
+
+ -- Daniel Schepler <schepler at debian.org>  Fri, 26 Aug 2005 02:25:46 -0700
+
 kdegames (4:3.4.1-1) experimental; urgency=low
 
   * New upstream release.

Modified: branches/kde-3.4.0/packages/kdegames/debian/control
===================================================================
--- branches/kde-3.4.0/packages/kdegames/debian/control	2005-08-26 03:05:02 UTC (rev 1587)
+++ branches/kde-3.4.0/packages/kdegames/debian/control	2005-08-26 10:22:39 UTC (rev 1588)
@@ -1,11 +1,11 @@
 Source: kdegames
-Build-Depends: cdbs (>= 0.4.27), debhelper (>= 4.2.21), autoconf (>= 2.50), automake1.9, libtool, kdelibs4-dev (>= 4:3.4.1), libarts1-dev, groff-base, sharutils, bzip2
+Build-Depends: cdbs (>= 0.4.27), debhelper (>= 4.2.21), autoconf (>= 2.50), automake1.9, libtool, kdelibs4-dev (>= 4:3.4.2), libarts1-dev (>= 1.4.2-1), groff-base, sharutils, bzip2
 Build-Depends-Indep: doxygen, graphviz, gsfonts-x11, qt3-doc, kdelibs4-doc
 Section: games
 Priority: optional
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Daniel Schepler <schepler at debian.org>
-Standards-Version: 3.6.1
+Standards-Version: 3.6.2
 
 Package: kdegames
 Architecture: all
@@ -35,7 +35,6 @@
 Architecture: any
 Section: games
 Depends: ${shlibs:Depends}
-Conflicts: libkdegames
 Description: KDE games library and common files
  This library provides a common infrastructure for several of the
  games in the KDE distribution. Features include standardized menu
@@ -63,9 +62,6 @@
 Architecture: all
 Section: games
 Recommends: kpat | kpoker | lskat
-Replaces: kdecarddecks
-Conflicts: kdecarddecks
-Provides: kdecarddecks
 Description: Card decks for KDE games
  Several different collections of card images for use by KDE games.
 
@@ -150,9 +146,6 @@
 Architecture: any
 Section: games
 Depends: ${shlibs:Depends}
-Conflicts: kjezz
-Replaces: kjezz
-Provides: kjezz
 Description: Jezzball clone for the K Desktop Environment
  This is a clone of the popular Jezzball game originally created by
  Microsoft. Jezzball is one of the rare and simple games requiring
@@ -175,9 +168,6 @@
 Architecture: any
 Section: games
 Depends: ${shlibs:Depends}
-Conflicts: kabalone
-Replaces: kabalone
-Provides: kabalone
 Description: Enolaba board game for KDE
  kenolaba is a simple board strategy game that is played by two
  players. There are red and yellow pieces for each player. Beginning
@@ -192,7 +182,6 @@
 Architecture: any
 Section: games
 Depends: ${shlibs:Depends}
-Replaces: ksirtet (<< 4:3.0.9)
 Description: A KDE clone of the Japanese PuyoPuyo game
  KFouleggs is a clone of the Japanese PuyoPuyo game, with advanced
  features such as multiplayer games against human or AI, and network

Added: branches/kde-3.4.0/packages/kdegames/debian/patches/01_kdegames_branch_20050826.diff
===================================================================
--- branches/kde-3.4.0/packages/kdegames/debian/patches/01_kdegames_branch_20050826.diff	2005-08-26 03:05:02 UTC (rev 1587)
+++ branches/kde-3.4.0/packages/kdegames/debian/patches/01_kdegames_branch_20050826.diff	2005-08-26 10:22:39 UTC (rev 1588)
@@ -0,0 +1,154 @@
+Index: kwin4/kwin4.kdelnk
+===================================================================
+--- kwin4/kwin4.kdelnk	(.../tags/KDE/3.4.2/kdegames)	(revision 453457)
++++ kwin4/kwin4.kdelnk	(.../branches/KDE/3.4/kdegames)	(revision 453457)
+@@ -9,6 +9,7 @@
+ Terminal=0
+ Name=Kwin4
+ Name[bn]=কে-উইন-ফোর
++Name[cy]=KWin4
+ Name[de]=Vier gewinnt
+ Name[eo]=Kvar venkas
+ Name[hi]=के-विन4
+Index: kshisen/app.cpp
+===================================================================
+--- kshisen/app.cpp	(.../tags/KDE/3.4.2/kdegames)	(revision 453457)
++++ kshisen/app.cpp	(.../branches/KDE/3.4/kdegames)	(revision 453457)
+@@ -141,7 +141,6 @@
+ 
+ void App::quitGame()
+ {
+-	delete this;
+ 	kapp->quit();
+ }
+ 
+Index: Makefile.cvs
+===================================================================
+--- Makefile.cvs	(.../tags/KDE/3.4.2/kdegames)	(revision 0)
++++ Makefile.cvs	(.../branches/KDE/3.4/kdegames)	(revision 453457)
+@@ -0,0 +1,16 @@
++
++all: 
++	@echo "This Makefile is only for the CVS repository"
++	@echo "This will be deleted before making the distribution"
++	@echo ""
++	@if test ! -d admin; then \
++	   echo "Please recheckout this module!" ;\
++	   echo "for cvs: use checkout once and after that update again" ;\
++	   echo "for cvsup: checkout kde-common from cvsup and" ;\
++	   echo "   link kde-common/admin to ./admin" ;\
++	   exit 1 ;\
++	fi
++	$(MAKE) -f admin/Makefile.common cvs
++
++.SILENT:
++
+
+Property changes on: Makefile.cvs
+___________________________________________________________________
+Name: svn:keywords
+   + Author Date Id Revision
+
+Index: libkdegames/configure.in.in
+===================================================================
+--- libkdegames/configure.in.in	(.../tags/KDE/3.4.2/kdegames)	(revision 453457)
++++ libkdegames/configure.in.in	(.../branches/KDE/3.4/kdegames)	(revision 453457)
+@@ -21,12 +21,12 @@
+ 
+ AC_MSG_CHECKING(whether to setgid binaries)
+ AC_ARG_ENABLE(setgid,
+-  [  --disable-setgid           Disable the use of setgid binaries],
++  [  --enable-setgid           Enable the use of setgid binaries],
+   [case "${enableval}" in
+     yes) case "$use_highscore_dir" in yes) setgid=true;; no) setgid=false;; esac ;;
+     no)  setgid=false ;;
+     *) AC_MSG_ERROR(bad value ${enableval} for --disable-setgid) ;;
+-   esac],[setgid=true])
++   esac],[setgid=false])
+ AC_SUBST(setgid)
+ AC_MSG_RESULT($setgid)
+ 
+Index: kmines/CHANGELOG
+===================================================================
+--- kmines/CHANGELOG	(.../tags/KDE/3.4.2/kdegames)	(revision 453457)
++++ kmines/CHANGELOG	(.../branches/KDE/3.4/kdegames)	(revision 453457)
+@@ -1,4 +1,10 @@
+-2.1.9 (27 Jun 2004) [KDE 3.3 devel]
++2.1.10 (25 Aug 2005) [KDE 3.5 devel]
++
++2.1.9a (25 Aug 2005) [KDE 3.4.3 stable]
++ * fix constness in solver [reported by Garrett Kajmowicz]
++ * fix bug: cannot load log [reported by Tobias Meyer]
++
++2.1.9 (27 Jun 2004) [KDE 3.3 stable]
+  * fix compilation of solver debugging code.
+  * add missing events
+  * replace case size option by zoom in/zoom out actions
+Index: kmines/status.cpp
+===================================================================
+--- kmines/status.cpp	(.../tags/KDE/3.4.2/kdegames)	(revision 453457)
++++ kmines/status.cpp	(.../branches/KDE/3.4/kdegames)	(revision 453457)
+@@ -421,9 +421,9 @@
+         QDomElement a = actions.item(i).toElement();
+         if ( a.isNull() ) return false;
+         uint i0 = a.attribute("line").toUInt(&ok);
+-        if ( !ok || i0>=w ) return false;
++        if ( !ok || i0>=h ) return false;
+         uint j = a.attribute("column").toUInt(&ok);
+-        if ( !ok || j>=h ) return false;
++        if ( !ok || j>=w ) return false;
+         QString type = a.attribute("type");
+         uint k = 0;
+         for (; k<Field::Nb_Actions; k++)
+Index: kmines/solver/adviseFast.cpp
+===================================================================
+--- kmines/solver/adviseFast.cpp	(.../tags/KDE/3.4.2/kdegames)	(revision 453457)
++++ kmines/solver/adviseFast.cpp	(.../branches/KDE/3.4/kdegames)	(revision 453457)
+@@ -124,7 +124,7 @@
+ 	autorevealed.insert(point);
+ 	affectedFacts->insert(autorevealed.begin(), autorevealed.end());
+ 
+-	CoordSet::iterator i, j;
++	CoordSet::const_iterator i;
+ 	for(i=autorevealed.begin(); i!=autorevealed.end(); ++i)
+ 	{
+ 		// I still think that each poing will belong to
+@@ -134,7 +134,7 @@
+ 			CoordSet const &affF = _containingFacts[*i];
+ 			affectedFacts->insert(
+ 				affF.begin(), affF.end());
+-			for(	j=affF.begin();
++			for(CoordSet::const_iterator j=affF.begin();
+ 				j!=affF.end();
+ 				++j)
+ 			{
+@@ -165,8 +165,7 @@
+ 	if(_containingFacts.count(point)){
+ 		CoordSet const &affF = _containingFacts[point];
+ 		affectedFacts->insert(affF.begin(), affF.end());
+-		CoordSet::iterator i;
+-		for(i=affF.begin(); i!=affF.end(); ++i){
++		for(CoordSet::const_iterator i=affF.begin(); i!=affF.end(); ++i){
+ 			(*this)[*i].pointSet.erase(point);
+ 			(*this)[*i].mines--;
+ 			if((*this)[*i].pointSet.empty())
+Index: kmines/version.h
+===================================================================
+--- kmines/version.h	(.../tags/KDE/3.4.2/kdegames)	(revision 453457)
++++ kmines/version.h	(.../branches/KDE/3.4/kdegames)	(revision 453457)
+@@ -1,5 +1,5 @@
+-#define VERSION	     "2.1.9"
+-#define LONG_VERSION "2.1.9 (5 Aug 2004)"
+-#define COPYLEFT     "(c) 1996-2004, Nicolas Hadacek\n(c) 2001, Mikhail Kourinny"
++#define VERSION	     "2.1.9a"
++#define LONG_VERSION "2.1.9a (25 Aug 2005)"
++#define COPYLEFT     "(c) 1996-2005, Nicolas Hadacek\n(c) 2001, Mikhail Kourinny"
+ #define EMAIL        "hadacek at kde.org"
+ #define HOMEPAGE     "http://kmines.sourceforge.net/"
+
+Property changes on: .
+___________________________________________________________________
+Name: svn:externals
+   + admin https://svn.kde.org/home/kde/branches/KDE/3.4/kde-common/admin
+
+

Modified: branches/kde-3.4.0/packages/kdegames/debian/rules
===================================================================
--- branches/kde-3.4.0/packages/kdegames/debian/rules	2005-08-26 03:05:02 UTC (rev 1587)
+++ branches/kde-3.4.0/packages/kdegames/debian/rules	2005-08-26 10:22:39 UTC (rev 1588)
@@ -23,7 +23,7 @@
 	cp -f /usr/share/libtool/ltmain.sh $(DEB_SRCDIR)/admin/ltmain.sh
 	for f in /usr/share/automake-1.9/*; do \
 		if test -f $$f && ! test -L $$f && \
-			test $(DEB_SRCDIR)/admin/`basename $$f`; then \
+			test -f $(DEB_SRCDIR)/admin/`basename $$f`; then \
 			cp -f $$f $(DEB_SRCDIR)/admin/; \
 		fi; \
 	done

More information about the Pkg-kde-commits mailing list