[SCM] SETI at home packaging branch, master, updated. debian/6.97_svn1409-1-33-gb4e02dd
Steffen Moeller
steffen_moeller at gmx.de
Fri Dec 28 23:02:20 UTC 2012
The following commit has been merged in the master branch:
commit 6df5a8e8caef3dcf1d8ad77dcccbe22cceb343a2
Author: Steffen Moeller <steffen_moeller at gmx.de>
Date: Sun Dec 23 20:39:06 2012 +0100
Refresh after early introduction of AVX patch
diff --git a/debian/patches/003_dont_use_own_jpeglib.patch b/debian/patches/003_dont_use_own_jpeglib.patch
index 86fd30b..f7c8b65 100644
--- a/debian/patches/003_dont_use_own_jpeglib.patch
+++ b/debian/patches/003_dont_use_own_jpeglib.patch
@@ -5,8 +5,8 @@ will be linked against libjpeg. If the package should be configured with
Index: boinc-app-seti/Makefile.am
===================================================================
---- boinc-app-seti.orig/Makefile.am 2012-08-30 11:16:30.436114900 +0800
-+++ boinc-app-seti/Makefile.am 2012-08-30 11:24:16.796133060 +0800
+--- boinc-app-seti.orig/Makefile.am
++++ boinc-app-seti/Makefile.am
@@ -27,7 +27,7 @@
endif
@@ -18,17 +18,17 @@ Index: boinc-app-seti/Makefile.am
rm -rf `find $(distdir) -name .backup -prune -o -name '*~' -o -name CVS`
Index: boinc-app-seti/configure.ac
===================================================================
---- boinc-app-seti.orig/configure.ac 2012-08-30 11:17:17.416116730 +0800
-+++ boinc-app-seti/configure.ac 2012-08-30 11:24:16.796133060 +0800
-@@ -420,6 +420,7 @@
-
- SAH_AVX
+--- boinc-app-seti.orig/configure.ac
++++ boinc-app-seti/configure.ac
+@@ -421,6 +421,7 @@
+ #SAH_AVX
+ have_avx=no
+AM_CONDITIONAL(USE_MY_LIBJPEG, [false])
AM_CONDITIONAL(USE_MY_IMAGELIBS, [false])
AM_CONDITIONAL(USE_MY_GLUT, [false])
AM_CONDITIONAL(ENABLE_TESTS, [test "${enable_tests}" = yes])
-@@ -484,7 +485,6 @@
+@@ -485,7 +486,6 @@
])
AC_CONFIG_FILES([Makefile
--
SETI at home packaging
More information about the pkg-boinc-commits
mailing list