[SCM] Common Astronomy Software Applications core library branch, debian, updated. 4acbc2292575dc2088134f6a40cb74216b1782c9

Ole Streicher debian at liska.ath.cx
Wed Sep 12 13:22:50 UTC 2012


The following commit has been merged in the debian branch:
commit ab04131e40e1dc623d77831980d99312082af954
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Wed Sep 12 15:21:59 2012 +0200

    Don't install the test script "measuresdata.csh" to /usr/bin

diff --git a/debian/patches/dont_install_testscript_to_bin.patch b/debian/patches/dont_install_testscript_to_bin.patch
new file mode 100644
index 0000000..9c1c725
--- /dev/null
+++ b/debian/patches/dont_install_testscript_to_bin.patch
@@ -0,0 +1,11 @@
+Author: Ole Streicher <debian at liska.ath.cx>
+Description: Don't install the test script "measuresdata.csh" to /usr/bin
+ This script is just a test script, so it should go into the examples.
+--- a/measures/apps/CMakeLists.txt
++++ b/measures/apps/CMakeLists.txt
+@@ -7,4 +7,4 @@
+ add_executable (measuresdata  measuresdata/measuresdata.cc)
+ target_link_libraries (measuresdata casa_measures)
+ install(TARGETS measuresdata DESTINATION bin)
+-install(PROGRAMS measuresdata/measuresdata.csh DESTINATION bin)
++install(PROGRAMS DESTINATION bin)
diff --git a/debian/patches/series b/debian/patches/series
index fee9cb5..daa6445 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 set_soversion.patch
+dont_install_testscript_to_bin.patch
diff --git a/debian/rules b/debian/rules
index cd4c888..7d151d7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,14 +3,11 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-
-DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-
 %:
 	dh  $@ --parallel --buildsystem=cmake
 
-override_dh_auto_test:
-	true
+override_dh_auto_configure:
+	dh_auto_configure --  -DBUILD_TESTING=OFF
 
 override_dh_auto_install:
 	dh_auto_install

-- 
Common Astronomy Software Applications core library



More information about the debian-science-commits mailing list