The following commit has been merged in the master branch:
commit 96fd6fb2e69385a2d09fc96185ee4dad9c4ca40d
Author: Devid Antonio Filoni <dfiloni at debian.(none)>
Date: Sun Aug 2 22:36:02 2009 +0200
crystalspace (1.4.0~svn32711-1)
* New upstream svn revision 32711.
* debian/control: add myself to Uploaders field.
* debian/rules: don't use --without-java during build.
* debian/control: add jam to Build-Depends field.
* Update debian/patches/csstartme_startme_cfg_programs.diff patch.
* debian/rules: update get-orig-source to generate a tarball from svn.
* debian/rules: do not depend on excutable bit.
* Fix quilt-patch-missing-description lintian info.
diff --git a/debian/changelog b/debian/changelog
index 7904162..b5c7013 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+crystalspace (1.4.0~svn32711-1) unstable; urgency=low
+
+ * New upstream svn revision 32711.
+ * debian/control: add myself to Uploaders field.
+ * debian/rules: don't use --without-java during build.
+ * debian/control: add jam to Build-Depends field.
+ * Update debian/patches/csstartme_startme_cfg_programs.diff patch.
+ * debian/rules: update get-orig-source to generate a tarball from svn.
+ * debian/rules: do not depend on excutable bit.
+ * Fix quilt-patch-missing-description lintian info.
+
+ -- Devid Antonio Filoni <d.filoni at ubuntu.com> Sun, 02 Aug 2009 21:41:26 +0200
+
crystalspace (1.2.1-2) unstable; urgency=low
* Build-depends on libode-dev instead of libode0-dev (Closes: #520729)
diff --git a/debian/control b/debian/control
index ff9447e..5d655d7 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: devel
Priority: optional
Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
Uploaders: Christian Bayle <bayle at debian.org>, Barry deFreese
- <bdefreese at debian.org>
+ <bdefreese at debian.org>, Devid Antonio Filoni <d.filoni at ubuntu.com>
Build-Depends: python-support (>= 0.4), debhelper(>= 5), nasm (>= 0.98.08),
lib3ds-dev (>= 1.2.0), libogg-dev (>= 1.0rc2), libmikmod2-dev,
libvorbis-dev (>>1.0.0), docbook-to-man, libgl1-mesa-dev, zip,
@@ -11,7 +11,7 @@ Build-Depends: python-support (>= 0.4), debhelper(>= 5), nasm (>= 0.98.08),
libopenal-dev, libalut-dev, libcal3d-dev, swig, dh-buildinfo, flex,
bison, texinfo, doxygen, gs-common, glutg3-dev, libmng-dev, libsdl1.2-dev,
autoconf, libx11-dev, libxext-dev, libxxf86vm-dev, libcaca-dev,
- libwxgtk2.8-dev, libcegui-mk2-dev, quilt
+ libwxgtk2.8-dev, libcegui-mk2-dev, jam, quilt
Standards-Version: 3.8.2
Homepage: http://www.crystalspace3d.org
Vcs-Git: git://git.debian.org/git/pkg-games/crystalspace.git
diff --git a/debian/patches/csstartme_startme_cfg_programs.diff b/debian/patches/csstartme_startme_cfg_programs.diff
index d8b8aae..0c2f1e0 100644
--- a/debian/patches/csstartme_startme_cfg_programs.diff
+++ b/debian/patches/csstartme_startme_cfg_programs.diff
@@ -1,8 +1,8 @@
#Fix startme.cfg file.
-Index: crystalspace-1.2.1/CS/data/config/startme.cfg
+Index: crystalspace-1.4~svn32365/CS/data/config-app/startme.cfg
===================================================================
---- crystalspace-1.2.1.orig/CS/data/config/startme.cfg 2008-07-12 12:23:09.000000000 +0200
-+++ crystalspace-1.2.1/CS/data/config/startme.cfg 2008-07-12 12:23:49.000000000 +0200
+--- crystalspace-1.4~svn32365.orig/CS/data/config-app/startme.cfg 2008-07-12 12:23:09.000000000 +0200
++++ crystalspace-1.4~svn32365/CS/data/config-app/startme.cfg 2008-07-12 12:23:49.000000000 +0200
@@ -19,72 +19,45 @@
StartMe.0.desc.2 = doesn't support parallax.
StartMe.0.image = startme_walktest.jpg
diff --git a/debian/patches/sparc_defined_prev_in_CompareAndSet.diff b/debian/patches/sparc_defined_prev_in_CompareAndSet.diff
index eb07d23..fd54c5a 100644
--- a/debian/patches/sparc_defined_prev_in_CompareAndSet.diff
+++ b/debian/patches/sparc_defined_prev_in_CompareAndSet.diff
@@ -1,3 +1,4 @@
+#CompareAndSet doesn't return an undef value on SPARC anymore
Index: crystalspace/CS/include/csutil/threading/atomicops_sparc.h
===================================================================
--- crystalspace.orig/CS/include/csutil/threading/atomicops_sparc.h 2009-07-07 23:58:23.000000000 +0200
diff --git a/debian/rules b/debian/rules
index 29bdc41..b6fdd3a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,7 +9,8 @@
include /usr/share/quilt/quilt.make
DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
-VERSION = $(shell head -n1 debian/changelog | sed -e 's/.*(//;s/-.*).*//')
+VERSION = 1.4.0
+REVISION = 32711
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
@@ -46,7 +47,7 @@ endif
#PYTHON = --without-python
CPUOPTIM = --enable-cpu-specific-optimizations=no
CONFDIR = --prefix=/usr --sysconfdir=/etc
-JAVA = --without-java
+#JAVA = --without-java
# Add here commands to compile the package.
# For arm, powerpc, s390 and SPARC
@@ -98,16 +99,12 @@ endif
# Don't support until this is dynamic lib
# --enable-meta-info-embedding was by default before (enbed .csplugin info)
perl -pi -e "s:\[crystal\]:\[crystalspace\]:" $(CURDIR)/CS/configure.ac
- cd CS; ./bin/autogen.sh ; cs_cv_prog_cxx_local_include=no ./configure $(CONFDIR) $(CPUOPTIM) $(PYTHON) $(CONFFLAG) $(JAVA)
+ cd CS; sh bin/autogen.sh ; cs_cv_prog_cxx_local_include=no sh configure $(CONFDIR) $(CPUOPTIM) $(PYTHON) $(CONFFLAG) $(JAVA)
# Install as much as possible
#perl -pi -e "s/#TO_INSTALL/TO_INSTALL/" $(CURDIR)/CS/cache.mak
- # Activating scripts
- chmod +x $(CURDIR)/debian/createmenus
- #chmod +x $(CURDIR)/debian/addmissing
- chmod +x $(CURDIR)/debian/automan
# Creating menus
- $(CURDIR)/debian/createmenus $(CURDIR)
+ sh $(CURDIR)/debian/createmenus $(CURDIR)
touch configure-stamp
@@ -209,7 +206,7 @@ install-arch:
$(CURDIR)/debian/crystalspace/usr/share/pixmaps
# Autogenerate man
- $(CURDIR)/debian/automan $(CURDIR)
+ sh $(CURDIR)/debian/automan $(CURDIR)
$(CURDIR)/debian/rules man
rm -f $(CURDIR)/debian/man/*.sgml.?
# dh_installman -p crystalspace-demos $(CURDIR)/debian/man/*.6
@@ -271,14 +268,12 @@ binary-arch: build-arch install-arch
$(MAKE) -f debian/rules DH_OPTIONS=-a binary-common
get-orig-source:
- @cd ..; \
- wget http://www.crystalspace3d.org/downloads/release/crystalspace-src-${VERSION}.tar.bz2; \
- tar fjx crystalspace-src-${VERSION}.tar.bz2; \
- rm -f fjx crystalspace-src-${VERSION}.tar.bz2; \
- mkdir crystalspace-${VERSION}.orig; \
- mv crystalspace-src-${VERSION} crystalspace-${VERSION}.orig/CS; \
- tar --exclude=crystalspace-${VERSION}.orig/CS/svn-commit*.tmp -czf crystalspace_${VERSION}.orig.tar.gz crystalspace-${VERSION}.orig; \
- rm -rf crystalspace-${VERSION}.orig
+ @cd $(CURDIR); \
+ svn co -r ${REVISION} https://crystal.svn.sourceforge.net/svnroot/crystal/CS/branches/release/V1.4 \
+ crystalspace-${VERSION}~svn${REVISION}/CS; \
+ tar --exclude=*.svn -cf ../crystalspace_${VERSION}~svn${REVISION}.orig.tar crystalspace-${VERSION}~svn${REVISION}; \
+ rm -rf crystalspace-${VERSION}~svn${REVISION}; \
+ gzip -9nf ../crystalspace_${VERSION}~svn${REVISION}.orig.tar;
binary: binary-arch binary-indep
.PHONY: build clean binary-indep binary-arch binary install install-indep install-arch configure
--
Multiplatform 3D Game Development Kit