r15179 - in packages/trunk/crystalspace/debian: . patches
Markus Koschany
apo-guest at moszumanska.debian.org
Wed Sep 3 11:12:55 UTC 2014
Author: apo-guest
Date: 2014-09-03 11:12:54 +0000 (Wed, 03 Sep 2014)
New Revision: 15179
Added:
packages/trunk/crystalspace/debian/crystalspace-data.maintscript
packages/trunk/crystalspace/debian/patches/wx3.0-compat.patch
Removed:
packages/trunk/crystalspace/debian/source.lintian-overrides
Modified:
packages/trunk/crystalspace/debian/changelog
packages/trunk/crystalspace/debian/control
packages/trunk/crystalspace/debian/copyright
packages/trunk/crystalspace/debian/patches/invocation_errors.patch
packages/trunk/crystalspace/debian/patches/series
packages/trunk/crystalspace/debian/rules
Log:
Debian release 2.0+dfsg-2
Modified: packages/trunk/crystalspace/debian/changelog
===================================================================
--- packages/trunk/crystalspace/debian/changelog 2014-09-02 20:53:55 UTC (rev 15178)
+++ packages/trunk/crystalspace/debian/changelog 2014-09-03 11:12:54 UTC (rev 15179)
@@ -1,9 +1,27 @@
-crystalspace (2.0+dfsg-2) UNRELEASED; urgency=low
+crystalspace (2.0+dfsg-2) unstable; urgency=medium
- * Correct Vcs-* URLs to point to anonscm.debian.org
+ * Team upload.
+ * Remove optional build-dependency on liblcms-dev since it is only useful
+ for OpenBSD. (Closes: #757826)
+ * Remove optional build-dependency on libmng-dev since it is currently not
+ used anyway. (Closes: #757173)
+ * Add crystalspace-data.maintscript and remove obsolete conffile
+ /etc/crystalspace-1.4/vfs.cfg. (Closes: #726181)
+ * wrap-and-sort -sa.
+ * Declare compliance with Debian Policy 3.9.5.
+ * Use canonical VCS fields.
+ * Remove source.lintian-overrides. Fix outdated autotools helper files
+ by building with autotools_dev instead.
- -- Evgeni Golov <evgeni at debian.org> Mon, 15 Jul 2013 22:21:16 +0200
+ -- Markus Koschany <apo at gambaru.de> Tue, 02 Sep 2014 21:44:08 +0200
+crystalspace (2.0+dfsg-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload at maintainer's request.
+ * Update to use wxWidgets 3.0 (new patch: wx3.0-compat.patch).
+
+ -- Olly Betts <olly at survex.com> Fri, 25 Jul 2014 10:57:19 +1200
+
crystalspace (2.0+dfsg-1) unstable; urgency=low
* Team upload.
@@ -129,7 +147,7 @@
* Pass CFLAGS as a env var, config.mak is not sourced anymore during the
build (Closes: #524764)
* CompareAndSet doesn't return an undef value on SPARC anymore
- + add sparc_defined_prev_in_CompareAndSet.diff
+ + add sparc_defined_prev_in_CompareAndSet.diff
* atomicops_sparc.h uses some SPARCv9 instructions, add -Wa,-xarch=v8plus
to CFLAGS to be sure gcc accept them
* Bump standard version to 3.8.2, no change
@@ -191,7 +209,7 @@
crystalspace (1.2-20080112-1) unstable; urgency=low
- * Don't install man when there is no man
+ * Don't install man when there is no man
-- Christian Bayle <bayle at debian.org> Sat, 12 Jan 2008 22:05:23 +0100
@@ -232,13 +250,13 @@
* Fix FTBFS: path problem (Closes: #399843)
* Do not know how to convert to IEEE floats, fixed upstream (Closes: #358044)
* Changed python dependancy for python-support (Closes: #380792)
- * Renamed startme to csstartme (Closes: #401421) filename namespace pollution
+ * Renamed startme to csstartme (Closes: #401421) filename namespace pollution
-- Christian Bayle <bayle at debian.org> Mon, 7 May 2007 21:18:42 +0200
crystalspace (0.99-20060125-2) unstable; urgency=low
- * added build-depends on libalut-dev (Closes: #359292)
+ * added build-depends on libalut-dev (Closes: #359292)
* Applied patch FTBFS: Unmatched in regex (Closes: #359255)
-- Christian Bayle <bayle at debian.org> Wed, 5 Apr 2006 23:26:39 +0200
@@ -267,7 +285,7 @@
crystalspace (0.98-20040623-2) unstable; urgency=low
- * Corrected make disclean that was making fail most autobuild
+ * Corrected make disclean that was making fail most autobuild
-- Christian Bayle <bayle at debian.org> Thu, 24 Jun 2004 23:01:26 +0200
@@ -283,7 +301,7 @@
crystalspace (0.96-20030912-7) unstable; urgency=low
- * Removed support of libode an lib3ds for s390
+ * Removed support of libode an lib3ds for s390
-- Christian Bayle <bayle at debian.org> Sat, 18 Oct 2003 23:41:20 +0200
@@ -321,7 +339,7 @@
crystalspace (0.96-20030912-2) unstable; urgency=low
- * Added a dependancy on swig and make swigpygen
+ * Added a dependancy on swig and make swigpygen
* Corrected a typo not to build lib3ds stuffs on hppa
* Removed blocks from menu (this is not part of CS cvs now)
@@ -339,7 +357,7 @@
crystalspace (0.96-20030714-2) unstable; urgency=low
- * Stupid error in configure options
+ * Stupid error in configure options
-- Christian Bayle <bayle at debian.org> Mon, 14 Jul 2003 21:02:15 +0200
@@ -360,13 +378,13 @@
* Readd 3ds support, since I NMUed lib3ds to compile with -fPIC on hppa
and alpha, hope this will (Closes: bug#198921)
- * Don't try to rmdir a symlink (Closes: bug#198776)
+ * Don't try to rmdir a symlink (Closes: bug#198776)
-- Christian Bayle <bayle at debian.org> Wed, 9 Jul 2003 18:13:05 +0200
crystalspace (0.96-20030609-3) unstable; urgency=low
- * Added a symlink test before rmdir (Closes: bug#198776)
+ * Added a symlink test before rmdir (Closes: bug#198776)
-- Christian Bayle <bayle at debian.org> Wed, 25 Jun 2003 23:22:02 +0200
@@ -392,7 +410,7 @@
crystalspace (0.96-20030205-4) unstable; urgency=low
- * Hope to fix the remaining mixture of PIC and non PIC for build on hppa
+ * Hope to fix the remaining mixture of PIC and non PIC for build on hppa
-- Christian Bayle <bayle at debian.org> Thu, 27 Feb 2003 21:46:28 +0100
@@ -466,7 +484,7 @@
crystalspace (0.94-20020412-3) unstable; urgency=low
- * I completly missed version numbering to 2001 instead of 2002
+ * I completly missed version numbering to 2001 instead of 2002
-- Christian Bayle <bayle at aist.enst.fr> Wed, 13 Feb 2002 08:31:56 +0100
@@ -483,7 +501,7 @@
* Added suggested changes proposed by Gerhard Tonn <GerhardTonn at swol.de>
to support s390 (Closes: bug#142404)
- * Renaming picview in cspicview because of name conflict with picview
+ * Renaming picview in cspicview because of name conflict with picview
package (Closes: bug#141198)
* New upstream
@@ -492,7 +510,7 @@
crystalspace (0.93-20020318-8) unstable; urgency=low
* Changed svgalibg1-dev dependancy to try to get autobuilders happy
- * I won't upload package daily when everything will compile on
+ * I won't upload package daily when everything will compile on
all platforms (Closes: bug#140851)
-- Christian Bayle <bayle at aist.enst.fr> Wed, 13 Feb 2002 08:31:56 +0100
@@ -558,7 +576,7 @@
* Added hints in menu
* Added missing build dependencies
- * Force compiling with i386
+ * Force compiling with i386
-- Christian Bayle <bayle at aist.enst.fr> Mon, 3 Dec 2001 17:52:23 +0100
@@ -569,7 +587,7 @@
* -Moved dev binary to /usr/bin
* -Moved includes to /usr/include/crystalspace
* Added man generator (Not all binaries yet)
- * Added menus for software or opengl rendering
+ * Added menus for software or opengl rendering
-- Christian Bayle <bayle at aist.enst.fr> Mon, 26 Nov 2001 10:22:33 +0100
@@ -582,7 +600,7 @@
crystalspace (0.90-2) unstable; urgency=low
- * Added more appli in menus
+ * Added more appli in menus
-- Christian Bayle <bayle at aist.enst.fr> Mon, 19 Nov 2001 22:35:02 +0100
Modified: packages/trunk/crystalspace/debian/control
===================================================================
--- packages/trunk/crystalspace/debian/control 2014-09-02 20:53:55 UTC (rev 15178)
+++ packages/trunk/crystalspace/debian/control 2014-09-03 11:12:54 UTC (rev 15179)
@@ -2,26 +2,61 @@
Section: libs
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>, Devid Antonio Filoni <d.filoni at ubuntu.com>
-Build-Depends: debhelper (>= 7.2.6), dpkg-dev (>= 1.16.1~), lib3ds-dev, autoconf,
- libogg-dev, libjpeg-dev, libfreetype6-dev, zlib1g-dev, libode-dev
- | libode0-dev, libopenal-dev, libcal3d-dev, swig, flex, bison, doxygen,
- libmng-dev, libsdl1.2-dev, libx11-dev, libcaca-dev, libwxgtk2.8-dev,
- libcegui-mk2-dev, python-dev, libcppunit-dev,
- libasound-dev [ linux-any ], liblcms-dev, libcairo-dev, libcairomm-1.0-dev,
- libgtk2.0-dev, jam, libgl1-mesa-dev | libgl-dev, libvorbis-dev,
- libxxf86vm-dev, libxaw7-dev, default-jdk, libpng-dev
-Standards-Version: 3.9.4
+Uploaders:
+ Christian Bayle <bayle at debian.org>,
+ Barry deFreese <bdefreese at debian.org>,
+ Devid Antonio Filoni <d.filoni at ubuntu.com>
+Build-Depends:
+ autoconf,
+ autotools-dev,
+ bison,
+ debhelper (>= 7),
+ default-jdk,
+ doxygen,
+ dpkg-dev (>= 1.16.1~),
+ flex,
+ jam,
+ lib3ds-dev,
+ libasound-dev [ linux-any ],
+ libcaca-dev,
+ libcairo-dev,
+ libcairomm-1.0-dev,
+ libcal3d-dev,
+ libcegui-mk2-dev,
+ libcppunit-dev,
+ libfreetype6-dev,
+ libgl1-mesa-dev | libgl-dev,
+ libgtk2.0-dev,
+ libjpeg-dev,
+ libode-dev | libode0-dev,
+ libogg-dev,
+ libopenal-dev,
+ libpng-dev,
+ libsdl1.2-dev,
+ libvorbis-dev,
+ libwxgtk3.0-dev,
+ libx11-dev,
+ libxaw7-dev,
+ libxxf86vm-dev,
+ python-dev,
+ swig,
+ zlib1g-dev
+Standards-Version: 3.9.5
Homepage: http://www.crystalspace3d.org/main/Main_Page
Vcs-Svn: svn://anonscm.debian.org/pkg-games/packages/trunk/crystalspace/
Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-games/packages/trunk/crystalspace/
Package: libcrystalspace-2.0
Architecture: amd64 armel i386 kfreebsd-amd64 kfreebsd-i386 powerpc sparc
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: crystalspace (<< 1.4.0-1), libcrystalspace (<< 1.4.0+dfsg-2)
-Breaks: crystalspace (<< 1.4.0-1), libcrystalspace (<< 1.4.0+dfsg-2)
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends}
+Replaces:
+ crystalspace (<< 1.4.0-1),
+ libcrystalspace (<< 1.4.0+dfsg-2)
+Breaks:
+ crystalspace (<< 1.4.0-1),
+ libcrystalspace (<< 1.4.0+dfsg-2)
Description: Multiplatform 3D Game Development Kit
Crystal Space is a free 3D game toolkit. It can be used for a variety
of 3D visualization tasks. Many people will probably be interested in using
@@ -30,9 +65,14 @@
Package: libcrystalspace-dev
Section: libdevel
Architecture: amd64 armel i386 kfreebsd-amd64 kfreebsd-i386 powerpc sparc
-Depends: ${shlibs:Depends}, ${misc:Depends}, libcrystalspace-2.0 (= ${binary:Version})
-Replaces: crystalspace-dev
-Conflicts: crystalspace-dev
+Depends:
+ libcrystalspace-2.0 (= ${binary:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends}
+Replaces:
+ crystalspace-dev
+Conflicts:
+ crystalspace-dev
Description: Multiplatform 3D Game Development Kit (development files)
Crystal Space is a free 3D game toolkit. It can be used for a variety
of 3D visualization tasks. Many people will probably be interested in using
@@ -44,7 +84,9 @@
Section: debug
Priority: extra
Architecture: amd64 armel i386 kfreebsd-amd64 kfreebsd-i386 powerpc sparc
-Depends: ${misc:Depends}, libcrystalspace-2.0 (= ${binary:Version})
+Depends:
+ libcrystalspace-2.0 (= ${binary:Version}),
+ ${misc:Depends}
Description: Multiplatform 3D Game Development Kit (debugging files)
Crystal Space is a free 3D game toolkit. It can be used for a variety
of 3D visualization tasks. Many people will probably be interested in using
@@ -54,8 +96,12 @@
Package: crystalspace
Architecture: amd64 armel i386 kfreebsd-amd64 kfreebsd-i386 powerpc sparc
-Depends: ${shlibs:Depends}, ${misc:Depends}, crystalspace-data
- (= ${source:Version}), libcrystalspace-2.0 (= ${binary:Version})
+Depends:
+ crystalspace-data
+ (= ${source:Version}),
+ libcrystalspace-2.0 (= ${binary:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends}
Description: Multiplatform 3D Game Development Kit (binaries)
Crystal Space is a free 3D game toolkit. It can be used for a variety
of 3D visualization tasks. Many people will probably be interested in using
@@ -65,9 +111,12 @@
Package: crystalspace-data
Architecture: all
-Depends: ${misc:Depends}
-Replaces: crystalspace (<< 1.4.0-1)
-Breaks: crystalspace (<< 1.4.0-1)
+Depends:
+ ${misc:Depends}
+Replaces:
+ crystalspace (<< 1.4.0-1)
+Breaks:
+ crystalspace (<< 1.4.0-1)
Description: Multiplatform 3D Game Development Kit (data files)
Crystal Space is a free 3D game toolkit. It can be used for a variety
of 3D visualization tasks. Many people will probably be interested in using
@@ -78,7 +127,8 @@
Package: crystalspace-doc
Section: doc
Architecture: all
-Depends: ${misc:Depends}
+Depends:
+ ${misc:Depends}
Description: documentation for Crystal Space
Crystal Space is a free 3D game toolkit. It can be used for a variety
of 3D visualization tasks. Many people will probably be interested in using
Modified: packages/trunk/crystalspace/debian/copyright
===================================================================
--- packages/trunk/crystalspace/debian/copyright 2014-09-02 20:53:55 UTC (rev 15178)
+++ packages/trunk/crystalspace/debian/copyright 2014-09-03 11:12:54 UTC (rev 15179)
@@ -97,7 +97,7 @@
Copyright (C) 2010 Devid Antonio Filoni <d.filoni at ubuntu.com>
-and is licensed under the GPL version 2,
+and is licensed under the GPL version 2,
see `/usr/share/common-licenses/GPL-2'.
Added: packages/trunk/crystalspace/debian/crystalspace-data.maintscript
===================================================================
--- packages/trunk/crystalspace/debian/crystalspace-data.maintscript (rev 0)
+++ packages/trunk/crystalspace/debian/crystalspace-data.maintscript 2014-09-03 11:12:54 UTC (rev 15179)
@@ -0,0 +1 @@
+rm_conffile /etc/crystalspace-1.4/vfs.cfg 2.0+dfsg-2~ crystalspace-data
Modified: packages/trunk/crystalspace/debian/patches/invocation_errors.patch
===================================================================
--- packages/trunk/crystalspace/debian/patches/invocation_errors.patch 2014-09-02 20:53:55 UTC (rev 15178)
+++ packages/trunk/crystalspace/debian/patches/invocation_errors.patch 2014-09-03 11:12:54 UTC (rev 15179)
@@ -1,3 +1,5 @@
+Author: Barry deFreese <bdefreese at debian.org>
+Description: Fix Foo() -> this->Foo().
Index: crystalspace-2.0+dfsg/include/csutil/blockallocator.h
===================================================================
--- crystalspace-2.0+dfsg.orig/include/csutil/blockallocator.h 2012-07-02 06:12:08.000000000 -0400
Modified: packages/trunk/crystalspace/debian/patches/series
===================================================================
--- packages/trunk/crystalspace/debian/patches/series 2014-09-02 20:53:55 UTC (rev 15178)
+++ packages/trunk/crystalspace/debian/patches/series 2014-09-03 11:12:54 UTC (rev 15179)
@@ -3,3 +3,4 @@
sparc_defined_prev_in_CompareAndSet.diff
default_walktest_parallaxtest.diff
csstartme_startme_cfg_programs.diff
+wx3.0-compat.patch
Added: packages/trunk/crystalspace/debian/patches/wx3.0-compat.patch
===================================================================
--- packages/trunk/crystalspace/debian/patches/wx3.0-compat.patch (rev 0)
+++ packages/trunk/crystalspace/debian/patches/wx3.0-compat.patch 2014-09-03 11:12:54 UTC (rev 15179)
@@ -0,0 +1,48 @@
+Description: Fix to build with wxwidgets3.0
+Author: Olly Betts <olly at survex.com>
+Last-Update: 2014-06-14
+
+--- crystalspace-2.0+dfsg.orig/plugins/video/canvas/wxgl/GLWXDriver2D.cpp
++++ crystalspace-2.0+dfsg/plugins/video/canvas/wxgl/GLWXDriver2D.cpp
+@@ -292,7 +292,7 @@ bool csGraphics2DWX::Open()
+ {
+ Display* dpy = (Display*) wxGetDisplay ();
+ GLXContext active_GLContext = glXGetCurrentContext();
+- XVisualInfo *xvis = (XVisualInfo*)theCanvas->m_vi;
++ XVisualInfo *xvis = theCanvas->GetXVisualInfo();
+
+ Report (CS_REPORTER_SEVERITY_NOTIFY, "Video driver GL/X version %s",
+ glXIsDirect (dpy, active_GLContext) ? "(direct renderer)" :
+@@ -705,8 +705,8 @@ static bool wxCodeToCSCode(int wxkey, ut
+ MAP (MENU, CONTEXT, CONTEXT)
+ MAP (PAUSE, PAUSE, PAUSE)
+ MAP (CAPITAL, CAPSLOCK, CAPSLOCK)
+- MAP (PRIOR, PGUP, PGUP)
+- MAP (NEXT, PGDN, PGDN)
++ MAP (PAGEUP, PGUP, PGUP)
++ MAP (PAGEDOWN, PGDN, PGDN)
+ MAP (END, END, END)
+ MAP (HOME, HOME, HOME)
+ MAP (LEFT, LEFT, LEFT)
+@@ -722,10 +722,7 @@ static bool wxCodeToCSCode(int wxkey, ut
+ MAPC (NUMPAD2, PAD2, '2')
+ MAP (NUMPAD_DOWN, PAD2, DOWN)
+ MAPC (NUMPAD3, PAD3, '3')
+- MAP (NUMPAD_NEXT, PAD3, PGDN)
+-#if wxVERSION_NUMBER < 2700
+ MAP (NUMPAD_PAGEDOWN, PAD3, PGDN)
+-#endif
+ MAPC (NUMPAD4, PAD4, '4')
+ MAP (NUMPAD_LEFT, PAD4, LEFT)
+ MAPC (NUMPAD5, PAD5, '5')
+@@ -736,10 +733,7 @@ static bool wxCodeToCSCode(int wxkey, ut
+ MAPC (NUMPAD8, PAD8, '8')
+ MAP (NUMPAD_UP, PAD8, UP)
+ MAPC (NUMPAD9, PAD9, '9')
+- MAP (NUMPAD_PRIOR, PAD9, PGUP)
+-#if wxVERSION_NUMBER < 2700
+ MAP (NUMPAD_PAGEUP, PAD9, PGUP)
+-#endif
+ MAPC (MULTIPLY, PADMULT, '*')
+ MAPC (NUMPAD_MULTIPLY,PADMULT, '*')
+ MAPC (ADD, PADPLUS, '+')
Modified: packages/trunk/crystalspace/debian/rules
===================================================================
--- packages/trunk/crystalspace/debian/rules 2014-09-02 20:53:55 UTC (rev 15178)
+++ packages/trunk/crystalspace/debian/rules 2014-09-03 11:12:54 UTC (rev 15179)
@@ -18,7 +18,7 @@
COMPILER_FLAGS = CFLAGS='$(CFLAGS)'
%:
- dh $@
+ dh $@ --with autotools_dev
override_dh_auto_configure:
# sh bin/autogen.sh # This can be removed in crystalspace 1.9
@@ -65,6 +65,15 @@
override_dh_makeshlibs:
dh_makeshlibs -V 'libcrystalspace-2.0 (>= 1.4.0+dfsg-4)'
+#get-orig-source:
+# @cd $(CURDIR); \
+# svn co -r ${REVISION} https://crystal.svn.sourceforge.net/svnroot/crystal/CS/branches/release/V1.4 \
+# crystalspace-${VERSION}~svn${REVISION}; \
+# 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;
+
get-orig-source:
@cd $(CURDIR); \
wget http://www.crystalspace3d.org/downloads/release/crystalspace-src-${VERSION}.tar.bz2; \
Deleted: packages/trunk/crystalspace/debian/source.lintian-overrides
===================================================================
--- packages/trunk/crystalspace/debian/source.lintian-overrides 2014-09-02 20:53:55 UTC (rev 15178)
+++ packages/trunk/crystalspace/debian/source.lintian-overrides 2014-09-03 11:12:54 UTC (rev 15179)
@@ -1 +0,0 @@
-outdated-autotools-helper-file
More information about the Pkg-games-commits
mailing list