tags 667219 + patch
tags 667219 + pending
thanks

Dear maintainer,

I've prepared an NMU for kawari8 (versioned as 8.2.8-6.1) and
uploaded it to DELAYED/5. Please feel free to tell me if I
should delay it longer.

Regards.

-- 
 .''`.  Homepage: http://info.comodo.priv.at/ - OpenPGP key 0xBB3A68018649AA06
 : :' : Debian GNU/Linux user, admin, and developer  -  http://www.debian.org/
 `. `'  Member of VIBE!AT & SPI, fellow of the Free Software Foundation Europe
   `-   NP: U2: Bass Trap
diff -u kawari8-8.2.8/debian/changelog kawari8-8.2.8/debian/changelog
--- kawari8-8.2.8/debian/changelog
+++ kawari8-8.2.8/debian/changelog
@@ -1,3 +1,12 @@
+kawari8 (8.2.8-6.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix "ftbfs with GCC-4.7": add patch 008_fix_gcc4.7_FTBFS.patch (this->
+    qualifier).
+    Closes: #667219
+
+ -- gregor herrmann <[email protected]>  Sun, 06 May 2012 16:28:01 +0200
+
 kawari8 (8.2.8-6) unstable; urgency=low
 
   * debian/patches/007_fix_gcc4.5_FTBFS.patch: Fix FTBFS with gcc-4.5
only in patch2:
unchanged:
--- kawari8-8.2.8.orig/debian/patches/008_fix_gcc4.7_FTBFS.patch
+++ kawari8-8.2.8/debian/patches/008_fix_gcc4.7_FTBFS.patch
@@ -0,0 +1,20 @@
+--- src/misc/mmap.h
++++ src/misc/mmap.h
+@@ -28,7 +28,7 @@
+ 		// 2001/12/16 [email protected] : imortal entry bug
+ //		if(it==end()) it=insert(pair<KeyType,DataType>(key,DataType()));
+ //		if(it==upper_bound(key)) it=insert(pair<const KeyType,DataType>(key,DataType()));
+-		if(it==std::multimap<KeyType, DataType>::upper_bound(key)) it=insert(typename TMMap<KeyType,DataType>::value_type(key,DataType()));
++		if(it==std::multimap<KeyType, DataType>::upper_bound(key)) it=this->insert(typename TMMap<KeyType,DataType>::value_type(key,DataType()));
+ 		return((*it).second);
+ 	}
+ /*
+@@ -43,7 +43,7 @@
+ 	void Add(const KeyType& key,const DataType& data)
+ 	{
+ //		insert(pair<const KeyType,DataType>(key,data));
+-		insert(typename TMMap::value_type(key,data));
++		this->insert(typename TMMap::value_type(key,data));
+ 	}
+ 
+ };

Attachment: signature.asc
Description: Digital signature

Reply via email to