This is an automated email from the git hooks/post-receive script. tille pushed a commit to branch master in repository ball.
commit f8a47580ee680cd3299ab0eee2042295331acca8 Author: Andreas Tille <[email protected]> Date: Fri Jul 10 18:52:02 2015 +0200 Some patches were replaced in 1.4.2+20140406-1.1 - these are deleted now as well --- debian/patches/0104-nopsboxit.patch | 19 ------------------- debian/patches/0105-HelpSipAmbiguity.patch | 16 ---------------- debian/patches/0106-clang.patch | 26 -------------------------- 3 files changed, 61 deletions(-) diff --git a/debian/patches/0104-nopsboxit.patch b/debian/patches/0104-nopsboxit.patch deleted file mode 100644 index c336f7e..0000000 --- a/debian/patches/0104-nopsboxit.patch +++ /dev/null @@ -1,19 +0,0 @@ -Author: Steffen Moeller <[email protected]> -Last-Update: Thu, 10 Apr 2014 15:22:35 +0200 -Description: Do not use psboxit.sty which is not packaged for Debian - - ---- a/doc/TUTORIAL/macros.tex -+++ b/doc/TUTORIAL/macros.tex -@@ -11,8 +11,9 @@ - \usepackage{times} - % use postscript fonts - --\usepackage{psboxit} --\newcommand{\graybox}[1]{\psboxit{box .85 setgray fill}{\fbox{#1}}} -+%\usepackage{psboxit} -+%\newcommand{\graybox}[1]{\psboxit{box .85 setgray fill}{\fbox{#1}}} -+\newcommand{\graybox}[1]{\fbox{#1}} - % display gray shaded boxes using postscript commands - % - diff --git a/debian/patches/0105-HelpSipAmbiguity.patch b/debian/patches/0105-HelpSipAmbiguity.patch deleted file mode 100644 index 603f710..0000000 --- a/debian/patches/0105-HelpSipAmbiguity.patch +++ /dev/null @@ -1,16 +0,0 @@ -Author: Steffen Moeller <[email protected]> -Last-Update: Thu, 10 Apr 2014 15:22:35 +0200 -Description: Help Sip Ambiguity - (no idea what this means but it seems to be necessary - Andreas Tille) - ---- a/source/PYTHON/EXTENSIONS/VIEW/modularWidget.sip -+++ b/source/PYTHON/EXTENSIONS/VIEW/modularWidget.sip -@@ -26,7 +26,7 @@ class ModularWidget - ModularWidget(const ModularWidget&) throw(); - ~ModularWidget() throw(); - -- virtual void destroy() throw(); -+ //virtual void destroy() throw(); // Steffen - virtual void clear() throw(); - - static void registerWidget(ModularWidget*) throw(NullPointer); diff --git a/debian/patches/0106-clang.patch b/debian/patches/0106-clang.patch deleted file mode 100644 index 3ec5850..0000000 --- a/debian/patches/0106-clang.patch +++ /dev/null @@ -1,26 +0,0 @@ -Author: Alexander <[email protected]> -Last-Update: Thu, 31 Jul 2014 02:41:29 +0400 -Bug-Debian: https://bugs.debian.org/755225 -Description: Fix Build problem with clang compiler - ---- a/include/BALL/DATATYPE/string.h -+++ b/include/BALL/DATATYPE/string.h -@@ -47,6 +47,9 @@ namespace BALL - { - // forward declaration - class Substring; -+ class String; -+ BALL_EXPORT -+ std::istream& getline(std::istream& s, String& string, char delimiter = '\n'); - - /** \defgroup String String - An improved version of STL string. -@@ -998,7 +1001,7 @@ namespace BALL - - /// - BALL_EXPORT -- friend std::istream& getline(std::istream& s, String& string, char delimiter = '\n'); -+ friend std::istream& getline(std::istream& s, String& string, char delimiter); - - //@} - -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/ball.git _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
