* Add patch gcc4.3_includes.diff: adds #includes to header files to enable

  compilation with gcc 4.3 (closes: #454897).
* Set Standars-Version to 3.7.3 (no further changes needed).

diff --git a/debian/changelog b/debian/changelog
index 10659638bdbd1e0aefee61d566c70e856f807679..597b08ccf71bc5ae3b867228cff9d578a9806d68 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,9 @@ mimetic (0.9.3-2) UNRELEASED; urgency=low
     debian/libmimetic-dev.dirs.
   * Move upstream URL from the description to the new Homepage field.
   * Change XS-Vcs-* fields to Vcs-*.
+  * Add patch gcc4.3_includes.diff: adds #includes to header files to enable
+    compilation with gcc 4.3 (closes: #454897).
+  * Set Standars-Version to 3.7.3 (no further changes needed).
 
  -- gregor herrmann <gregor+debian@comodo.priv.at>  Mon, 15 Oct 2007 19:56:25 +0200
 

diff --git a/debian/control b/debian/control
index 2364f1f3a35ab99b79072566b9375df6498a46e5..18014bc52b57c6bd0f19b7ab77ca4ab2101a3087 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: mimetic
 Priority: optional
 Maintainer: gregor herrmann <gregor+debian@comodo.priv.at>
 Uploaders: tony mancill <tmancill@debian.org>
-Build-Depends: debhelper (>= 5.0.0), autotools-dev, doxygen
-Standards-Version: 3.7.2
+Build-Depends: debhelper (>= 5.0.0), autotools-dev, doxygen, quilt
+Standards-Version: 3.7.3
 Section: libs
 Homepage: http://codesink.org/mimetic_mime_library.html
 Vcs-Svn: http://svn.toastfreeware.priv.at/debian/mimetic/trunk/
@@ -65,6 +65,7 @@ Description: C++ MIME library (runtime)
 
 Package: libmimetic0-dbg
 Section: libdevel
+Priority: extra
 Architecture: any
 Depends: libmimetic0 (= ${binary:Version})
 Description: C++ MIME library (debug)

diff --git a/debian/patches/gcc4.3_includes.diff b/debian/patches/gcc4.3_includes.diff
new file mode 100644 (file)
index 0000000..a94d1f2
--- /dev/null
+++ b/debian/patches/gcc4.3_includes.diff
@@ -0,0 +1,36 @@
+Index: mimetic/mimetic/os/mmfile.h
+===================================================================
+--- mimetic.orig/mimetic/os/mmfile.h   2007-12-11 02:32:46.000000000 +0100
++++ mimetic/mimetic/os/mmfile.h        2007-12-11 02:33:25.000000000 +0100
+@@ -20,6 +20,7 @@
+ #include <fcntl.h>
+ #include <sys/mman.h>
+ #include <string>
++#include <cstring>
+ #include <mimetic/os/fileop.h>
+ 
+ namespace mimetic
+Index: mimetic/mimetic/strutils.h
+===================================================================
+--- mimetic.orig/mimetic/strutils.h    2007-12-11 02:32:54.000000000 +0100
++++ mimetic/mimetic/strutils.h 2007-12-11 02:33:23.000000000 +0100
+@@ -16,6 +16,7 @@
+ #ifndef _MIMETIC_STRINGUTILS_H_
+ #define _MIMETIC_STRINGUTILS_H_
+ #include <string>
++#include <cstring>
+ #include <iostream>
+ #include <algorithm>
+ 
+Index: mimetic/mimetic/tokenizer.h
+===================================================================
+--- mimetic.orig/mimetic/tokenizer.h   2007-12-11 02:32:38.000000000 +0100
++++ mimetic/mimetic/tokenizer.h        2007-12-11 02:33:28.000000000 +0100
+@@ -19,6 +19,7 @@
+ #include <algorithm>
+ #include <set>
+ #include <string>
++#include <cstring>
+ 
+ namespace mimetic
+ {

diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644 (file)
index 0000000..89ef1da
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+gcc4.3_includes.diff

diff --git a/debian/rules b/debian/rules
index f2471447d9c466bd645292fafd91c2a855f2db9a..c0ade0f79153e1cbcd316403c6af821a619f43b1 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -9,6 +9,7 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+include /usr/share/quilt/quilt.make
 
 # These are used for cross-compiling and for saving the configure script
 # from having to guess our platform (since we know it already)
@@ -30,14 +31,14 @@ config.status: configure
 
 
 build: build-stamp
-build-stamp:  config.status
+build-stamp: $(QUILT_STAMPFN) config.status
        dh_testdir
        $(MAKE)
        #cd $(CURDIR)/doc && $(MAKE) docs
        $(MAKE) -C $(CURDIR)/doc docs
        touch build-stamp
 
-clean:
+clean: unpatch
        dh_testdir
        dh_testroot
        rm -f build-stamp