[SCM] OpenBLAS packaging for Debian branch, master, updated. debian/0.2.6-2-10-g126a126

[Sébastien Villemot]

The following commit has been merged in the master branch:
commit a551fe50e463aaf001600a25d09dacb86976e9cb
Author: Sébastien Villemot <sebastien at debian.org>
Date:   Fri Jul 26 18:35:51 2013 +0200

    * New upstream release
    * power7.patch: remove patch, applied upstream
    * Repackage upstream tarball without embedded LAPACK copy

diff --git a/debian/changelog b/debian/changelog
index 401c18b..8b45c48 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+openblas (0.2.7-1) UNRELEASED; urgency=low
+
+  * New upstream release
+  * power7.patch: remove patch, applied upstream
+  * Repackage upstream tarball without embedded LAPACK copy
+
+ -- Sébastien Villemot <sebastien at debian.org>  Fri, 26 Jul 2013 17:23:55 +0200
+
 openblas (0.2.6-2) unstable; urgency=low
 
   * power7.patch: new patch, should fix FTBFS on powerpc buildd with Power7 arch
diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh
new file mode 100755
index 0000000..f4bd7a2
--- /dev/null
+++ b/debian/orig-tar.sh
@@ -0,0 +1,17 @@
+#!/bin/sh -e
+
+# called by uscan with '--upstream-version' <version> <file>
+DIR=OpenBLAS-$2
+TAR=../openblas_$2.orig.tar.xz
+
+# clean up the upstream tarball
+tar xaf $3
+rm -f $3
+rm -rf $DIR/lapack-netlib/*
+echo "clean:" > $DIR/lapack-netlib/Makefile
+tar caf $TAR $DIR
+rm -rf $DIR
+
+echo "openblas: Repackaged tarball as $TAR (after stripping embedded LAPACK)"
+
+exit 0
diff --git a/debian/patches/libblas3-soname.patch b/debian/patches/libblas3-soname.patch
index 9da6838..872b930 100644
--- a/debian/patches/libblas3-soname.patch
+++ b/debian/patches/libblas3-soname.patch
@@ -19,6 +19,6 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  	-Wl,--whole-archive ../$(LIBNAME) -Wl,--no-whole-archive \
 -	-Wl,--retain-symbols-file=linux.def -Wl,-soname,$(LIBPREFIX).so.$(MAJOR_VERSION) $(EXTRALIB)
 +	-Wl,--retain-symbols-file=linux.def -Wl,-soname,libblas.so.3 $(EXTRALIB)
+ ifneq ($(C_COMPILER), LSB)
  	$(CC) $(CFLAGS) -w -o linktest linktest.c ../$(LIBSONAME) $(FEXTRALIB) && echo OK.
- 	rm -f linktest
- 
+ else
diff --git a/debian/patches/power7.patch b/debian/patches/power7.patch
deleted file mode 100644
index aabf4ba..0000000
--- a/debian/patches/power7.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: Make OpenBLAS compile on Power7 architecture
- The workaround is to fallback on the Power6 arch on these machines. This seems
- to work (did a small test on partch.debian.org).
-Author: Sébastien Villemot <sebastien at debian.org>
-Bug: https://github.com/xianyi/OpenBLAS/issues/220
-Applied-Upstream: https://github.com/xianyi/OpenBLAS/commit/109500178ca1b45ae1afb476daad75a1955f5fbe
-Last-Update: 2013-06-04
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/cpuid_power.c
-+++ b/cpuid_power.c
-@@ -114,6 +114,7 @@
-   if (!strncasecmp(p, "PPC970", 6)) return CPUTYPE_PPC970;
-   if (!strncasecmp(p, "POWER5", 6)) return CPUTYPE_POWER5;
-   if (!strncasecmp(p, "POWER6", 6)) return CPUTYPE_POWER6;
-+  if (!strncasecmp(p, "POWER7", 6)) return CPUTYPE_POWER6;
-   if (!strncasecmp(p, "Cell",   4)) return CPUTYPE_CELL;
-   if (!strncasecmp(p, "7447",   4)) return CPUTYPE_PPCG4;
- 
diff --git a/debian/patches/series b/debian/patches/series
index fa2faaa..2cb8f1e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,2 @@
-power7.patch
 libblas3-soname.patch
+
diff --git a/debian/watch b/debian/watch
index f055611..8a70c6d 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
 version=3
 opts=filenamemangle=s/.+\/archive\/v(.+)\.tar\.gz$/openblas_$1.orig.tar.gz/ \
-https://github.com/xianyi/OpenBLAS/tags .*/archive/v(\d[\d\.]+)\.tar\.gz
+https://github.com/xianyi/OpenBLAS/tags .*/archive/v(\d[\d\.]+)\.tar\.gz debian debian/orig-tar.sh

-- 
OpenBLAS packaging for Debian