[eso-midas] 02/03: Adjust patches and rules

[Ole Streicher]

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

olebole pushed a commit to branch debian
in repository eso-midas.

commit 9456397f75c264f2cc512033001ff9f86ee8d521
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Tue Mar 17 16:58:30 2015 +0100

    Adjust patches and rules
---
 debian/changelog                        |  6 +++---
 debian/patches/fix_trivial_errors.patch | 11 -----------
 debian/rules                            |  3 +--
 debian/source/lintian-overrides         |  2 ++
 4 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index fa789cd..903af23 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-eso-midas (15.02pl1.0-1~exp5) experimental; urgency=low
+eso-midas (15.02pl1.1-1~exp1) experimental; urgency=low
 
-  * Fix FTBS on kfreebsd and hurd
+  * New upstream version
 
- -- Ole Streicher <olebole at debian.org>  Tue, 10 Mar 2015 18:12:22 +0100
+ -- Ole Streicher <olebole at debian.org>  Tue, 17 Mar 2015 15:17:38 +0100
 
 eso-midas (15.02pl1.0-1~exp2) experimental; urgency=low
 
diff --git a/debian/patches/fix_trivial_errors.patch b/debian/patches/fix_trivial_errors.patch
index 249a28d..d824055 100644
--- a/debian/patches/fix_trivial_errors.patch
+++ b/debian/patches/fix_trivial_errors.patch
@@ -30,17 +30,6 @@ Description: Fix/circumvent some trivial errors
  #define sign(X, Y) (((Y) < 0) ? -abs(X) : abs(X))  /* Vorzeichen von  */
                                                 /* Y mal abs(X)        */
  #define sqr(X) ((X) * (X))                     /* Quadrat von X       */
---- a/stdred/ccdred/libsrc/nrmed.c
-+++ b/stdred/ccdred/libsrc/nrmed.c
-@@ -59,7 +59,7 @@
- 
- extern void sortd(
- #ifdef __STDC__
--int     n;
-+int     n,
- double  *da
- #endif
- );
 --- a/stdred/do/libsrc/ostcrea.c
 +++ b/stdred/do/libsrc/ostcrea.c
 @@ -94,7 +94,7 @@
diff --git a/debian/rules b/debian/rules
index afe7d0b..3c6017c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -51,8 +51,7 @@ override_dh_fixperms:
 	           debian/eso-midas/$(MID_HOME0)/contrib/baches/*/*.fmt \
 	           debian/eso-midas/$(MID_HOME0)/contrib/baches/*/*.datorg \
 	           debian/eso-midas/$(MID_HOME0)/contrib/baches/*/*.prg \
-	           debian/eso-midas/$(MID_HOME0)/contrib/baches/*/*.README \
-	           debian/eso-midas/$(MID_HOME0)/system/unix/makefile
+	           debian/eso-midas/$(MID_HOME0)/contrib/baches/*/*.README
 	find debian/eso-midas/$(MID_HOME0)/ -name \*.sh | xargs chmod 0755 
 	chmod 0755 debian/eso-midas/$(MID_HOME0)/util/bench/brun
 
diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
index 8ed2f88..ab3af47 100644
--- a/debian/source/lintian-overrides
+++ b/debian/source/lintian-overrides
@@ -1,2 +1,4 @@
+# This link is removed and overridden in the build
+source-contains-unsafe-symlink libsrc/ftoc
 # This variable is used on purpose, and exported by debian/rules.
 dh-exec-subst-unknown-variable debian/install MIDVERS

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/eso-midas.git