Skip to content

Commit 962584a

Browse files
committed
Fix for Debian 9 package
1 parent 5e63fc6 commit 962584a

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@ if(EXISTS "/etc/redhat-release")
109109
if(LINUX_ISSUE MATCHES "Debian")
110110
set(CPACK_GENERATOR "DEB")
111111
if(PACKAGING_MODE)
112+
message("-- Using packaging mode")
112113
set(PYTHON_SITE_PATH "/usr/lib/python3/dist-packages")
113114
set(INSTALL_LATEX_DIR "/usr/share/texmf")
114115
endif()
@@ -119,7 +120,7 @@ if(EXISTS "/etc/redhat-release")
119120
endif()
120121
if(LINUX_ISSUE MATCHES "9")
121122
set(CPACK_SYSTEM_NAME "stretch")
122-
set(CPACK_DEBIAN_PACKAGE_DEPENDS "python3, libpcre3, libpcrecpp0, libgmpxx4ldbl, libboost-python1.62.0, libboost-system1.62.0, libboost-filesystem1.62.0, libboost-program-options1.62.0, libboost-regex1.62.0, libstdc++6, uuid-runtime, libgtkmm-3.0-1v5, texlive, texlive-latex-extra, python3-matplotlib, python3-mpmath, dvipng, python-sympy")
123+
set(CPACK_DEBIAN_PACKAGE_DEPENDS "python3, libpcre3, libpcrecpp0v5, libgmpxx4ldbl, libboost-python1.62.0, libboost-system1.62.0, libboost-filesystem1.62.0, libboost-program-options1.62.0, libboost-regex1.62.0, libstdc++6, uuid-runtime, libgtkmm-3.0-1v5, texlive, texlive-latex-extra, python3-matplotlib, python3-mpmath, dvipng, python-sympy")
123124
message("-- This is a Debian 9.x system")
124125
endif()
125126
endif()

config/buildbot.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,4 +62,5 @@ function runbuild {
6262
# runbuild "Fedora_26" ".rpm" 7011 fedora26
6363
# runbuild "Ubuntu_17.10" ".deb" 7012 ubuntu1710
6464
# runbuild "Debian86" ".deb" 7006 debian86
65-
runbuild "Scientific_Linux_74" ".rpm" 7013 scientific74
65+
# runbuild "Scientific_Linux_74" ".rpm" 7013 scientific74
66+
runbuild "Debian_921" ".deb" 7014 debian9

config/buildpkg.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ if [ -f /etc/redhat-release ]; then
1616
cmake .. -DPACKAGING_MODE=ON -DCMAKE_INSTALL_PREFIX=/usr
1717
fi
1818
else
19-
cmake .. -DCMAKE_INSTALL_PREFIX=/usr
19+
cmake .. -DPACKAGING_MODE=ON -DCMAKE_INSTALL_PREFIX=/usr
2020
fi
2121
make
2222
sudo cpack

0 commit comments

Comments
 (0)