[dune-common] 02/05: Refresh patches.

Ansgar Burchardt ansgar at moszumanska.debian.org
Mon Apr 20 16:53:37 UTC 2015


This is an automated email from the git hooks/post-receive script.

ansgar pushed a commit to branch master
in repository dune-common.

commit 5a0aa113c6c39eb8f91c05bab17c522f4872762d
Author: Ansgar Burchardt <ansgar at debian.org>
Date:   Mon Apr 20 15:50:47 2015 +0200

    Refresh patches.
---
 debian/patches/dune-autogen.patch                | 2 +-
 debian/patches/rename-git-whitespace-hook.patch  | 2 +-
 debian/patches/skip-dirs-starting-with-dot.patch | 2 +-
 debian/patches/soname.patch                      | 6 +++---
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/debian/patches/dune-autogen.patch b/debian/patches/dune-autogen.patch
index a39bcca..84c486d 100644
--- a/debian/patches/dune-autogen.patch
+++ b/debian/patches/dune-autogen.patch
@@ -1,6 +1,6 @@
 --- a/bin/dune-autogen
 +++ b/bin/dune-autogen
-@@ -27,7 +27,7 @@
+@@ -26,7 +26,7 @@
  rm -f $name.m4
  
  # add current dir to PATH
diff --git a/debian/patches/rename-git-whitespace-hook.patch b/debian/patches/rename-git-whitespace-hook.patch
index 2bd94a6..693e910 100644
--- a/debian/patches/rename-git-whitespace-hook.patch
+++ b/debian/patches/rename-git-whitespace-hook.patch
@@ -6,7 +6,7 @@ tool.
 
 --- a/bin/dunecontrol
 +++ b/bin/dunecontrol
-@@ -471,17 +471,28 @@
+@@ -498,17 +498,28 @@
          fi
        else
          # standard handling of Git whitespace hook
diff --git a/debian/patches/skip-dirs-starting-with-dot.patch b/debian/patches/skip-dirs-starting-with-dot.patch
index ab89582..633b9a9 100644
--- a/debian/patches/skip-dirs-starting-with-dot.patch
+++ b/debian/patches/skip-dirs-starting-with-dot.patch
@@ -2,7 +2,7 @@ From: Ansgar Burchardt <ansgar at debian.org>
 Subject: skip directories starting with a dot when looking for dune.module
 --- a/lib/dunemodules.lib
 +++ b/lib/dunemodules.lib
-@@ -241,7 +241,7 @@
+@@ -250,7 +250,7 @@
          while read m; do
            test -n "$m" && parse_control "$m"
          done <<EOFM
diff --git a/debian/patches/soname.patch b/debian/patches/soname.patch
index bd89823..b41bd18 100644
--- a/debian/patches/soname.patch
+++ b/debian/patches/soname.patch
@@ -1,6 +1,6 @@
---- dune-common.orig/lib/Makefile.am
-+++ dune-common/lib/Makefile.am
-@@ -14,5 +14,6 @@
+--- a/lib/Makefile.am
++++ b/lib/Makefile.am
+@@ -13,5 +13,6 @@
  nodist_EXTRA_libdunecommon_la_SOURCES = dummy.cc
  sourcescheck_DUMMY = dummy.cc
  libdunecommon_la_LIBADD = ../dune/common/libcommon.la

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/dune-common.git



More information about the debian-science-commits mailing list