Skip to content

Commit 36b83c6

Browse files
SebKuzminskySebKuzminsky
authored
Merge pull request #1887 from LinuxCNC/dh_install
Update debian packaging
2 parents 21e04f7 + 5932f22 commit 36b83c6

22 files changed

+426
-117
lines changed

‎debian/.gitignore‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,10 @@ linuxcnc-dev
99
linuxcnc-uspace-dev
1010
linuxcnc-doc-*/
1111
*.substvars
12-
/linuxcnc*.install
12+
13+
# generated from `.in` by debian/configure
14+
linuxcnc-uspace.install
15+
1316
*.debhelper
1417
shlibs.local
1518
linuxcnc-uspace.lintian-overrides

‎debian/configure‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ if [ "$1" == "-h" -o "$1" == "-help" -o "$1" == "--help" ]; then
3333
exit 0
3434
fi
3535

36-
EXTRA_FILES=
3736
EXTRA_BUILD=
3837
PYTHON_VERSION_NEXT=$(python3 -c 'import sys; print (sys.version[:2] + str(1+int(sys.version[2])))')
3938
LIBREADLINE_DEV="libreadline-gplv2-dev | libreadline-dev"
@@ -62,8 +61,6 @@ elif [ -f /etc/lsb-release ]; then
6261
DISTRIB_NAME=$DISTRIB_ID-$DISTRIB_RELEASE
6362
fi
6463

65-
EXTRAS=extras
66-
6764
if [ -n "$ENABLE_BUILD_DOCUMENTATION" ]; then
6865
DOC_DEPENDS="asciidoc (>= 8.5),\n dblatex (>= 0.2.12),\n docbook-xsl,\n dvipng,\n ghostscript,\n graphviz,\n groff,\n imagemagick,\n inkscape,\n python3-lxml,\n source-highlight,\n w3c-linkchecker,\n xsltproc,\n texlive-extra-utils,\n texlive-font-utils,\n texlive-fonts-recommended,\n texlive-lang-cyrillic,\n texlive-lang-european,\n texlive-lang-french,\n texlive-lang-german,\n texlive-lang-polish,\n texlive-lang-spanish,\n texlive-latex-recommended,\n asciidoc-dblatex"
6966

@@ -89,8 +86,8 @@ PYTHON_IMAGING=python3-pil
8986
PYTHON_IMAGING_TK=python3-pil.imagetk
9087
QTVCP_DEPENDS="python3-pyqt5,\n python3-pyqt5.qsci,\n python3-pyqt5.qtsvg,\n python3-pyqt5.qtopengl,\n python3-opencv,\n python3-dbus,python3-espeak,\n python3-dbus.mainloop.pyqt5,\n python3-pyqt5.qtwebkit,\n espeak-ng,\n pyqt5-dev-tools,\n gstreamer1.0-tools,espeak,\n sound-theme-freedesktop"
9188
YAPPS_RUNTIME="python3-yapps"
92-
DEBHELPER="debhelper (>= 9)"
93-
COMPAT="9"
89+
DEBHELPER="debhelper (>= 12)"
90+
COMPAT="12"
9491

9592
case $DISTRIB_NAME in
9693
Ubuntu-21.*|Debian-11|Debian-11.*|Debian-testing|Debian-unstable)
@@ -120,7 +117,6 @@ KERNEL_DEPENDS_BUILD=libudev-dev
120117
KERNEL_HEADERS=
121118
KERNEL_VERSION=uspace
122119
MODUTILS_DEPENDS=
123-
EXTRA_FILES="usr/bin/rtapi_app"
124120
DISTRIB_NAME=uspace-$DISTRIB_NAME
125121
MAIN_PACKAGE_NAME=linuxcnc-uspace
126122
OTHER_MAIN_PACKAGE_NAME=linuxcnc
@@ -135,9 +131,7 @@ sed \
135131
-e "s#@DISTRIB_NAME@#$DISTRIB_NAME#g" \
136132
-e "s#@DOC_DEPENDS@#$DOC_DEPENDS#g" \
137133
-e "s#@EXTRA_BUILD@#$EXTRA_BUILD#g" \
138-
-e "s#@EXTRA_FILES@#$EXTRA_FILES#g" \
139134
-e "s#@EXTRA_RECOMMENDS@#$EXTRA_RECOMMENDS#g" \
140-
-e "s#@EXTRAS@#$EXTRAS#g" \
141135
-e "s#@KERNEL_DEPENDS@#$KERNEL_DEPENDS#g" \
142136
-e "s#@KERNEL_DEPENDS_BUILD@#$KERNEL_DEPENDS_BUILD#g" \
143137
-e "s#@KERNEL_HEADERS@#$KERNEL_HEADERS#g" \

‎debian/control.docs.in‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ Package: linuxcnc-doc-en
22
Provides: linuxcnc-doc
33
Architecture: all
44
Depends: ${misc:Depends}
5+
Breaks: linuxcnc-uspace (<= 2.9.0~pre0+git20220402.2500863908-4),
6+
Replaces: linuxcnc-uspace (<= 2.9.0~pre0+git20220402.2500863908-4)
57
Recommends: xdg-utils
68
Suggests: pdf-viewer
79
Description: motion controller for CNC machines and robots (English documentation)
@@ -15,6 +17,8 @@ Package: linuxcnc-doc-fr
1517
Provides: linuxcnc-doc
1618
Architecture: all
1719
Depends: ${misc:Depends}
20+
Breaks: linuxcnc-uspace (<= 2.9.0~pre0+git20220402.2500863908-4)
21+
Replaces: linuxcnc-uspace (<= 2.9.0~pre0+git20220402.2500863908-4)
1822
Recommends: xdg-utils
1923
Suggests: pdf-viewer
2024
Description: motion controller for CNC machines and robots (French documentation)
@@ -28,6 +32,8 @@ Package: linuxcnc-doc-es
2832
Provides: linuxcnc-doc
2933
Architecture: all
3034
Depends: ${misc:Depends}
35+
Breaks: linuxcnc-uspace (<= 2.9.0~pre0+git20220402.2500863908-4)
36+
Replaces: linuxcnc-uspace (<= 2.9.0~pre0+git20220402.2500863908-4)
3137
Recommends: xdg-utils
3238
Suggests: pdf-viewer
3339
Description: controlador de movimiento para máquinas CNC y robots (Español).

‎debian/control.main-pkg.in‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
Package: @MAIN_PACKAGE_NAME@
2-
Conflicts: linuxcnc-sim, @OTHER_MAIN_PACKAGE_NAME@
2+
Conflicts:
3+
linuxcnc-sim,
4+
@OTHER_MAIN_PACKAGE_NAME@
5+
Breaks:
6+
linuxcnc-doc-en (<= 2.9.0~pre0+git20220402.2500863908-4),
7+
linuxcnc-doc-es (<= 2.9.0~pre0+git20220402.2500863908-4),
8+
linuxcnc-doc-fr (<= 2.9.0~pre0+git20220402.2500863908-4)
39
Architecture: any
410
Depends:
511
${misc:Depends},

‎debian/linuxcnc-doc-en.doc-base‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ Section: Science/Engineering
44

55
Format: PDF
66
Files:
7+
/usr/share/doc/linuxcnc/LinuxCNC_Developer.pdf
78
/usr/share/doc/linuxcnc/LinuxCNC_Documentation.pdf
89
/usr/share/doc/linuxcnc/LinuxCNC_Getting_Started.pdf
910
/usr/share/doc/linuxcnc/LinuxCNC_Integrator.pdf

‎debian/linuxcnc-doc-en.docs‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
usr/share/doc/linuxcnc/LinuxCNC_Developer.pdf
2+
usr/share/doc/linuxcnc/LinuxCNC_Documentation.pdf
3+
usr/share/doc/linuxcnc/LinuxCNC_Getting_Started.pdf
4+
usr/share/doc/linuxcnc/LinuxCNC_Integrator.pdf
5+
usr/share/doc/linuxcnc/LinuxCNC_Manual_Pages.pdf
6+
7+
usr/share/doc/linuxcnc/AUTHORS
8+
usr/share/doc/linuxcnc/INSTALL.adoc
9+
usr/share/doc/linuxcnc/README.adoc
10+
usr/share/doc/linuxcnc/README.axis
11+
usr/share/doc/linuxcnc/axis_light_background
12+
usr/share/doc/linuxcnc/rtfaults.adoc
13+
usr/share/doc/linuxcnc/tklinuxcnc.adoc
14+
15+
docs/html/gcode.html

‎debian/linuxcnc-doc-en.install‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
debian/extras/usr/share/applications/linuxcnc-documentation.desktop usr/share/applications
2+
debian/extras/usr/share/applications/linuxcnc-gcoderef.desktop usr/share/applications
3+
debian/extras/usr/share/applications/linuxcnc-gettingstarted.desktop usr/share/applications
4+
debian/extras/usr/share/applications/linuxcnc-integratorinfo.desktop usr/share/applications
5+
debian/extras/usr/share/applications/linuxcnc-manualpages.desktop usr/share/applications

‎debian/linuxcnc-doc-es.docs‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
usr/share/doc/linuxcnc/LinuxCNC_Developer_es.pdf
2+
usr/share/doc/linuxcnc/LinuxCNC_Documentation_es.pdf
3+
usr/share/doc/linuxcnc/LinuxCNC_Getting_Started_es.pdf
4+
usr/share/doc/linuxcnc/LinuxCNC_Integrator_es.pdf
5+
6+
usr/share/doc/linuxcnc/asciidoc-markup_es.adoc
7+
usr/share/doc/linuxcnc/rtfaults_es.adoc
8+
9+
docs/html/es/gcode.html

‎debian/linuxcnc-doc-es.install‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
debian/extras/usr/share/applications/*_es.desktop usr/share/applications/

‎debian/linuxcnc-doc-fr.docs‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
usr/share/doc/linuxcnc/LinuxCNC_Developer_fr.pdf
2+
usr/share/doc/linuxcnc/LinuxCNC_Documentation_fr.pdf
3+
usr/share/doc/linuxcnc/LinuxCNC_Getting_Started_fr.pdf
4+
usr/share/doc/linuxcnc/LinuxCNC_Integrator_fr.pdf
5+
6+
docs/html/fr/gcode.html

0 commit comments

Comments
 (0)