r9670 - in packages/trunk/bulletml/debian: . patches
Peter De Wachter
pdewacht-guest at alioth.debian.org
Mon May 4 20:05:08 UTC 2009
Author: pdewacht-guest
Date: 2009-05-04 20:05:07 +0000 (Mon, 04 May 2009)
New Revision: 9670
Added:
packages/trunk/bulletml/debian/libbulletml0d2.install
packages/trunk/bulletml/debian/patches/get-rid-of-boost.patch
Removed:
packages/trunk/bulletml/debian/libbulletml0d1.install
Modified:
packages/trunk/bulletml/debian/changelog
packages/trunk/bulletml/debian/control
packages/trunk/bulletml/debian/copyright
packages/trunk/bulletml/debian/patches/includes.patch
packages/trunk/bulletml/debian/patches/makefile.patch
packages/trunk/bulletml/debian/patches/series
packages/trunk/bulletml/debian/rules
Log:
bulletml: get rid of boost, bump soname. err, and fix a few minor lintian things.
Modified: packages/trunk/bulletml/debian/changelog
===================================================================
--- packages/trunk/bulletml/debian/changelog 2009-05-04 17:24:35 UTC (rev 9669)
+++ packages/trunk/bulletml/debian/changelog 2009-05-04 20:05:07 UTC (rev 9670)
@@ -1,9 +1,12 @@
bulletml (0.0.6-4) UNRELEASED; urgency=low
- * NOT RELEASED YET
+ * Use C++ TR1 shared pointers, drop Boost dependency.
+ + Bumped soname.
* Added watch file.
+ * Bumped Standards-Version to 3.8.1.
+ + debian/rules: Renamed 'configure' target to 'patch'.
- -- Peter De Wachter <pdewacht at gmail.com> Wed, 06 Feb 2008 19:43:29 +0100
+ -- Peter De Wachter <pdewacht at gmail.com> Mon, 04 May 2009 21:45:40 +0200
bulletml (0.0.6-3) unstable; urgency=low
Modified: packages/trunk/bulletml/debian/control
===================================================================
--- packages/trunk/bulletml/debian/control 2009-05-04 17:24:35 UTC (rev 9669)
+++ packages/trunk/bulletml/debian/control 2009-05-04 20:05:07 UTC (rev 9670)
@@ -2,8 +2,8 @@
Priority: extra
Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
Uploaders: Miriam Ruiz <little_miry at yahoo.es>, Peter De Wachter <pdewacht at gmail.com>
-Build-Depends: debhelper (>= 5), quilt, libboost-dev, bison
-Standards-Version: 3.7.3
+Build-Depends: debhelper (>= 5), quilt, bison
+Standards-Version: 3.8.1
Section: libs
Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/bulletml/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/bulletml/?op=log
@@ -13,7 +13,7 @@
Package: libbulletml-dev
Section: libdevel
Architecture: any
-Depends: libbulletml0d1 (= ${binary:Version}), libboost-dev
+Depends: libbulletml0d2 (= ${binary:Version})
Description: C++ library to handle BulletML easily - development files
BulletML is the Bullet Markup Language. BulletML can describe the barrage of
bullets in shooting games.
@@ -21,8 +21,7 @@
This package includes the files needed for the development of programs that
use this library.
-Package: libbulletml0d1
-Section: libs
+Package: libbulletml0d2
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: C++ library to handle BulletML easily - runtime library
Modified: packages/trunk/bulletml/debian/copyright
===================================================================
--- packages/trunk/bulletml/debian/copyright 2009-05-04 17:24:35 UTC (rev 9669)
+++ packages/trunk/bulletml/debian/copyright 2009-05-04 20:05:07 UTC (rev 9670)
@@ -16,12 +16,12 @@
Copyright:
- bulletml: Copyright (c) 2003, shinichiro.h
- tinyxml: Copyright (c) 2000, Lee Thomason (www.grinninglizard.com)
- yggdrasil: Copyright (c) 2002, Wraith
- calc.cpp: Copyright (c) 1984, 1989, 1990 Free Software Foundation, Inc.
- sstream-: Copyright (c) 2000, Free Software Foundation
- debian/doc: Copyright (c) 2001. Kenta Cho
+ bulletml: Copyright © 2003, shinichiro.h
+ tinyxml: Copyright © 2000, Lee Thomason (www.grinninglizard.com)
+ yggdrasil: Copyright © 2002, Wraith
+ calc.cpp: Copyright © 1984, 1989, 1990 Free Software Foundation, Inc.
+ sstream-: Copyright © 2000, Free Software Foundation
+ debian/doc: Copyright © 2001. Kenta Cho
License:
@@ -171,5 +171,5 @@
ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-The Debian packaging is (C) 2007, Miriam Ruiz <little_miry at yahoo.es> and
+The Debian packaging is © 2007, Miriam Ruiz <little_miry at yahoo.es> and
is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
Deleted: packages/trunk/bulletml/debian/libbulletml0d1.install
===================================================================
--- packages/trunk/bulletml/debian/libbulletml0d1.install 2009-05-04 17:24:35 UTC (rev 9669)
+++ packages/trunk/bulletml/debian/libbulletml0d1.install 2009-05-04 20:05:07 UTC (rev 9670)
@@ -1 +0,0 @@
-src/lib*.so.* usr/lib/
Copied: packages/trunk/bulletml/debian/libbulletml0d2.install (from rev 9660, packages/trunk/bulletml/debian/libbulletml0d1.install)
===================================================================
--- packages/trunk/bulletml/debian/libbulletml0d2.install (rev 0)
+++ packages/trunk/bulletml/debian/libbulletml0d2.install 2009-05-04 20:05:07 UTC (rev 9670)
@@ -0,0 +1 @@
+src/lib*.so.* usr/lib/
Added: packages/trunk/bulletml/debian/patches/get-rid-of-boost.patch
===================================================================
--- packages/trunk/bulletml/debian/patches/get-rid-of-boost.patch (rev 0)
+++ packages/trunk/bulletml/debian/patches/get-rid-of-boost.patch 2009-05-04 20:05:07 UTC (rev 9670)
@@ -0,0 +1,108 @@
+# Copyright 2009 Peter De Wachter <pdewacht at gmail.com>
+# Distributed under the same license as the original software.
+# See debian/copyright.
+
+# Replace boost::shared_ptr with std::tr1::shared_ptr, so we no longer
+# need to depend on boost.
+
+--- a/src/bulletmlrunner.cpp
++++ b/src/bulletmlrunner.cpp
+@@ -11,7 +11,7 @@
+ act.push_back(acts[i]);
+ BulletMLState* state =
+ new BulletMLState(bulletml, act,
+- boost::shared_ptr<BulletMLParameter>());
++ std::tr1::shared_ptr<BulletMLParameter>());
+ impl_.push_back(makeImpl(state));
+ }
+ }
+--- a/src/bulletmlrunner.h
++++ b/src/bulletmlrunner.h
+@@ -11,7 +11,7 @@
+ #include "bulletmlcommon.h"
+
+ #include <vector>
+-#include <boost/smart_ptr.hpp>
++#include <tr1/memory>
+
+ class BulletMLParser;
+ class BulletMLNode;
+@@ -24,17 +24,17 @@
+ public:
+ DECLSPEC BulletMLState(BulletMLParser* bulletml,
+ const std::vector<BulletMLNode*>& node,
+- boost::shared_ptr<BulletMLParameter> para)
++ std::tr1::shared_ptr<BulletMLParameter> para)
+ : bulletml_(bulletml), node_(node.begin(), node.end()), para_(para) {}
+
+ DECLSPEC BulletMLParser* getBulletML() { return bulletml_; }
+ DECLSPEC const std::vector<BulletMLNode*>& getNode() const { return node_; }
+- DECLSPEC boost::shared_ptr<BulletMLParameter> getParameter() { return para_; }
++ DECLSPEC std::tr1::shared_ptr<BulletMLParameter> getParameter() { return para_; }
+
+ private:
+ BulletMLParser* bulletml_;
+ std::vector<BulletMLNode*> node_;
+- boost::shared_ptr<BulletMLParameter> para_;
++ std::tr1::shared_ptr<BulletMLParameter> para_;
+
+ };
+
+--- a/src/bulletmlrunnerimpl.cpp
++++ b/src/bulletmlrunnerimpl.cpp
+@@ -368,7 +368,7 @@
+ }
+
+ void BulletMLRunnerImpl::runFireRef() {
+- boost::shared_ptr<Parameters> prevPara = parameters_;
++ std::tr1::shared_ptr<Parameters> prevPara = parameters_;
+ parameters_.reset(getParameters());
+
+ refStack_.push(std::make_pair(act_, prevPara));
+@@ -376,7 +376,7 @@
+ }
+
+ void BulletMLRunnerImpl::runActionRef() {
+- boost::shared_ptr<Parameters> prevPara = parameters_;
++ std::tr1::shared_ptr<Parameters> prevPara = parameters_;
+ parameters_.reset(getParameters());
+
+ refStack_.push(std::make_pair(act_, prevPara));
+@@ -384,7 +384,7 @@
+ }
+
+ void BulletMLRunnerImpl::runBulletRef() {
+- boost::shared_ptr<Parameters> prevPara = parameters_;
++ std::tr1::shared_ptr<Parameters> prevPara = parameters_;
+ parameters_.reset(getParameters());
+
+ refStack_.push(std::make_pair(act_, prevPara));
+--- a/src/bulletmlrunnerimpl.h
++++ b/src/bulletmlrunnerimpl.h
+@@ -6,7 +6,7 @@
+ #include <vector>
+ #include <memory>
+ #include <stack>
+-#include <boost/smart_ptr.hpp>
++#include <tr1/memory>
+
+ class BulletMLRunner;
+ class BulletMLState;
+@@ -149,7 +149,7 @@
+ Validatable<double> spd_, dir_, prevSpd_, prevDir_;
+
+ typedef BulletMLParameter Parameters;
+- boost::shared_ptr<Parameters> parameters_;
++ std::tr1::shared_ptr<Parameters> parameters_;
+
+ protected:
+ BulletMLParser* bulletml_;
+@@ -171,7 +171,7 @@
+ typedef std::stack<RepeatElem*> RepeatStack;
+ RepeatStack repeatStack_;
+ typedef std::stack<std::pair<BulletMLNode*,
+- boost::shared_ptr<Parameters> > > RefStack;
++ std::tr1::shared_ptr<Parameters> > > RefStack;
+ RefStack refStack_;
+
+ typedef void (BulletMLRunnerImpl::*Method)();
Modified: packages/trunk/bulletml/debian/patches/includes.patch
===================================================================
--- packages/trunk/bulletml/debian/patches/includes.patch 2009-05-04 17:24:35 UTC (rev 9669)
+++ packages/trunk/bulletml/debian/patches/includes.patch 2009-05-04 20:05:07 UTC (rev 9670)
@@ -1,3 +1,6 @@
+# Copyright (C) 2008 Peter De Wachter <pdewacht at gmail.com>
+# Distributed under the same license as the original software. See debian/copyright.
+
Index: bulletml-0.0.6/src/tinyxml/tinyxml.h
===================================================================
--- bulletml-0.0.6.orig/src/tinyxml/tinyxml.h 2007-12-31 22:41:41.000000000 +0100
Modified: packages/trunk/bulletml/debian/patches/makefile.patch
===================================================================
--- packages/trunk/bulletml/debian/patches/makefile.patch 2009-05-04 17:24:35 UTC (rev 9669)
+++ packages/trunk/bulletml/debian/patches/makefile.patch 2009-05-04 20:05:07 UTC (rev 9670)
@@ -20,7 +20,7 @@
+OBJS = bulletmlparser-tinyxml.o bulletmlparser.o bulletmltree.o calc.o \
+ formula-variables.o bulletmlrunner.o bulletmlrunnerimpl.o bulletml_d.o
+
-+MAJOR=0d1
++MAJOR=0d2
+MINOR=0
+
+all: libbulletml.a libbulletml.so
Modified: packages/trunk/bulletml/debian/patches/series
===================================================================
--- packages/trunk/bulletml/debian/patches/series 2009-05-04 17:24:35 UTC (rev 9669)
+++ packages/trunk/bulletml/debian/patches/series 2009-05-04 20:05:07 UTC (rev 9670)
@@ -4,3 +4,4 @@
warnings.patch
makefile.patch
includes.patch
+get-rid-of-boost.patch
Modified: packages/trunk/bulletml/debian/rules
===================================================================
--- packages/trunk/bulletml/debian/rules 2009-05-04 17:24:35 UTC (rev 9669)
+++ packages/trunk/bulletml/debian/rules 2009-05-04 20:05:07 UTC (rev 9670)
@@ -3,7 +3,7 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-CFLAGS = -Wall -g -Wall -ansi -pedantic
+CFLAGS = -g -Wall -ansi -pedantic
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
CFLAGS += -O0
@@ -11,24 +11,15 @@
CFLAGS += -O2
endif
-# shared library versions, option 1
-version=2.0.5
-major=2
-# option 2, assuming the library is created as src/.libs/libfoo.so.2.0.5 or so
-#version=`ls src/.libs/lib*.so.* | \
-# awk '{if (match($$0,/[0-9]+\.[0-9]+\.[0-9]+$$/)) print substr($$0,RSTART)}'`
-#major=`ls src/.libs/lib*.so.* | \
-# awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'`
-
-configure: configure-stamp
-configure-stamp:
+patch: patch-stamp
+patch-stamp:
dh_testdir
$(MAKE) -f /usr/share/quilt/quilt.make patch
rm -f src/calc.cpp #needs to be regenerated from src/calc.yy
touch $@
build: build-stamp
-build-stamp: configure-stamp
+build-stamp: patch-stamp
dh_testdir
rm -f src/*.o src/*/*.o
$(MAKE) -C src CFLAGS="$(CFLAGS)" CXXFLAGS="$(CFLAGS)" libbulletml.a
@@ -40,7 +31,7 @@
clean:
dh_testdir
dh_testroot
- rm -f build-stamp configure-stamp
+ rm -f build-stamp patch-stamp
$(MAKE) -C src clean
rm -f src/*.so src/*.so.* src/*.o
rm -f src/bulletml.d
@@ -89,4 +80,4 @@
rm d_cpp.tar.bz2 libbulletml-0.0.6.tar.bz2
binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure get-orig-source
+.PHONY: build clean binary-indep binary-arch binary install patch get-orig-source
More information about the Pkg-games-commits
mailing list