The following commit has been merged in the master branch:
commit 8b81ae22b840f28d2fcaf9b5a337d58f80d33d93
Author: Stephen M. Webb <[email protected]>
Date: Fri Jun 1 10:29:25 2012 -0400
removed non-DFSG code form orig tarball
diff --git a/debian/changelog b/debian/changelog
index 6c8b25a..8993283 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-ember (0.6.2-1) unstable; urgency=low
+ember (0.6.2+dfsg-1) unstable; urgency=low
* new upstream release (closes: #633854)
- removed dependency on libceguiogre-dev (closes: #629767)
@@ -11,15 +11,16 @@ ember (0.6.2-1) unstable; urgency=low
* used xz compression in packaging
* debian/control: updated Standards-Version to 3.9.3
* debian/copyright: changed to computer-readable format (DEP-5)
- * 0008-replace-fastdeletegate-with-boost.patch: replaced FastDelegate
- - used GPL-compatible boost::function instead
+ * 0008-replace-fastdeletegate-with-sigc++.patch: replaced FastDelegate
+ - removed non-free code from orig tarball, added +dfsg to version
+ - pulled sigc++ replacement patch from upstream instead
* 0009-spelling-bach.patch: fix spelling mistake
* 0010-fix-ember-script-args.patch: fix argument handling in script
* 0011-qualify-template-function.patch: fixes FTBFS using GCC 4.7
* 0012-fix-osdir-headers: adds required headers for POSIX.
* 0013-remove-invalid-linker-flags.patch: remove an invalid linker flag
- -- Stephen M. Webb <[email protected]> Tue, 08 May 2012 14:28:55
-0700
+ -- Stephen M. Webb <[email protected]> Fri, 01 Jun 2012 10:24:50
-0400
ember (0.5.7-1.1) unstable; urgency=high
diff --git a/debian/patches/0008-replace-fastdeletegate-with-boost.patch
b/debian/patches/0008-replace-fastdeletegate-with-sigc++.patch
similarity index 100%
rename from debian/patches/0008-replace-fastdeletegate-with-boost.patch
rename to debian/patches/0008-replace-fastdeletegate-with-sigc++.patch
diff --git a/debian/patches/series b/debian/patches/series
index bb9f567..19b652f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,7 +5,7 @@
0005-ember.in-prefix.patch
0006-spellcheck-similiar.patch
0007-revert-libwfut-version.patch
-0008-replace-fastdeletegate-with-boost.patch
+0008-replace-fastdeletegate-with-sigc++.patch
0009-spelling-bach.patch
0010-fix-ember-script-args.patch
0011-qualify-template-functions.patch
--
WorldForge 3D client
_______________________________________________
Pkg-games-commits mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
