Bug#633736: swig2.0: diff for NMU version 2.0.4-2.1

This is an OpenPGP/MIME signed message (RFC 2440 and 3156)
boundary="080002010103050409000303"

This is a multi-part message in MIME format.

tags 633736 + pending
thanks


Dear maintainer,

I've prepared an NMU for swig2.0 (versioned as 2.0.4-2.1) and
uploaded it to DELAYED/2. Please feel free to tell me if I
should delay it longer.

Regards.

.''`.
: :' : Luca Falavigna <dktrkranz@debian.org>
`. `'
`-

name="swig2.0-2.0.4-2.1-nmu.diff"
filename="swig2.0-2.0.4-2.1-nmu.diff"

diff -Nru swig2.0-2.0.4/debian/changelog swig2.0-2.0.4/debian/changelog
swig2.0-2.0.4/debian/changelog 2011-06-19 01:32:26.000000000 +0200
+++ swig2.0-2.0.4/debian/changelog 2011-08-14 17:29:28.000000000 +0200
@@ -1,3 +1,14 @@
+swig2.0 (2.0.4-2.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+
+ [ Sebastian Ramacher ]
+ * debian/patches/python_map.patch:
+ - Let std::map honour all four template arguments to fix FTBFS in
+ related packages (Closes: #633736).
+
+ -- Luca Falavigna <dktrkranz@debian.org> Sun, 14 Aug 2011 17:27:18 +0200
+
swig2.0 (2.0.4-2) unstable; urgency=low

* Take over swig, swig-doc and swig-examples binary packages from swig1.3.
diff -Nru swig2.0-2.0.4/debian/patches/python_map.patch swig2.0-2.0.4/debian/patches/python_map.patch
swig2.0-2.0.4/debian/patches/python_map.patch 1970-01-01 01:00:00.000000000 +0100
+++ swig2.0-2.0.4/debian/patches/python_map.patch 2011-08-14 17:26:29.000000000 +0200
@@ -0,0 +1,52 @@
+Index: swig2.0-2.0.4/Lib/python/std_map.i
+=
+ swig2.0-2.0.4.orig/Lib/python/std_map.i 2011-08-14 17:26:22.344975042 +0200
++++ swig2.0-2.0.4/Lib/python/std_map.i 2011-08-14 17:26:19.760975296 +0200
+@@ -5,19 +5,19 @@
+ %fragment("StdMapTraits","header",fragment="StdSequenceTraits")
+ {
+ namespace swig {
+- template <class SwigPySeq, class K, class T >
++ template <class SwigPySeq, class K, class T, class C, class A>
+ inline void
+- assign(const SwigPySeq& swigpyseq, std::map<K,T > *map) {
+- typedef typename std::map<K,T>::value_type value_type;
++ assign(const SwigPySeq& swigpyseq, std::map<K,T,C,A> *map) {
++ typedef typename std::map<K,T,C,A>::value_type value_type;
+ typename SwigPySeq::const_iterator it = swigpyseq.begin();
+ for (;it != swigpyseq.end(); ++it) {
+ map->insert(value_type(it->first, it->second));
+ }
+ }
+
+- template <class K, class T>
+- struct traits_asptr<std::map<K,T> > {
+- typedef std::map<K,T> map_type;
++ template <class K, class T, class C, class A>
++ struct traits_asptr<std::map<K,T,C,A> > {
++ typedef std::map<K,T,C,A> map_type;
+ static int asptr(PyObject *obj, map_type **val) {
+ int res = SWIG_ERROR;
+ SWIG_PYTHON_THREAD_BEGIN_BLOCK;
+@@ -27,7 +27,7 @@
+ /* In Python 3.x the ".items()" method returns a dict_items object */
+ items = PySequence_Fast(items, ".items() didn't return a sequence!");
+ %#endif
+- res = traits_asptr_stdseq<std::map<K,T>, std::pair<K, T> >::asptr(items, val);
++ res = traits_asptr_stdseq<std::map<K,T,C,A>, std::pair<K, T> >::asptr(items, val);
+ } else {
+ map_type *p;
+ res = SWIG_ConvertPtr(obj,(void**)&p,swig::type_info<map_type>(),0);
+@@ -38,9 +38,9 @@
+ }
+ };
+
+- template <class K, class T >
+- struct traits_from<std::map<K,T> > {
+- typedef std::map<K,T> map_type;
++ template <class K, class T, class C, class A>
++ struct traits_from<std::map<K,T,C,A> > {
++ typedef std::map<K,T,C,A> map_type;
+ typedef typename map_type::const_iterator const_iterator;
+ typedef typename map_type::size_type size_type;
+
diff -Nru swig2.0-2.0.4/debian/patches/series swig2.0-2.0.4/debian/patches/series
swig2.0-2.0.4/debian/patches/series 2011-06-19 01:33:09.000000000 +0200
+++ swig2.0-2.0.4/debian/patches/series 2011-08-14 17:26:05.000000000 +0200
@@ -1 +1,2 @@
debian-changes-2.0.4-2
+python_map.patch







To UNSUBSCRIBE, email to debian-bugs-rc-REQUEST@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmaster@lists.debian.org