-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi
Attached the patch for the version I intend to upload. Please respond if you don't want this NMU to happen, if you are working yourself on a patch or if you think that the attached patch won't work. Cheers Luk - -- Luk Claes - http://people.debian.org/~luk - GPG key 1024D/9B7C328D Fingerprint: D5AF 25FB 316B 53BB 08E7 F999 E544 DE07 9B7C 328D -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2 (GNU/Linux) iD8DBQFDsxaG5UTeB5t8Mo0RAnAzAJ9NTUDwOf/8b7H5K1LcrGy/Pk5sWQCfUw7q 1UIPlgRvUTlJnJBLXAq2R6w= =KiIg -----END PGP SIGNATURE-----
reverted: --- gnuift-0.1.14/,,[EMAIL PROTECTED]/gnuift--debian--1.0--patch-18.patches/removed-files-archive/debian/patches/06_gcc-3.4.diff +++ gnuift-0.1.14.orig/,,[EMAIL PROTECTED]/gnuift--debian--1.0--patch-18.patches/removed-files-archive/debian/patches/06_gcc-3.4.diff @@ -1,14 +0,0 @@ -diff -urN tmp/libGIFTAcDistanceMatrix/include/CPersistentVector.h gift-0.1.13/libGIFTAcDistanceMatrix/include/CPersistentVector.h ---- tmp/libGIFTAcDistanceMatrix/include/CPersistentVector.h 2004-08-05 17:14:22.000000000 +0200 -+++ gift-0.1.13/libGIFTAcDistanceMatrix/include/CPersistentVector.h 2004-08-17 09:49:01.454234657 +0200 -@@ -116,8 +116,8 @@ - - template<class T> - bool CPersistentVector<T>::write(ostream& outStream)const{ -- for(typename CPersistentVector<T>::const_iterator i=begin(); -- i!=end(); -+ for(typename CPersistentVector<T>::const_iterator i=this->begin(); -+ i!=this->end(); - i++){ - binary_writer(outStream, - *i); reverted: --- gnuift-0.1.14/,,[EMAIL PROTECTED]/gnuift--debian--1.0--patch-18.patches/orig-files-index +++ gnuift-0.1.14.orig/,,[EMAIL PROTECTED]/gnuift--debian--1.0--patch-18.patches/orig-files-index @@ -1,4 +0,0 @@ -./debian/patches/.arch-ids/06_gcc-3.4.diff.id E_Robert_Jordens_<[EMAIL PROTECTED]>_Tue_Aug_17_13:25:46_2004_13352.0 -./debian/changelog x_Robert_Jordens_<[EMAIL PROTECTED]>_Fri_Apr_30_01:49:44_2004_2492.0 -./debian/patches/07_gcc-4.0.diff x_Robert_Jordens_<[EMAIL PROTECTED]>_Mon_Jan__3_20:18:41_2005_10524.0 -./debian/patches/06_gcc-3.4.diff x_Robert_Jordens_<[EMAIL PROTECTED]>_Tue_Aug_17_13:25:46_2004_13352.0 reverted: --- gnuift-0.1.14/,,[EMAIL PROTECTED]/gnuift--debian--1.0--patch-18.patches/mod-files-index +++ gnuift-0.1.14.orig/,,[EMAIL PROTECTED]/gnuift--debian--1.0--patch-18.patches/mod-files-index @@ -1,3 +0,0 @@ -./{arch}/gnuift/gnuift--debian/gnuift--debian--1.0/[EMAIL PROTECTED]/patch-log/patch-18 A_./{arch}/gnuift/gnuift--debian/gnuift--debian--1.0/[EMAIL PROTECTED]/patch-log/patch-18 -./debian/changelog x_Robert_Jordens_<[EMAIL PROTECTED]>_Fri_Apr_30_01:49:44_2004_2492.0 -./debian/patches/07_gcc-4.0.diff x_Robert_Jordens_<[EMAIL PROTECTED]>_Mon_Jan__3_20:18:41_2005_10524.0 reverted: --- gnuift-0.1.14/,,[EMAIL PROTECTED]/gnuift--debian--1.0--patch-18.patches/patches/debian/changelog.patch +++ gnuift-0.1.14.orig/,,[EMAIL PROTECTED]/gnuift--debian--1.0--patch-18.patches/patches/debian/changelog.patch @@ -1,13 +0,0 @@ ---- orig/debian/changelog -+++ mod/debian/changelog -@@ -1,8 +1,9 @@ - gnuift (0.1.14-1) unstable; urgency=low - - * new upstream release -+ * 06_gcc-3.4.diff: applied upstream; 06_gcc-4.0.diff: fixed - -- -- Robert Jordens <[EMAIL PROTECTED]> Sat, 7 May 2005 01:01:34 +0200 -+ -- Robert Jordens <[EMAIL PROTECTED]> Sat, 7 May 2005 12:17:00 +0200 - - gnuift (0.1.13-2) unstable; urgency=low - reverted: --- gnuift-0.1.14/,,[EMAIL PROTECTED]/gnuift--debian--1.0--patch-18.patches/patches/debian/patches/07_gcc-4.0.diff.meta-mod +++ gnuift-0.1.14.orig/,,[EMAIL PROTECTED]/gnuift--debian--1.0--patch-18.patches/patches/debian/patches/07_gcc-4.0.diff.meta-mod @@ -1 +0,0 @@ ---permissions 664 reverted: --- gnuift-0.1.14/,,[EMAIL PROTECTED]/gnuift--debian--1.0--patch-18.patches/patches/debian/patches/07_gcc-4.0.diff.patch +++ gnuift-0.1.14.orig/,,[EMAIL PROTECTED]/gnuift--debian--1.0--patch-18.patches/patches/debian/patches/07_gcc-4.0.diff.patch @@ -1,72 +0,0 @@ ---- orig/debian/patches/07_gcc-4.0.diff -+++ mod/debian/patches/07_gcc-4.0.diff -@@ -1,57 +1,12 @@ --When building 'gnuift' on amd64 with gcc-4.0, --I get the following error: -- -- g++ -DHAVE_CONFIG_H -I. -I. -I../.. -DHAS_BOOL -DLINK_DYNAMICALLY -I../.. -g -Wall -O2 -DEF_PROTECT_BELOW=1 -DEF_PROTECT_FREE -DEF_PROTECT_ALIGNMENT=8 -DEF_FILL=42 -I /usr/include/mysql -DHAVE_LIBPTHREAD -D__GIFT_NEW_IS_MALLOC -D__GIFT_USES_THREADS__ -pthread -MT CAttributeList.lo -MD -MP -MF .deps/CAttributeList.Tpo -c CAttributeList.cc -fPIC -DPIC -o .libs/CAttributeList.o --../../libMRML/include/CAttributeList.h:34: warning: 'class CAttributeList' has virtual functions but non-virtual destructor --CAttributeList.cc: In constructor 'CAttributeList::CAttributeList(const char* const*)': --CAttributeList.cc:67: warning: comparison between signed and unsigned integer expressions --CAttributeList.cc:68: warning: comparison between signed and unsigned integer expressions --CAttributeList.cc: In destructor 'CAttributeList::~CAttributeList()': --CAttributeList.cc:95: error: cast from 'char*' to 'int' loses precision --CAttributeList.cc: In member function 'std::pair<bool, bool> CAttributeList::boolReadAttribute(const std::string&) const': --CAttributeList.cc:276: warning: unused variable 'lLastCorrectCharacter' --make[4]: *** [CAttributeList.lo] Error 1 --make[4]: Leaving directory `/gnuift-0.1.13/build-tree/gift-0.1.13/libMRML/cc' -- --With the attached patch 'gnuift' can be compiled --on amd64 using gcc-4.0. This patch includes a fix --which was already necessary for gcc-3.4. -- --Regards --Andreas Jochens -- --diff -urN ../tmp-orig/gnuift-0.1.13/debian/patches/07_gcc-4.0.diff ./debian/patches/07_gcc-4.0.diff ----- ../tmp-orig/gnuift-0.1.13/debian/patches/07_gcc-4.0.diff 1970-01-01 01:00:00.000000000 +0100 --+++ ./debian/patches/07_gcc-4.0.diff 2004-12-22 19:56:33.399014616 +0100 --@@ -0,0 +1,12 @@ --+diff -urN tmp/libMRML/cc/CAttributeList.cc gift-0.1.13/libMRML/cc/CAttributeList.cc --+--- tmp/libMRML/cc/CAttributeList.cc 2002-07-26 13:23:23.000000000 +0200 --++++ gift-0.1.13/libMRML/cc/CAttributeList.cc 2004-12-22 19:42:18.000000000 +0100 --+@@ -92,7 +92,7 @@ --+ --+ if(strcmp(i->second.first, --+ i->second.second)){ --+- cout << "DELETING FAILED" << flush << int(i->second.second) << flush << i->second.first << i->second.second << endl; --++ cout << "DELETING FAILED" << flush << long(i->second.second) << flush << i->second.first << i->second.second << endl; --+ assert(0); --+ } --+ delete[] i->second.first; --diff -urN ../tmp-orig/gnuift-0.1.13/debian/patches/06_gcc-3.4.diff ./debian/patches/06_gcc-3.4.diff ----- ../tmp-orig/gnuift-0.1.13/debian/patches/06_gcc-3.4.diff 1970-01-01 01:00:00.000000000 +0100 --+++ ./debian/patches/06_gcc-3.4.diff 2004-12-22 19:53:51.709595144 +0100 --@@ -0,0 +1,14 @@ --+diff -urN tmp/libGIFTAcDistanceMatrix/include/CPersistentVector.h gift-0.1.13/libGIFTAcDistanceMatrix/include/CPersistentVector.h --+--- tmp/libGIFTAcDistanceMatrix/include/CPersistentVector.h 2004-08-05 17:14:22.000000000 +0200 --++++ gift-0.1.13/libGIFTAcDistanceMatrix/include/CPersistentVector.h 2004-08-17 09:49:01.454234657 +0200 --+@@ -116,8 +116,8 @@ --+ --+ template<class T> --+ bool CPersistentVector<T>::write(ostream& outStream)const{ --+- for(typename CPersistentVector<T>::const_iterator i=begin(); --+- i!=end(); --++ for(typename CPersistentVector<T>::const_iterator i=this->begin(); --++ i!=this->end(); --+ i++){ --+ binary_writer(outStream, --+ *i); -- -+diff -urN tmp/libMRML/cc/CAttributeList.cc gift-0.1.13/libMRML/cc/CAttributeList.cc -+--- tmp/libMRML/cc/CAttributeList.cc 2002-07-26 13:23:23.000000000 +0200 -++++ gift-0.1.13/libMRML/cc/CAttributeList.cc 2004-12-22 19:42:18.000000000 +0100 -+@@ -92,7 +92,7 @@ -+ -+ if(strcmp(i->second.first, -+ i->second.second)){ -+- cout << "DELETING FAILED" << flush << int(i->second.second) << flush << i->second.first << i->second.second << endl; -++ cout << "DELETING FAILED" << flush << long(i->second.second) << flush << i->second.first << i->second.second << endl; -+ assert(0); -+ } -+ delete[] i->second.first; reverted: --- gnuift-0.1.14/,,[EMAIL PROTECTED]/gnuift--debian--1.0--patch-18.patches/patches/debian/patches/07_gcc-4.0.diff.meta-orig +++ gnuift-0.1.14.orig/,,[EMAIL PROTECTED]/gnuift--debian--1.0--patch-18.patches/patches/debian/patches/07_gcc-4.0.diff.meta-orig @@ -1 +0,0 @@ ---permissions 600 diff -u gnuift-0.1.14/debian/control gnuift-0.1.14/debian/control --- gnuift-0.1.14/debian/control +++ gnuift-0.1.14/debian/control @@ -71,9 +71,9 @@ client), these packages have been named "gnuift" (also to stress that gnuift is a GNU project). -Package: libgnuift0c2 -Replaces: libgnuift0 -Conflicts: libgnuift0 +Package: libgnuift0c2a +Replaces: libgnuift0, libgnuift0c2 +Conflicts: libgnuift0, libgnuift0c2 Architecture: any Section: libs Depends: ${shlibs:Depends} @@ -101,7 +101,7 @@ Provides: libgnuift-dev Conflicts: libgnuift-dev Section: libdevel -Depends: libgnuift0c2 (= ${Source-Version}), libexpat1-dev, libmagick6-dev | libmagick5-dev | libmagick-dev +Depends: libgnuift0c2a (= ${Source-Version}), libexpat1-dev, libmagick6-dev | libmagick5-dev | libmagick-dev Description: libgnuift development files The GIFT (the GNU Image-Finding Tool) is a Content Based Image Retrieval System (CBIRS). It enables you to do Query By Example on @@ -120,9 +120,9 @@ . More information can be found at http://www.gnu.org/software/gift/. -Package: libmrml1c2 -Replaces: libmrml1 -Conflicts: libmrml1 +Package: libmrml1c2a +Replaces: libmrml1, libmrml1c2 +Conflicts: libmrml1, libmrml1c2 Architecture: any Section: libs Depends: ${shlibs:Depends} @@ -150,7 +150,7 @@ Architecture: any Provides: libmrml-dev Conflicts: libmrml-dev -Depends: ${shlibs:Depends}, libmrml1c2 (= ${Source-Version}), libexpat1-dev +Depends: ${shlibs:Depends}, libmrml1c2a (= ${Source-Version}), libexpat1-dev Section: libdevel Description: libmrml development files MRML's aims are to unify access to multimedia retrieval and management reverted: --- gnuift-0.1.14/debian/libmrml1c2.install +++ gnuift-0.1.14.orig/debian/libmrml1c2.install @@ -1,2 +0,0 @@ -debian/tmp/usr/lib/libMRML*.so.* -debian/tmp/usr/share/* usr/share/libmrml1 diff -u gnuift-0.1.14/debian/rules gnuift-0.1.14/debian/rules --- gnuift-0.1.14/debian/rules +++ gnuift-0.1.14/debian/rules @@ -37,7 +37,7 @@ --enable-bayesian --enable-multi-threading DEB_DH_MAKESHLIBS_ARGS := -V -DEB_SHLIBDEPS_INCLUDE := debian/libgnuift0c2/usr/lib debian/libmrml1c2/usr/lib +DEB_SHLIBDEPS_INCLUDE := debian/libgnuift0c2a/usr/lib debian/libmrml1c2a/usr/lib DEB_PERL_INCLUDE := debian/gnuift/usr/bin debian/gnuift-perl/usr/share/perl5/GIFT debian/gnuift-perl/usr/share/gnuift debian/gnuift/usr/share/gnuift DEB_INSTALL_DOCS_ALL := $(shell cat debian/docs) diff -u gnuift-0.1.14/debian/changelog gnuift-0.1.14/debian/changelog --- gnuift-0.1.14/debian/changelog +++ gnuift-0.1.14/debian/changelog @@ -1,3 +1,10 @@ +gnuift (0.1.14-6.1) unstable; urgency=low + + * Non-maintainer upload. + * Renamed for C++ allocator change (Closes: #339177). + + -- Luk Claes <[EMAIL PROTECTED]> Wed, 28 Dec 2005 23:14:45 +0100 + gnuift (0.1.14-6) unstable; urgency=low * debian/control: libmysql++-dev as Build-Depends; closes: Bug#272004 reverted: --- gnuift-0.1.14/debian/libgnuift0c2.install +++ gnuift-0.1.14.orig/debian/libgnuift0c2.install @@ -1,2 +0,0 @@ -debian/tmp/usr/lib/libGIFT*.so.* - reverted: --- gnuift-0.1.14/,,undo-1/removed-files-archive/debian/patches/06_gcc-3.4.diff +++ gnuift-0.1.14.orig/,,undo-1/removed-files-archive/debian/patches/06_gcc-3.4.diff @@ -1,14 +0,0 @@ -diff -urN tmp/libGIFTAcDistanceMatrix/include/CPersistentVector.h gift-0.1.13/libGIFTAcDistanceMatrix/include/CPersistentVector.h ---- tmp/libGIFTAcDistanceMatrix/include/CPersistentVector.h 2004-08-05 17:14:22.000000000 +0200 -+++ gift-0.1.13/libGIFTAcDistanceMatrix/include/CPersistentVector.h 2004-08-17 09:49:01.454234657 +0200 -@@ -116,8 +116,8 @@ - - template<class T> - bool CPersistentVector<T>::write(ostream& outStream)const{ -- for(typename CPersistentVector<T>::const_iterator i=begin(); -- i!=end(); -+ for(typename CPersistentVector<T>::const_iterator i=this->begin(); -+ i!=this->end(); - i++){ - binary_writer(outStream, - *i); reverted: --- gnuift-0.1.14/,,undo-1/orig-files-index +++ gnuift-0.1.14.orig/,,undo-1/orig-files-index @@ -1,2 +0,0 @@ -./debian/patches/.arch-ids/06_gcc-3.4.diff.id E_Robert_Jordens_<[EMAIL PROTECTED]>_Tue_Aug_17_13:25:46_2004_13352.0 -./debian/patches/06_gcc-3.4.diff x_Robert_Jordens_<[EMAIL PROTECTED]>_Tue_Aug_17_13:25:46_2004_13352.0 reverted: --- gnuift-0.1.14/,,[EMAIL PROTECTED]/gnuift--debian--1.0--patch-24.patches/new-files-archive/debian/patches/08_add-missing-headers.patch +++ gnuift-0.1.14.orig/,,[EMAIL PROTECTED]/gnuift--debian--1.0--patch-24.patches/new-files-archive/debian/patches/08_add-missing-headers.patch @@ -1,39 +0,0 @@ ->>>> On Tue, 10 May 2005 23:59:36 +0100, Debian/IA64 non-US Build Daemon <[EMAIL PROTECTED]> said: - - > Function `malloc' implicitly converted to pointer at rgb2hsv_utils.c:186 - > Function `malloc' implicitly converted to pointer at quantize.c:29 - -These are caused by a missing include of <stdlib.h> and, if reachable -at all, will cause a segfault on some arches (such as ia64) due to -pointer truncation (implicit "int" return value gets sign-extended to -64-bit pointer, which results in a crash if theh value is -dereferenced). - -You can use the following script to filter build logs and check for -these types of errors: - - http://people.debian.org/~dannf/check-implicit-pointer-functions - -The attached patch fixes the problems. - -Thanks, - - --david - ---- FeatureExtraction/rgb2hsv_utils.c~ 2002-07-22 00:09:28.000000000 -0700 -+++ FeatureExtraction/rgb2hsv_utils.c 2005-05-11 02:18:15.000000000 -0700 -@@ -1,4 +1,5 @@ - #include <stdio.h> -+#include <stdlib.h> - #include <math.h> - #include "ppm.h" - ---- FeatureExtraction/quantize.c~ 2002-07-22 00:09:28.000000000 -0700 -+++ FeatureExtraction/quantize.c 2005-05-11 02:18:24.000000000 -0700 -@@ -1,4 +1,5 @@ - #include <math.h> -+#include <stdlib.h> - #include <ppm.h> - - enum ppm_error hsv_quantize_ppm(PPM *im_hsv, PPM **im_quant, int **colmap, int numH, int numS, int numV, int numG) { - reverted: --- gnuift-0.1.14/,,[EMAIL PROTECTED]/gnuift--debian--1.0--patch-24.patches/orig-files-index +++ gnuift-0.1.14.orig/,,[EMAIL PROTECTED]/gnuift--debian--1.0--patch-24.patches/orig-files-index @@ -1 +0,0 @@ -./debian/changelog x_Robert_Jordens_<[EMAIL PROTECTED]>_Fri_Apr_30_01:49:44_2004_2492.0 reverted: --- gnuift-0.1.14/,,[EMAIL PROTECTED]/gnuift--debian--1.0--patch-24.patches/mod-files-index +++ gnuift-0.1.14.orig/,,[EMAIL PROTECTED]/gnuift--debian--1.0--patch-24.patches/mod-files-index @@ -1,4 +0,0 @@ -./{arch}/gnuift/gnuift--debian/gnuift--debian--1.0/[EMAIL PROTECTED]/patch-log/patch-24 A_./{arch}/gnuift/gnuift--debian/gnuift--debian--1.0/[EMAIL PROTECTED]/patch-log/patch-24 -./debian/patches/.arch-ids/08_add-missing-headers.patch.id E_Robert_Jordens_<[EMAIL PROTECTED]>_Wed_May_11_20:51:57_2005_31965.0 -./debian/changelog x_Robert_Jordens_<[EMAIL PROTECTED]>_Fri_Apr_30_01:49:44_2004_2492.0 -./debian/patches/08_add-missing-headers.patch x_Robert_Jordens_<[EMAIL PROTECTED]>_Wed_May_11_20:51:57_2005_31965.0 reverted: --- gnuift-0.1.14/,,[EMAIL PROTECTED]/gnuift--debian--1.0--patch-24.patches/patches/debian/changelog.patch +++ gnuift-0.1.14.orig/,,[EMAIL PROTECTED]/gnuift--debian--1.0--patch-24.patches/patches/debian/changelog.patch @@ -1,14 +0,0 @@ ---- orig/debian/changelog -+++ mod/debian/changelog -@@ -1,3 +1,11 @@ -+gnuift (0.1.14-2) unstable; urgency=medium -+ -+ * fix missing header includes leading to pointer truncation on 64 bit -+ archs. Patch from David Mosberger <[EMAIL PROTECTED]>; thanks -+ closes: Bug#308582 -+ -+ -- Robert Jordens <[EMAIL PROTECTED]> Wed, 11 May 2005 20:52:02 +0200 -+ - gnuift (0.1.14-1) unstable; urgency=low - - * new upstream release only in patch2: unchanged: --- gnuift-0.1.14.orig/debian/libgnuift0c2a.install +++ gnuift-0.1.14/debian/libgnuift0c2a.install @@ -0,0 +1,2 @@ +debian/tmp/usr/lib/libGIFT*.so.* + only in patch2: unchanged: --- gnuift-0.1.14.orig/debian/libmrml1c2a.install +++ gnuift-0.1.14/debian/libmrml1c2a.install @@ -0,0 +1,2 @@ +debian/tmp/usr/lib/libMRML*.so.* +debian/tmp/usr/share/* usr/share/libmrml1