------------------------------------------------------------
revno: 106
tags: 1.6.2+dfsg-4
fixes bug: http://bugs.debian.org/667387
committer: Dmitrijs Ledkovs <[email protected]>
branch nick: sword
timestamp: Tue 2012-04-17 22:57:10 +0100
message:
[ Matthias Klose ]
* Fix build failure in installed header file with GCC 4.7.
Addresses: #667387.
[ Dmitrijs Ledkovs ]
* Remove python-sword swig bindings. Loads of build-time warnings (4.6)
and errors (4.7) and the resulting module was reported not to
work. Should be readded if/when it can be build with gcc 4.7 without
errors. (Closes: #667387)
added:
.pc/fix-ftbfs-gcc4.7.diff/
.pc/fix-ftbfs-gcc4.7.diff/.timestamp
.pc/fix-ftbfs-gcc4.7.diff/include/
.pc/fix-ftbfs-gcc4.7.diff/include/multimapwdef.h
debian/patches/fix-ftbfs-gcc4.7.diff
modified:
.pc/applied-patches
debian/changelog
debian/control
debian/patches/series
debian/rules
include/multimapwdef.h
--
lp:sword/debian
https://code.launchpad.net/~pkgcrosswire/sword/main
Your team CrossWire Packaging Team is subscribed to branch lp:sword/debian.
To unsubscribe from this branch go to
https://code.launchpad.net/~pkgcrosswire/sword/main/+edit-subscription
=== modified file '.pc/applied-patches'
--- .pc/applied-patches 2012-04-07 13:23:41 +0000
+++ .pc/applied-patches 2012-04-17 21:57:10 +0000
@@ -4,3 +4,4 @@
2631_fix_curl.patch
cmake_backport.patch
icu_in_soname.patch
+fix-ftbfs-gcc4.7.diff
=== added directory '.pc/fix-ftbfs-gcc4.7.diff'
=== added file '.pc/fix-ftbfs-gcc4.7.diff/.timestamp'
=== added directory '.pc/fix-ftbfs-gcc4.7.diff/include'
=== added file '.pc/fix-ftbfs-gcc4.7.diff/include/multimapwdef.h'
--- .pc/fix-ftbfs-gcc4.7.diff/include/multimapwdef.h 1970-01-01 00:00:00 +0000
+++ .pc/fix-ftbfs-gcc4.7.diff/include/multimapwdef.h 2012-04-17 21:57:10 +0000
@@ -0,0 +1,39 @@
+#ifndef MULTIMAPWDEF
+#define MULTIMAPWDEF
+
+#include <map>
+
+SWORD_NAMESPACE_START
+
+// multmap that still lets you use [] to reference FIRST
+// entry of a key if multiples exist
+template <class Key, class T, class Compare>
+class multimapwithdefault : public std::multimap<Key, T, Compare> {
+public:
+ typedef std::pair<const Key, T> value_type;
+ T& getWithDefault(const Key& k, const T& defaultValue) {
+ if (find(k) == this->end()) {
+ insert(value_type(k, defaultValue));
+ }
+ return (*(find(k))).second;
+ }
+
+ T& operator[](const Key& k) {
+ if (find(k) == this->end()) {
+ insert(value_type(k, T()));
+ }
+ return (*(find(k))).second;
+ }
+ bool has(const Key& k, const T &val) const {
+ typename std::multimap<Key, T, Compare>::const_iterator start = lower_bound(k);
+ typename std::multimap<Key, T, Compare>::const_iterator end = upper_bound(k);
+ for (; start!=end; start++) {
+ if (start->second == val)
+ return true;
+ }
+ return false;
+ }
+};
+
+SWORD_NAMESPACE_END
+#endif
=== modified file 'debian/changelog'
--- debian/changelog 2012-04-09 14:05:25 +0000
+++ debian/changelog 2012-04-17 21:57:10 +0000
@@ -1,3 +1,17 @@
+sword (1.6.2+dfsg-4) unstable; urgency=low
+
+ [ Matthias Klose ]
+ * Fix build failure in installed header file with GCC 4.7.
+ Addresses: #667387.
+
+ [ Dmitrijs Ledkovs ]
+ * Remove python-sword swig bindings. Loads of build-time warnings (4.6)
+ and errors (4.7) and the resulting module was reported not to
+ work. Should be readded if/when it can be build with gcc 4.7 without
+ errors. (Closes: #667387)
+
+ -- Dmitrijs Ledkovs <[email protected]> Tue, 17 Apr 2012 21:39:11 +0100
+
sword (1.6.2+dfsg-3) unstable; urgency=low
* Fix FTBFS if running binary-arch target only.
=== modified file 'debian/control'
--- debian/control 2012-04-07 15:26:03 +0000
+++ debian/control 2012-04-17 21:57:10 +0000
@@ -1,10 +1,6 @@
Source: sword
Build-Depends: debhelper (>= 7.0.50~),
cmake,
- swig,
- python-all-dev,
- python-all-dbg,
- python-support,
libz-dev,
pkg-config,
libcurl4-gnutls-dev,
@@ -108,30 +104,3 @@
library testing. Nicer front-ends are Xiphos (Gtk), Bibletime (Qt)
and others.
-Package: python-sword
-Architecture: any
-Section: python
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}
-Description: SWIG Python bindings to libsword
- The SWORD Project is an open source, cross-platform (Linux, Windows, Solaris,
- MacOSX etc.) API/library for Bible software with a constantly growing list
- of front-ends (GUI, textmode, web-based, etc.) and a library of over 200
- text modules.
- .
- This package contains the SWIG bindings to develop applications in Python that
- use the SWORD library.
-
-Package: python-sword-dbg
-Architecture: any
-Section: debug
-Priority: extra
-Depends: python-sword (= ${binary:Version}), ${misc:Depends}
-Recommends: python-dbg
-Description: SWIG Python binding to libsword (debug)
- The SWORD Project is an open source, cross-platform (Linux, Windows, Solaris,
- MacOSX etc.) API/library for Bible software with a constantly growing list
- of front-ends (GUI, textmode, web-based, etc.) and a library of over 200
- text modules.
- .
- This package contains the debug symbols for SWIG bindings to develop
- applications in Python that use the SWORD library.
=== added file 'debian/patches/fix-ftbfs-gcc4.7.diff'
--- debian/patches/fix-ftbfs-gcc4.7.diff 1970-01-01 00:00:00 +0000
+++ debian/patches/fix-ftbfs-gcc4.7.diff 2012-04-17 21:57:10 +0000
@@ -0,0 +1,25 @@
+Partially fix ftbfs with gcc-4.7
+Index: sword-1.6.2+dfsg/include/multimapwdef.h
+===================================================================
+--- sword-1.6.2+dfsg.orig/include/multimapwdef.h 2004-05-04 21:01:39.000000000 +0000
++++ sword-1.6.2+dfsg/include/multimapwdef.h 2012-04-16 20:07:17.256834065 +0000
+@@ -19,14 +19,14 @@
+ }
+
+ T& operator[](const Key& k) {
+- if (find(k) == this->end()) {
+- insert(value_type(k, T()));
++ if (this->find(k) == this->end()) {
++ this->insert(value_type(k, T()));
+ }
+- return (*(find(k))).second;
++ return (*(this->find(k))).second;
+ }
+ bool has(const Key& k, const T &val) const {
+- typename std::multimap<Key, T, Compare>::const_iterator start = lower_bound(k);
+- typename std::multimap<Key, T, Compare>::const_iterator end = upper_bound(k);
++ typename std::multimap<Key, T, Compare>::const_iterator start = this->lower_bound(k);
++ typename std::multimap<Key, T, Compare>::const_iterator end = this->upper_bound(k);
+ for (; start!=end; start++) {
+ if (start->second == val)
+ return true;
=== modified file 'debian/patches/series'
--- debian/patches/series 2012-04-07 13:23:41 +0000
+++ debian/patches/series 2012-04-17 21:57:10 +0000
@@ -4,3 +4,4 @@
2631_fix_curl.patch
cmake_backport.patch
icu_in_soname.patch
+fix-ftbfs-gcc4.7.diff
=== modified file 'debian/rules'
--- debian/rules 2012-04-09 14:05:25 +0000
+++ debian/rules 2012-04-17 21:57:10 +0000
@@ -3,23 +3,20 @@
ppa:=$(shell sed -n "1s/.*~.*/yes/p" debian/changelog)
ver:=$(shell dpkg-parsechangelog | sed -nr "2s/Version: (.*)-.*/\1/p")
bd :=$(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-py :=obj-$(bd)/bindings/swig/python
-pyh:=$(shell if [ -f /usr/share/perl5/Debian/Debhelper/Sequence/python2.pm ]; then echo python2; else echo py_support; fi)
WFLAGS := -Wall -Werror
CFLAGS = $(shell dpkg-buildflags --get CFLAGS) $(WFLAGS)
CXXFLAGS = $(shell dpkg-buildflags --get CXXFLAGS) $(WFLAGS)
%:
- dh $@ --with $(pyh)
+ dh $@
override_dh_auto_configure:
dh_auto_configure -Scmake -- \
-DLIBSWORD_LIBRARY_TYPE="Shared Static" \
-DLIBSWORD_SOVERSION=9 \
-DSWORD_GLOBAL_CONF_DIR='/etc' \
-DCMAKE_BUILD_TYPE=NONE \
- -DSWORD_BUILD_TESTS="Yes" \
- -DSWORD_BINDINGS="Python"
+ -DSWORD_BUILD_TESTS="Yes"
debian/man/%.1: debian/man/%.1.pod
pod2man --release="SWORD $(ver)" --center "Sword Module Utilities" $< > $@
override_dh_auto_build: $(basename $(wildcard debian/man/*.pod))
@@ -28,10 +25,6 @@
$(shell cd tests/testsuite && ./runall.sh 1>&2)
override_dh_auto_install:
dh_auto_install -Scmake
- # if you do python-build in dh_auto_build, it will be rebuild again *sigh*
- CFLAGS="$(CFLAGS) -Wno-error" dh_auto_configure -Spython_distutils -D$(py)
- CFLAGS="$(CFLAGS) -Wno-error" dh_auto_build -Spython_distutils -D$(py)
- CFLAGS="$(CFLAGS) -Wno-error" dh_auto_install -Spython_distutils -D$(py)
override_dh_install:
chrpath -d debian/tmp/usr/bin/* debian/tmp/usr/lib/*so*
dh_install --list-missing
@@ -39,17 +32,6 @@
-chmod -x debian/libsword-common/usr/share/sword/locales.d/*
override_dh_strip:
dh_strip --dbg-package=libsword-dbg
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
- # lintian: python-debug-in-wrong-location, for some value of dh_strip
- # & pysupport or dh_python2
- # need to move if using pysupport, no need to move if using dh_python2
- -mv debian/libsword-dbg/usr/lib/debug/usr/lib/pyshared \
- debian/libsword-dbg/usr/lib/debug/usr/lib/pymodules
- dh_installdirs -p python-sword-dbg usr/lib/debug/usr/lib
- mv debian/libsword-dbg/usr/lib/debug/usr/lib/py* \
- debian/python-sword-dbg/usr/lib/debug/usr/lib
-endif
-
override_dh_makeshlibs:
dh_makeshlibs -V
override_dh_clean:
=== modified file 'include/multimapwdef.h'
--- include/multimapwdef.h 2009-01-27 00:56:31 +0000
+++ include/multimapwdef.h 2012-04-17 21:57:10 +0000
@@ -19,14 +19,14 @@
}
T& operator[](const Key& k) {
- if (find(k) == this->end()) {
- insert(value_type(k, T()));
+ if (this->find(k) == this->end()) {
+ this->insert(value_type(k, T()));
}
- return (*(find(k))).second;
+ return (*(this->find(k))).second;
}
bool has(const Key& k, const T &val) const {
- typename std::multimap<Key, T, Compare>::const_iterator start = lower_bound(k);
- typename std::multimap<Key, T, Compare>::const_iterator end = upper_bound(k);
+ typename std::multimap<Key, T, Compare>::const_iterator start = this->lower_bound(k);
+ typename std::multimap<Key, T, Compare>::const_iterator end = this->upper_bound(k);
for (; start!=end; start++) {
if (start->second == val)
return true;
_______________________________________________
Pkg-crosswire-devel mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-crosswire-devel
