r16014 - in packages/trunk/plee-the-bear/debian: . patches

Markus Koschany apo at moszumanska.debian.org
Fri Aug 18 17:01:51 UTC 2017


Author: apo
Date: 2017-08-18 17:01:51 +0000 (Fri, 18 Aug 2017)
New Revision: 16014

Added:
   packages/trunk/plee-the-bear/debian/patches/wx3.0-compat.patch
Modified:
   packages/trunk/plee-the-bear/debian/changelog
   packages/trunk/plee-the-bear/debian/compat
   packages/trunk/plee-the-bear/debian/control
   packages/trunk/plee-the-bear/debian/copyright
   packages/trunk/plee-the-bear/debian/patches/series
   packages/trunk/plee-the-bear/debian/rules
Log:
Release plee-the-bear 0.6.0-4


Modified: packages/trunk/plee-the-bear/debian/changelog
===================================================================
--- packages/trunk/plee-the-bear/debian/changelog	2017-08-17 23:04:51 UTC (rev 16013)
+++ packages/trunk/plee-the-bear/debian/changelog	2017-08-18 17:01:51 UTC (rev 16014)
@@ -1,3 +1,22 @@
+plee-the-bear (0.6.0-4) unstable; urgency=medium
+
+  * Team upload.
+  * Switch to compat level 10.
+  * Declare compliance with Debian Policy 4.0.1.
+  * Vcs-Browser: Use https.
+  * Rebuild plee-the-bear with GCC 7. (Closes: #853618, #793274)
+  * Replace dh_clean -k with dh_prep.
+
+ -- Markus Koschany <apo at debian.org>  Fri, 18 Aug 2017 18:27:03 +0200
+
+plee-the-bear (0.6.0-3.1) unstable; urgency=low
+
+  * Non-maintainer upload at maitainer's request.
+  * Update to use wxWidgets 3.0 (new patch wx3.0-compat.patch)
+    (Closes: #750087)
+
+ -- Olly Betts <olly at survex.com>  Fri, 25 Jul 2014 10:58:41 +1200
+
 plee-the-bear (0.6.0-3) unstable; urgency=medium
 
   * Build on all archs; do not restrict Architecture in d/control.

Modified: packages/trunk/plee-the-bear/debian/compat
===================================================================
--- packages/trunk/plee-the-bear/debian/compat	2017-08-17 23:04:51 UTC (rev 16013)
+++ packages/trunk/plee-the-bear/debian/compat	2017-08-18 17:01:51 UTC (rev 16014)
@@ -1 +1 @@
-5
+10

Modified: packages/trunk/plee-the-bear/debian/control
===================================================================
--- packages/trunk/plee-the-bear/debian/control	2017-08-17 23:04:51 UTC (rev 16013)
+++ packages/trunk/plee-the-bear/debian/control	2017-08-18 17:01:51 UTC (rev 16014)
@@ -6,7 +6,7 @@
  Julien Jorge <julien.jorge at gamned.org>,
  Barry deFreese <bdefreese at debian.org>,
  Gonéri Le Bouder <goneri at rulezlan.org>
-Build-Depends: docbook-to-man, debhelper (>= 5.0.51), cmake (>= 2.8),
+Build-Depends: docbook-to-man, debhelper (>= 10), cmake (>= 2.8),
  libsdl-mixer1.2-dev (>= 1.2.8), libboost-filesystem-dev (>= 1.45),
  libboost-regex-dev (>= 1.45), libboost-thread-dev (>= 1.45),
  libboost-signals-dev (>= 1.45),
@@ -14,12 +14,11 @@
  libclaw-graphic-dev (>= 1.7.0), libclaw-logger-dev (>= 1.7.0),
  libclaw-application-dev (>= 1.7.0), libclaw-dynamic-library-dev (>= 1.7.0),
  libclaw-configuration-file-dev (>= 1.7.0), libclaw-net-dev (>= 1.7.0),
- libclaw-tween-dev (>= 1.7.0), libwxgtk2.8-dev (>= 2.8), gettext (>= 0.17)
-Build-Conflicts: wx2.6-headers
-Standards-Version: 3.9.5
+ libclaw-tween-dev (>= 1.7.0), libwxgtk3.0-dev, gettext (>= 0.17)
+Standards-Version: 4.0.1
 Homepage: http://plee-the-bear.sourceforge.net/
 Vcs-Svn: svn://anonscm.debian.org/pkg-games/packages/trunk/plee-the-bear/
-Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-games/packages/trunk/plee-the-bear/
+Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-games/packages/trunk/plee-the-bear/
 
 Package: plee-the-bear
 Architecture: any

Modified: packages/trunk/plee-the-bear/debian/copyright
===================================================================
--- packages/trunk/plee-the-bear/debian/copyright	2017-08-17 23:04:51 UTC (rev 16013)
+++ packages/trunk/plee-the-bear/debian/copyright	2017-08-18 17:01:51 UTC (rev 16014)
@@ -20,7 +20,7 @@
     Karl Ove Hufthammer
     Kiera Whalen
 
-Copyright: 
+Copyright:
     Copyright © 2005-2011 Julien Jorge
     Copyright © 2005-2011 Sébastien Angibaud
     Copyright © 2010-2011 Sébastien Debrard
@@ -41,12 +41,12 @@
     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 program 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 program; if not, write to the Free Software Foundation, Inc.,
     51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA

Modified: packages/trunk/plee-the-bear/debian/patches/series
===================================================================
--- packages/trunk/plee-the-bear/debian/patches/series	2017-08-17 23:04:51 UTC (rev 16013)
+++ packages/trunk/plee-the-bear/debian/patches/series	2017-08-18 17:01:51 UTC (rev 16014)
@@ -3,3 +3,4 @@
 ptb-filesystem-v3.diff
 ptb-signals-v2.diff
 full-path-menu-icon.diff
+wx3.0-compat.patch

Added: packages/trunk/plee-the-bear/debian/patches/wx3.0-compat.patch
===================================================================
--- packages/trunk/plee-the-bear/debian/patches/wx3.0-compat.patch	                        (rev 0)
+++ packages/trunk/plee-the-bear/debian/patches/wx3.0-compat.patch	2017-08-18 17:01:51 UTC (rev 16014)
@@ -0,0 +1,19 @@
+Description: Fix to build with wxwidgets3.0
+Author: Olly Betts <olly at survex.com>
+Last-Update: 2014-06-01
+
+--- plee-the-bear-0.6.0.orig/bear-factory/bear-editor/src/bf/code/base_editor_application.cpp
++++ plee-the-bear-0.6.0/bear-factory/bear-editor/src/bf/code/base_editor_application.cpp
+@@ -271,11 +271,10 @@ bool bf::base_editor_application::find_a
+ 
+   if ( index != 0 )
+     {
+-      for ( int i=index; (i+1 != argc); ++i )
++      for ( int i=index; (i != argc); ++i )
+         argv[i] = argv[i+1];
+ 
+       --argc;
+-      argv[argc] = NULL;
+     }
+ 
+   return index != 0;

Modified: packages/trunk/plee-the-bear/debian/rules
===================================================================
--- packages/trunk/plee-the-bear/debian/rules	2017-08-17 23:04:51 UTC (rev 16013)
+++ packages/trunk/plee-the-bear/debian/rules	2017-08-18 17:01:51 UTC (rev 16014)
@@ -21,7 +21,7 @@
 configure: configure-stamp
 configure-stamp:
 	dh_testdir
-	
+
 	# Perform an out-of-tree build to keep a clean source tree
 	mkdir $(BUILD_TREE)
 	cd $(BUILD_TREE); cmake .. \
@@ -46,7 +46,7 @@
 build: build-arch build-indep
 build-arch: build-stamp
 build-indep: build-stamp
-build-stamp: configure-stamp 
+build-stamp: configure-stamp
 	dh_testdir
 
 	cd $(BUILD_TREE); $(MAKE)
@@ -62,12 +62,12 @@
 	rm -f debian/running-bear.6
 	rm -f debian/plee-the-bear.6
 	for f in debian/*.menu; do if [ -L $$f ]; then unlink $$f; fi; done
-	dh_clean 
+	dh_clean
 
 install: build
 	dh_testdir
 	dh_testroot
-	dh_clean -k
+	dh_prep
 	dh_installdirs
 	cd $(BUILD_TREE); $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
 




More information about the Pkg-games-commits mailing list