r4319 - in packages/trunk/freecol: . debian debian/patches

Vincent Fourmond fourmond at alioth.debian.org
Tue Oct 2 18:12:55 UTC 2007


Author: fourmond
Date: 2007-10-02 18:12:55 +0000 (Tue, 02 Oct 2007)
New Revision: 4319

Added:
   packages/trunk/freecol/debian/
   packages/trunk/freecol/debian/README.Debian
   packages/trunk/freecol/debian/changelog
   packages/trunk/freecol/debian/compat
   packages/trunk/freecol/debian/control
   packages/trunk/freecol/debian/copyright
   packages/trunk/freecol/debian/dirs
   packages/trunk/freecol/debian/freecol-dist-targz.diff
   packages/trunk/freecol/debian/install
   packages/trunk/freecol/debian/manpages
   packages/trunk/freecol/debian/menu
   packages/trunk/freecol/debian/patches/
   packages/trunk/freecol/debian/patches/00list
   packages/trunk/freecol/debian/patches/10-fix-jar-path.dpatch
   packages/trunk/freecol/debian/patches/15-fix-jar-manifest.dpatch
   packages/trunk/freecol/debian/patches/20-freecol-executable.dpatch
   packages/trunk/freecol/debian/rules
   packages/trunk/freecol/debian/watch
Log:
[svn-inject] Applying Debian modifications to trunk


Property changes on: packages/trunk/freecol/debian
___________________________________________________________________
Name: mergeWithUpstream
   + 1

Added: packages/trunk/freecol/debian/README.Debian
===================================================================
--- packages/trunk/freecol/debian/README.Debian	                        (rev 0)
+++ packages/trunk/freecol/debian/README.Debian	2007-10-02 18:12:55 UTC (rev 4319)
@@ -0,0 +1,6 @@
+freecol for Debian
+------------------
+
+<possible notes regarding this package - if none, delete this file>
+
+ -- Vincent Fourmond <fourmond at debian.org>  Mon, 01 Oct 2007 23:58:51 +0200

Added: packages/trunk/freecol/debian/changelog
===================================================================
--- packages/trunk/freecol/debian/changelog	                        (rev 0)
+++ packages/trunk/freecol/debian/changelog	2007-10-02 18:12:55 UTC (rev 4319)
@@ -0,0 +1,7 @@
+freecol (0.7.2-1) UNRELEASED; urgency=low
+
+  * Initial release (Closes: #444199)
+  * DO NOT UPLOAD THIS PACKAGE, there are still license issues.
+
+ -- Vincent Fourmond <fourmond at debian.org>  Tue, 02 Oct 2007 20:08:07 +0200
+

Added: packages/trunk/freecol/debian/compat
===================================================================
--- packages/trunk/freecol/debian/compat	                        (rev 0)
+++ packages/trunk/freecol/debian/compat	2007-10-02 18:12:55 UTC (rev 4319)
@@ -0,0 +1 @@
+5

Added: packages/trunk/freecol/debian/control
===================================================================
--- packages/trunk/freecol/debian/control	                        (rev 0)
+++ packages/trunk/freecol/debian/control	2007-10-02 18:12:55 UTC (rev 4319)
@@ -0,0 +1,17 @@
+Source: freecol
+Section: contrib/games
+Priority: optional
+Maintainer: Vincent Fourmond <fourmond at debian.org>
+Build-Depends: debhelper (>= 5), dpatch, ant
+Build-Depends-Indep: libhiglayout-java, libwoodstox-java,
+ sun-java6-jdk | sun-java5-jdk
+Standards-Version: 3.7.2
+
+Package: freecol
+Architecture: all
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: an open version of Colonization
+ freecol is a game in the spirit of Civilization but taking place in a
+ colonial background. Colonize a new world, build towns, trade or fight
+ with natives and other European civilizations, trade with your
+ homeland until you're ready to fight for your independance !

Added: packages/trunk/freecol/debian/copyright
===================================================================
--- packages/trunk/freecol/debian/copyright	                        (rev 0)
+++ packages/trunk/freecol/debian/copyright	2007-10-02 18:12:55 UTC (rev 4319)
@@ -0,0 +1,58 @@
+This package was debianized by Vincent Fourmond <fourmond at debian.org> on
+Mon, 01 Oct 2007 23:58:51 +0200.
+
+The original tarball was made downloading the freecol-0.7.2-src.tar.gz
+tarball on http://www.freecol.org/download.html, applying the
+freecol-dist-targz.diff and then using the ant target
+tarDistBundle. Hopefully, this will get included upstream so I won't
+have to bother later on.
+
+Upstream Authors: 
+
+  The FreeCol Team <freecol-developers at lists.sourceforge.net>
+
+Copyright: 
+
+    Copyright (C) 2003-2007 The FreeCol Team
+
+    A number of images are fidel copies of objects in the public
+    domain and are thus not copyrightable (see for instance 
+    http://en.wikipedia.org/wiki/Bridgeman_Art_Library_v._Corel_Corp
+    for more information).
+
+    The font data/fonts/ShadowedBlack.ttf is 
+    Copyright Paul Lloyd <Paul.Lloyd at uwa.edu.au>
+
+    packaging/gentoo/freecol-0.3.0.ebuild is 
+    Copyright 1999-2004 Gentoo Foundation	
+
+License:
+
+    All files except those not copyrightable and
+    data/fonts/ShadowedBlack.ttf are provided under the following
+    conditions:
+
+    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.
+ 
+    You should have received a copy of the GNU General Public License
+    along with this package; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+
+On Debian systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.
+
+ATTENTION !!!
+
+The license for the data/fonts/ShadowedBlack.ttf is not clear yet.
+
+
+The Debian packaging is (C) 2007, Vincent Fourmond <fourmond at debian.org> and
+is licensed under the GPL, see above.

Added: packages/trunk/freecol/debian/dirs
===================================================================
--- packages/trunk/freecol/debian/dirs	                        (rev 0)
+++ packages/trunk/freecol/debian/dirs	2007-10-02 18:12:55 UTC (rev 4319)
@@ -0,0 +1,2 @@
+usr/bin
+usr/sbin

Added: packages/trunk/freecol/debian/freecol-dist-targz.diff
===================================================================
--- packages/trunk/freecol/debian/freecol-dist-targz.diff	                        (rev 0)
+++ packages/trunk/freecol/debian/freecol-dist-targz.diff	2007-10-02 18:12:55 UTC (rev 4319)
@@ -0,0 +1,31 @@
+Index: build.xml
+===================================================================
+--- build.xml	(revision 3092)
++++ build.xml	(working copy)
+@@ -246,6 +246,26 @@
+         </tar>
+     </target>
+ 
++    <!-- A target that builds a 'source' package in the Debian 
++	 of the term,, stripped of all potential legal/building 
++	 problems, such as jars without sources and already built jars,
++	 as those cause problems and are unnecessary for a distribution.
++    -->
++    <target name="tarDistBundle" unless="skip.dist.source" depends="initDist,prepareSourceFiles">
++        <tar destfile="${freecol.release.dir}/${freecol.release.name}-dist-src.tar.gz" compression="gzip">
++            <tarfileset dir="${freecol.release.dir}/source/${freecol.name}" 
++			prefix="${freecol.release.name}"
++			includes="**"
++			excludes="build/**, test/lib/**" />
++	    <tarfileset dir="${basedir}" includes="data/**" 
++			prefix="${freecol.release.name}"
++			excludes="**/.svn/**, data/fonts/Plakat-Fraktur.ttf" 
++			/>
++
++	    <!-- We remove test/lib because there is junit.jar there -->
++        </tar>
++    </target>
++
+     <target name="zipSourceBundle" unless="skip.dist.source" depends="initDist,prepareSourceFiles">
+         <zip destfile="${freecol.release.dir}/${freecol.release.name}-src.zip">
+             <fileset dir="${freecol.release.dir}/base" includes="${freecol.name}/**"/>

Added: packages/trunk/freecol/debian/install
===================================================================
--- packages/trunk/freecol/debian/install	                        (rev 0)
+++ packages/trunk/freecol/debian/install	2007-10-02 18:12:55 UTC (rev 4319)
@@ -0,0 +1,3 @@
+data/* usr/share/games/freecol
+freecol*.jar usr/share/java
+src/freecol usr/games

Added: packages/trunk/freecol/debian/manpages
===================================================================
--- packages/trunk/freecol/debian/manpages	                        (rev 0)
+++ packages/trunk/freecol/debian/manpages	2007-10-02 18:12:55 UTC (rev 4319)
@@ -0,0 +1 @@
+packaging/debian/freecol.6
\ No newline at end of file

Added: packages/trunk/freecol/debian/menu
===================================================================
--- packages/trunk/freecol/debian/menu	                        (rev 0)
+++ packages/trunk/freecol/debian/menu	2007-10-02 18:12:55 UTC (rev 4319)
@@ -0,0 +1,2 @@
+?package(freecol):needs="X11|text|vc|wm" section="Applications/see-menu-manual"\
+  title="freecol" command="/usr/bin/freecol"

Added: packages/trunk/freecol/debian/patches/00list
===================================================================
--- packages/trunk/freecol/debian/patches/00list	                        (rev 0)
+++ packages/trunk/freecol/debian/patches/00list	2007-10-02 18:12:55 UTC (rev 4319)
@@ -0,0 +1,3 @@
+10-fix-jar-path
+15-fix-jar-manifest
+20-freecol-executable
\ No newline at end of file

Added: packages/trunk/freecol/debian/patches/10-fix-jar-path.dpatch
===================================================================
--- packages/trunk/freecol/debian/patches/10-fix-jar-path.dpatch	                        (rev 0)
+++ packages/trunk/freecol/debian/patches/10-fix-jar-path.dpatch	2007-10-02 18:12:55 UTC (rev 4319)
@@ -0,0 +1,29 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 10-fix-jar-path.dpatch by  <fourmond at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix the path of the library jars to match those of the debian
+## DP: packages 
+
+ at DPATCH@
+diff -urNad freecol-0.7.3~svn20071001~/build.xml freecol-0.7.3~svn20071001/build.xml
+--- freecol-0.7.3~svn20071001~/build.xml	2007-10-02 17:21:33.000000000 +0200
++++ freecol-0.7.3~svn20071001/build.xml	2007-10-02 17:24:21.000000000 +0200
+@@ -65,7 +65,7 @@
+         <mkdir dir="${freecol.build.dir}"/>
+         <javac srcdir="${freecol.src.dir}"
+             destdir="${freecol.build.dir}"
+-            classpath="${basedir}/jars/higlayout.jar:${basedir}/jars/jsr173_1.0_api.jar:${basedir}/jars/wstx-lgpl-4.0pr1.jar"
++            classpath="/usr/share/java/higlayout.jar:/usr/share/java/wstx-lgpl.jar"
+             debug="on"
+             optimize="on"
+             deprecation="off"
+@@ -116,7 +116,7 @@
+ 
+     <!-- Compiles the source files and creates a JAR-file. -->
+     <target name="package" depends="init,build" description="Compiles the source files and creates a JAR-file.">
+-        <jar jarfile="${freecol.jar.file}"
++        <jar jarfile="freecol.jar"
+             basedir="${freecol.build.dir}"
+             manifest="${basedir}/src/MANIFEST.MF"
+             includes="net/**, org/**"


Property changes on: packages/trunk/freecol/debian/patches/10-fix-jar-path.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Added: packages/trunk/freecol/debian/patches/15-fix-jar-manifest.dpatch
===================================================================
--- packages/trunk/freecol/debian/patches/15-fix-jar-manifest.dpatch	                        (rev 0)
+++ packages/trunk/freecol/debian/patches/15-fix-jar-manifest.dpatch	2007-10-02 18:12:55 UTC (rev 4319)
@@ -0,0 +1,16 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 15-fix-jar-manifest.dpatch by  <fourmond at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad freecol-0.7.3~svn20071001~/src/MANIFEST.MF freecol-0.7.3~svn20071001/src/MANIFEST.MF
+--- freecol-0.7.3~svn20071001~/src/MANIFEST.MF	2007-10-01 21:40:52.000000000 +0200
++++ freecol-0.7.3~svn20071001/src/MANIFEST.MF	2007-10-02 18:15:37.000000000 +0200
+@@ -1,4 +1,4 @@
+ Manifest-Version: 1.0
+ Created-By: FreeCol Team
+ Main-Class: net.sf.freecol.FreeCol
+-Class-Path: jars/higlayout.jar jars/jsr173_1.0_api.jar jars/wstx-lgpl-4.0pr1.jar
++Class-Path: /usr/share/java/higlayout.jar /usr/share/java/wstx-lgpl.jar


Property changes on: packages/trunk/freecol/debian/patches/15-fix-jar-manifest.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Added: packages/trunk/freecol/debian/patches/20-freecol-executable.dpatch
===================================================================
--- packages/trunk/freecol/debian/patches/20-freecol-executable.dpatch	                        (rev 0)
+++ packages/trunk/freecol/debian/patches/20-freecol-executable.dpatch	2007-10-02 18:12:55 UTC (rev 4319)
@@ -0,0 +1,28 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 20-freecol-executable.dpatch by  <fourmond at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad freecol-0.7.3~svn20071001~/src/freecol freecol-0.7.3~svn20071001/src/freecol
+--- freecol-0.7.3~svn20071001~/src/freecol	1970-01-01 01:00:00.000000000 +0100
++++ freecol-0.7.3~svn20071001/src/freecol	2007-10-02 18:11:49.000000000 +0200
+@@ -0,0 +1,17 @@
++#!/bin/sh
++
++# Script 'greatly inspired' from the one of jabref
++
++# Unless there already is a JAVA_HOME, we detect the presence
++# of either sun 5 or sun 6
++
++if [ -z "$JAVA_HOME" ]
++then
++t=/usr/lib/jvm/java-5-sun && test -d $t && JAVA_HOME=$t
++t=/usr/lib/jvm/java-6-sun && test -d $t && JAVA_HOME=$t
++JAVA=${JAVA_HOME}/jre/bin/java
++fi
++
++export JAVA=${JAVA:=java}
++exec $JAVA -Xmx128M -jar /usr/share/java/freecol.jar --freecol-data \
++    /usr/share/games/freecol "$@"


Property changes on: packages/trunk/freecol/debian/patches/20-freecol-executable.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Added: packages/trunk/freecol/debian/rules
===================================================================
--- packages/trunk/freecol/debian/rules	                        (rev 0)
+++ packages/trunk/freecol/debian/rules	2007-10-02 18:12:55 UTC (rev 4319)
@@ -0,0 +1,52 @@
+#!/usr/bin/make -f
+# Sample debian/rules that uses debhelper.
+# This file is public domain software, originally written by Joey Hess. 
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+include /usr/share/dpatch/dpatch.make
+
+SOURCE_VERSION = $(shell dpkg-parsechangelog | egrep '^Version' | egrep -o '[0-9][^-]+')
+
+build: build-stamp
+build-stamp: patch
+	dh_testdir
+	ant package
+# Then according to current Java policy, we move the freecol.jar file
+# to a versioned one.
+	[ -e freecol-$(SOURCE_VERSION).jar ] || mv freecol.jar freecol-$(SOURCE_VERSION).jar
+	[ -e freecol.jar ] || ln -s freecol-$(SOURCE_VERSION).jar freecol.jar
+	touch build-stamp
+
+clean: clean-patched unpatch
+clean-patched:
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp freecol*.jar
+	ant clean
+	dh_clean
+
+# Build architecture-independent files here.
+binary-indep: build
+# We have nothing to do by default.
+	dh_testdir
+	dh_testroot
+	dh_install
+	dh_installchangelogs
+	dh_installdocs
+	dh_installman
+	dh_link
+	dh_compress
+	dh_fixperms
+	dh_perl -d -V
+	dh_installdeb
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+# Build architecture-dependent files here.
+binary-arch: build
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install


Property changes on: packages/trunk/freecol/debian/rules
___________________________________________________________________
Name: svn:executable
   + *

Added: packages/trunk/freecol/debian/watch
===================================================================
--- packages/trunk/freecol/debian/watch	                        (rev 0)
+++ packages/trunk/freecol/debian/watch	2007-10-02 18:12:55 UTC (rev 4319)
@@ -0,0 +1,22 @@
+# Example watch control file for uscan
+# Rename this file to "watch" and then you can run the "uscan" command
+# to check for upstream updates and more.
+# See uscan(1) for format
+
+# Compulsory line, this is a version 3 file
+version=3
+
+# Uncomment to examine a Webpage 
+# <Webpage URL> <string match>
+#http://www.example.com/downloads.php freecol-(.*)\.tar\.gz
+
+# Uncomment to examine a Webserver directory
+#http://www.example.com/pub/freecol-(.*)\.tar\.gz
+
+# Uncommment to examine a FTP server
+#ftp://ftp.example.com/pub/freecol-(.*)\.tar\.gz debian uupdate
+
+# Uncomment to find new files on sourceforge, for devscripts >= 2.9
+# http://sf.net/freecol/freecol-(.*)\.tar\.gz
+
+




More information about the Pkg-games-commits mailing list