Drop patch gcc4.3_includes.diff, included upstream. Remove quilt

framework.

diff --git a/debian/changelog b/debian/changelog
index 85541130acf9afcfb51d1a1ffc0ab13db06cf45e..24cc524f15887d8976da76061c9cf78dd27bc783 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 mimetic (0.9.4-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * Drop patch gcc4.3_includes.diff, included upstream. Remove quilt
+    framework.
 
  -- gregor herrmann <gregoa@debian.org>  Thu, 18 Sep 2008 22:28:14 +0200
 

diff --git a/debian/control b/debian/control
index 8ecaa637fdd3b5f6341934da4b2e54bbced5f0a5..7e89546d1e6adcde5af89626802f2cd6e37a6a29 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: mimetic
 Priority: optional
 Maintainer: gregor herrmann <gregoa@debian.org>
 Uploaders: tony mancill <tmancill@debian.org>
-Build-Depends: debhelper (>= 6), autotools-dev, doxygen, quilt
+Build-Depends: debhelper (>= 6), autotools-dev, doxygen
 Standards-Version: 3.7.3
 Section: libs
 Homepage: http://codesink.org/mimetic_mime_library.html

diff --git a/debian/patches/gcc4.3_includes.diff b/debian/patches/gcc4.3_includes.diff
deleted file mode 100644 (file)
index 51378ef..0000000
--- a/debian/patches/gcc4.3_includes.diff
+++ /dev/null
@@ -1,34 +0,0 @@
-Author: gregor herrmann <gregoa@debian.org>
-Bug: #454897
-Description: include necessry headers for gcc4.3
-
---- mimetic.orig/mimetic/os/mmfile.h
-+++ mimetic/mimetic/os/mmfile.h
-@@ -20,6 +20,7 @@
- #include <fcntl.h>
- #include <sys/mman.h>
- #include <string>
-+#include <cstring>
- #include <mimetic/os/fileop.h>
- 
- namespace mimetic
---- mimetic.orig/mimetic/strutils.h
-+++ mimetic/mimetic/strutils.h
-@@ -16,6 +16,7 @@
- #ifndef _MIMETIC_STRINGUTILS_H_
- #define _MIMETIC_STRINGUTILS_H_
- #include <string>
-+#include <cstring>
- #include <iostream>
- #include <algorithm>
- 
---- mimetic.orig/mimetic/tokenizer.h
-+++ mimetic/mimetic/tokenizer.h
-@@ -19,6 +19,7 @@
- #include <algorithm>
- #include <set>
- #include <string>
-+#include <cstring>
- 
- namespace mimetic
- {

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

diff --git a/debian/rules b/debian/rules
index 3b472a986f52d93cef0021eb3c6ccdbf1c03e567..e46c8fecad59b77f64e26e66f63a5b3c30eec2a9 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -39,13 +39,13 @@ endif
 
 
 build: build-stamp
-build-stamp: config.status $(QUILT_STAMPFN)
+build-stamp: config.status
        dh_testdir
        $(MAKE)
        $(MAKE) -C $(CURDIR)/doc docs
        touch $@
 
-clean: unpatch
+clean:
        dh_testdir
        dh_testroot