[med-svn] [SCM] abyss branch, master, updated. upstream/1.3.4-14-g0afb614

[Andreas Tille]

The following commit has been merged in the master branch:
commit 0afb6145f35768db3492ab71331cfd773f6bdba1
Author: Andreas Tille <tille at debian.org>
Date:   Fri Jan 4 11:09:04 2013 +0100

    Disable POPCNT

diff --git a/debian/README.Debian b/debian/README.Debian
new file mode 100644
index 0000000..b09d652
--- /dev/null
+++ b/debian/README.Debian
@@ -0,0 +1,24 @@
+Abyss for Debian
+----------------
+
+Due to
+
+   http://bugs.debian.org/697344
+
+this package was compiled using --disable-popcnt.  If you need to profit
+from extra speed enhancement you could create a local package by doing
+the following:
+
+   $ apt-get source abyss
+   $ dch -i
+       local build enabling POPCNT
+   $ vi debian/rules
+       remove '--disable-popcnt' from configure options
+   $ debuild
+   $ dpkg -i ../abyss*.deb
+
+Please inform us (= Debian Med team) about the gain of speed compared
+to the packaged version to enable us to try some better means to get
+the best out of your hardware.
+
+ -- Andreas Tille <tille at debian.org>  Fri, 04 Jan 2013 11:07:10 +0100
diff --git a/debian/changelog b/debian/changelog
index f3d316e..fcdeec2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+abyss (1.3.4-3) unstable; urgency=low
+
+  * Disable POPCNT
+    Closes: #697344
+  * Add debian/README.debian to inform users about this change asking
+    for some comparison of the speed to consider other means for better
+    performance
+
+ -- Andreas Tille <tille at debian.org>  Fri, 04 Jan 2013 11:07:10 +0100
+
 abyss (1.3.4-2) unstable; urgency=low
 
   * Team upload
diff --git a/debian/rules b/debian/rules
index a14fb9c..047ef9c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,7 +6,7 @@ export DH_OPTIONS
 	dh  $@
 
 override_dh_auto_configure:
-	dh_auto_configure -- --with-mpi=/usr/lib/openmpi
+	dh_auto_configure -- --with-mpi=/usr/lib/openmpi --disable-popcnt
 
 override_dh_auto_install:
 	dh_auto_install --destdir=debian/tmp

-- 
Packaging of abyss in Debian