tags 356970 + pending thanks I've uploaded the following NMU to delayed-2.
diff -u ecos-2.0/debian/changelog ecos-2.0/debian/changelog --- ecos-2.0/debian/changelog +++ ecos-2.0/debian/changelog @@ -1,3 +1,13 @@ +ecos (2.0-0pre2.4) unstable; urgency=low + + * NMU as part of the GCC 4.1 transition. + * patches/022_gcc41_fix: Remove extra qualification from C++ file + (closes: #356970). + * Drop the build-dependency on g++-3.4 for arm, m68k and hppa since + this workaround is no longer needed (closes: #342960). + + -- Martin Michlmayr <[EMAIL PROTECTED]> Fri, 26 May 2006 12:14:18 +0200 + ecos (2.0-0pre2.3) unstable; urgency=low * NMU. diff -u ecos-2.0/debian/rules ecos-2.0/debian/rules --- ecos-2.0/debian/rules +++ ecos-2.0/debian/rules @@ -33,13 +33,6 @@ CT2BUILDOPTS = $(CONCURRENCY_FLAG) -f ../$(BUILD_TREE)/ecos-2.0/tools/src/tools/configtool/standalone/wxwin/Makefile ECOSDIR=$(TOPDIR)/$(BUILD_TREE)/ecos-2.0/ LEVEL=$(LEVEL) ECOSBUILDDIR=$(TOPDIR)/build/tools/src/ WXDIR=/usr WXBUILDDIR=/usr/bin INCLUDEPREFIX= LIBPREFIX= #CT2BUILDOPTS = $(CONCURRENCY_FLAG) -f ../$(BUILD_TREE)/ecos-2.0/tools/src/tools/configtool/standalone/wxwin/Makefile ECOSDIR=$(TOPDIR)/$(BUILD_TREE)/ecos-2.0/ LEVEL=$(LEVEL) ECOSBUILDDIR=$(TOPDIR)/build/tools/src/ WXDIR=$(TOPDIR)/$(BUILD_TREE) -DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH) -ifneq (,$(findstring $(DEB_BUILD_ARCH),arm m68k hppa)) - export CC=gcc-3.4 - export CPP=cpp-3.4 - export CXX=g++-3.4 -endif - configure: configure-stamp configure-stamp: diff -u ecos-2.0/debian/control ecos-2.0/debian/control --- ecos-2.0/debian/control +++ ecos-2.0/debian/control @@ -2,7 +2,7 @@ Section: devel Priority: optional Maintainer: Masato Taruishi <[EMAIL PROTECTED]> -Build-Depends: debhelper (>> 3.0.0), dbs, cpio, tcl8.3-dev, tk8.3-dev, bzip2, docbook-to-man, libgtk1.2-dev, libwxgtk2.4-dev, autotools-dev, g++-3.4 [arm m68k hppa] +Build-Depends: debhelper (>> 3.0.0), dbs, cpio, tcl8.3-dev, tk8.3-dev, bzip2, docbook-to-man, libgtk1.2-dev, libwxgtk2.4-dev, autotools-dev Standards-Version: 3.5.6 Package: ecos only in patch2: unchanged: --- ecos-2.0.orig/debian/patches/022_gcc41_fix +++ ecos-2.0/debian/patches/022_gcc41_fix @@ -0,0 +1,23 @@ +--- ecos-2.0/tools/src/tools/ecostest/common/eCosTest.h~ 2006-03-15 02:53:06.000000000 +0000 ++++ ecos-2.0/tools/src/tools/ecostest/common/eCosTest.h 2006-03-15 02:53:12.000000000 +0000 +@@ -199,7 +199,7 @@ + bool GetSizes(); + + // Connect to a test server +- static ServerStatus CeCosTest::Connect (LPCTSTR pszHostPort, CeCosSocket *&pSock, const ExecutionParameters &e,String &strInfo,Duration dTimeout=10*1000); ++ static ServerStatus Connect (LPCTSTR pszHostPort, CeCosSocket *&pSock, const ExecutionParameters &e,String &strInfo,Duration dTimeout=10*1000); + + // Log some output. The accumulated output can be retrieved using Output() + void Log (LPCTSTR const pszFormat,...); +diff -urN ecos-2.0~/tools/src/tools/configtool/standalone/wxwin/propertywin.h ecos-2.0/tools/src/tools/configtool/standalone/wxwin/propertywin.h +--- ecos-2.0~/tools/src/tools/configtool/standalone/wxwin/propertywin.h 2006-05-25 21:45:26.000000000 +0000 ++++ ecos-2.0/tools/src/tools/configtool/standalone/wxwin/propertywin.h 2006-05-25 21:46:14.000000000 +0000 +@@ -93,7 +93,7 @@ + int m_nFirstProperty; + ecConfigItem *m_pti; + +- static const std::string ecPropertyListCtrl::visible_properties []; ++ static const std::string visible_properties []; + static const wxChar* sm_fieldTypeImage[ecMAXFIELDTYPE]; + }; + -- Martin Michlmayr http://www.cyrius.com/ -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
