The following commit has been merged in the master branch: commit d4c3a0775d5bece7c36ef10165ba3b4c7c84bada Author: Marco Nelles <marco.nel...@credativ.de> Date: Tue Jun 5 12:39:37 2012 +0200
Removed to unused patches fix_various_typecasts.patch, fix_version_tag-pl.patch diff --git a/debian/patches/fix_various_typecasts.patch b/debian/patches/fix_various_typecasts.patch deleted file mode 100644 index 6f2231d..0000000 --- a/debian/patches/fix_various_typecasts.patch +++ /dev/null @@ -1,15 +0,0 @@ -## autogen.dpatch by Patrick Winnertz <win...@debian.org> -## DP: as we compile now with -Werror add typecasts for the printf stuff in sanity.c - -diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' lustre~/lustre/liblustre/tests/sanity.c lustre/lustre/liblustre/tests/sanity.c ---- lustre~/lustre/liblustre/tests/sanity.c 2010-03-03 14:44:38.000000000 +0100 -+++ lustre/lustre/liblustre/tests/sanity.c 2010-03-03 18:18:43.028668969 +0100 -@@ -705,7 +705,7 @@ - } - - t_fcntl(fd, F_SETFL, O_APPEND); -- if (!(ret = t_fcntl(fd, F_GETFL)) & O_APPEND) { -+ if ((!(ret = t_fcntl(fd, F_GETFL))) & O_APPEND) { - printf("error get flag: ret %x\n", ret); - return(-1); - } diff --git a/debian/patches/fix_version_tag-pl.patch b/debian/patches/fix_version_tag-pl.patch deleted file mode 100644 index b818ef0..0000000 --- a/debian/patches/fix_version_tag-pl.patch +++ /dev/null @@ -1,17 +0,0 @@ -## fix_version_tag-pl.dpatch by Patrick Winnertz <win...@debian.org> -## DP: No description. - -diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' lustre~/lustre/scripts/version_tag.pl lustre/lustre/scripts/version_tag.pl ---- lustre~/lustre/scripts/version_tag.pl 2010-01-11 04:29:50.000000000 +0100 -+++ lustre/lustre/scripts/version_tag.pl 2010-08-04 12:25:25.942494281 +0200 -@@ -125,8 +125,8 @@ - $last_mtime = time(); - } else { - my $tree_status = new IO::File; -- if (!$tree_status->open("tree_status")) { -- die "unable to open the tree_status file: $!\n"; -+ if (!$tree_status->open("configure")) { -+ die "unable to open the configure file: $!\n"; - } - my $line; - while (defined($line = <$tree_status>)) { -- Lustre Debian Packaging _______________________________________________ Pkg-lustre-svn-commit mailing list Pkg-lustre-svn-commit@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-lustre-svn-commit