[Pkg-jed-commit] [SCM] slcfitsio branch, master, updated. 79f84bebe202713b86f8de1eab6bd7d83f5c97d1

[Rafael Laboissiere]

The following commit has been merged in the master branch:
commit 0e298482b3260363eb02a55da05f0885fe4008ab
Author: Rafael Laboissiere <rafael at debian.org>
Date:   Sun Jun 7 04:10:58 2009 +0200

    Drop patch 01_define-fneqs.patch
    
    This patch is not needed anymore becasue libslang2, starting on
    version 2.1.0, contains the fneqs function.  Also, since this was the only
    patch in the series, drop the inclusion of simple-patchsys.mk.

diff --git a/debian/changelog b/debian/changelog
index d72c08f..f5ced98 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,9 @@ slcfitsio (0.3.8+nosvn-4) UNRELEASED; urgency=low
     + Build-Depend on autotools-dev, avoiding the Lintian warning
       outdated-autotools-helper-file.
     + Constrain the build-dependency on libslang2-dev to be >= 2.1.0
+  * debian/patches/01_define-fneqs.patch: Drop patch, since libslang2,
+    version 2.1.0, contains the fneqs function
+  * debian/rules: Drop inclusion of simple-patchsys.mk
 
  -- Rafael Laboissiere <rafael at debian.org>  Sun, 07 Jun 2009 02:54:30 +0200
 
diff --git a/debian/patches/01_define-fneqs.patch b/debian/patches/01_define-fneqs.patch
deleted file mode 100644
index 76772aa..0000000
--- a/debian/patches/01_define-fneqs.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Nur slcfitsio-0.3.8/src/tests/test_wcs.sl slcfitsio-0.3.8.new/src/tests/test_wcs.sl
---- slcfitsio-0.3.8/src/tests/test_wcs.sl	2007-05-01 21:29:45.000000000 +0200
-+++ slcfitsio-0.3.8.new/src/tests/test_wcs.sl	2007-05-01 21:59:44.000000000 +0200
-@@ -13,6 +13,10 @@
-    Failed++;
- }
- 
-+private define fneqs (a, b)
-+{
-+   (abs (b - a) > 1e-6) and (abs (b - a) / abs (b) > 0.001);
-+}
- 
- private define test_wcs ()
- {
diff --git a/debian/rules b/debian/rules
index f4d3459..a7a692d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,6 @@
 
 include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
 DEB_MAKE_BUILD_TARGET := all RPATH=
 DEB_MAKE_CHECK_TARGET := -C src test

-- 
slcfitsio