NMU uploaded with the following patch:
diff -Naur swish++-5.15.3.bak/debian/changelog swish++-5.15.3/debian/changelog
--- swish++-5.15.3.bak/debian/changelog 2004-03-30 16:02:39.000000000 +0200
+++ swish++-5.15.3/debian/changelog 2005-08-06 22:26:46.124834208 +0200
@@ -1,3 +1,12 @@
+swish++ (5.15.3-3.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Apply patch by Andreas Jochens to fix FTBFS with g++ 4.0
+ (Closes: #302561)
+ * Add missing Build-Depends on zlib1g-dev
+
+ -- Frank Lichtenheld <[EMAIL PROTECTED]> Sat, 6 Aug 2005 21:31:30 +0200
+
swish++ (5.15.3-3) unstable; urgency=low
* Getting swish on the UploadQueue
diff -Naur swish++-5.15.3.bak/debian/control swish++-5.15.3/debian/control
--- swish++-5.15.3.bak/debian/control 2004-03-29 17:50:26.000000000 +0200
+++ swish++-5.15.3/debian/control 2005-08-06 22:29:38.966558272 +0200
@@ -2,7 +2,7 @@
Section: web
Priority: optional
Maintainer: Michael Hummel <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>> 3.0.0)
+Build-Depends: debhelper (>> 3.0.0), zlib1g-dev
Standards-Version: 3.6.1
Package: swish++
diff -Naur swish++-5.15.3.bak/mod/html/elements.c
swish++-5.15.3/mod/html/elements.c
--- swish++-5.15.3.bak/mod/html/elements.c 2002-10-16 09:11:32.000000000
+0200
+++ swish++-5.15.3/mod/html/elements.c 2005-08-06 21:42:27.288038840 +0200
@@ -296,7 +296,7 @@
// C++ has become overly pedantic about casting to enums.
//
element::end_tag_value const
- v = (element::end_tag_value const)(int const)(p[1]);
+ v = (element::end_tag_value const)(long const)(p[1]);
element &e = insert(
value_type( *p++, element( v ) )
).first->second;
diff -Naur swish++-5.15.3.bak/my_set.h swish++-5.15.3/my_set.h
--- swish++-5.15.3.bak/my_set.h 2001-07-03 09:39:13.000000000 +0200
+++ swish++-5.15.3/my_set.h 2005-08-06 21:42:27.288038840 +0200
@@ -52,7 +52,7 @@
//*****************************************************************************
{
public:
- bool contains( T const &s ) const { return find( s ) != end(); }
+ bool contains( T const &s ) const { return find( s ) != this->end(); }
};
//*****************************************************************************
diff -Naur swish++-5.15.3.bak/pattern_map.h swish++-5.15.3/pattern_map.h
--- swish++-5.15.3.bak/pattern_map.h 2002-05-29 17:41:38.000000000 +0200
+++ swish++-5.15.3/pattern_map.h 2005-08-06 21:55:31.115878896 +0200
@@ -87,17 +87,17 @@
// insertion, however.
//
return std::find_if(
- begin(), end(), pattern_match( file_name )
+ this->begin(), this->end(), pattern_match( file_name )
);
}
const_iterator find( char const *file_name ) const {
return std::find_if(
- begin(), end(), pattern_match( file_name )
+ this->begin(), this->end(), pattern_match( file_name )
);
}
bool matches( char const *file_name ) const {
- return find( file_name ) != end();
+ return find( file_name ) != this->end();
}
void insert( char const *pattern, T const &t ) { (*this)[pattern] = t; }
void insert( value_type const &n ) { map_type::insert( n ); }
@@ -111,7 +111,7 @@
public:
pattern_match( char const *file_name ) :
file_name_( file_name ) { }
- result_type operator()( argument_type map_node ) const {
+ bool operator()( value_type const &map_node ) const {
return !::fnmatch( map_node.first, file_name_, 0 );
}
private:
Gruesse,
--
Frank Lichtenheld <[EMAIL PROTECTED]>
www: http://www.djpig.de/
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
