[med-svn] [SCM] filo branch, master, updated. aa1cde5d67fced6b2a06b3b97a8e443f09acd6fb

Charles Plessy plessy at debian.org
Fri Aug 12 06:38:42 UTC 2011


The following commit has been merged in the master branch:
commit fe64a732931b27cdbd417e4e01374b55aef99c4e
Author: Charles Plessy <plessy at debian.org>
Date:   Wed Aug 3 13:13:55 2011 +0900

    Removed patches obsoleted by a recent upstream commit.

diff --git a/debian/control b/debian/control
index 22d855a..654bbba 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: filo
 Section: unknown
 Priority: optional
 Maintainer: Charles Plessy <plessy at debian.org>
-Build-Depends: debhelper (>= 8), git, quilt, zlib1g-dev
+Build-Depends: debhelper (>= 8), git, zlib1g-dev
 Standards-Version: 3.9.1
 Homepage: https://github.com/arq5x/filo
 #Vcs-Git: git://git.debian.org/debian-med/filo.git
diff --git a/debian/patches/build-with-recent-gcc.patch b/debian/patches/build-with-recent-gcc.patch
deleted file mode 100644
index 828f5d4..0000000
--- a/debian/patches/build-with-recent-gcc.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/src/shuffle/shuffle.cpp b/src/shuffle/shuffle.cpp
-index b50b1b5..161341a 100755
---- a/src/shuffle/shuffle.cpp
-+++ b/src/shuffle/shuffle.cpp
-@@ -1,3 +1,4 @@
-+#include <cstring> 
- #include <iostream>
- #include <fstream>
- #include <vector>
-diff --git a/src/stats/stats.cpp b/src/stats/stats.cpp
-index dc7e448..4dbfb96 100755
---- a/src/stats/stats.cpp
-+++ b/src/stats/stats.cpp
-@@ -1,3 +1,5 @@
-+#include <cstring> 
-+#include <limits.h>
- #include <iostream>
- #include <fstream>
- #include <iomanip>
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index f3466f3..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-build-with-recent-gcc.patch
diff --git a/debian/rules b/debian/rules
index f6b359a..2d33f6a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,4 +1,4 @@
 #!/usr/bin/make -f
 
 %:
-	dh $@ --with quilt
+	dh $@

-- 
useful FILe and stream Operations



More information about the debian-med-commit mailing list