Update debian packaging

debian/.gitignore

@@ -9,7 +9,10 @@ linuxcnc-dev
 linuxcnc-uspace-dev
 linuxcnc-doc-*/
 *.substvars
-/linuxcnc*.install
+
+# generated from `.in` by debian/configure
+linuxcnc-uspace.install
+
 *.debhelper
 shlibs.local
 linuxcnc-uspace.lintian-overrides

debian/configure

@@ -33,7 +33,6 @@ if [ "$1" == "-h" -o "$1" == "-help" -o "$1" == "--help" ]; then
     exit 0
 fi
 
-EXTRA_FILES=
 EXTRA_BUILD=
 PYTHON_VERSION_NEXT=$(python3 -c 'import sys; print (sys.version[:2] + str(1+int(sys.version[2])))')
 LIBREADLINE_DEV="libreadline-gplv2-dev | libreadline-dev"
@@ -62,8 +61,6 @@ elif [ -f /etc/lsb-release ]; then
     DISTRIB_NAME=$DISTRIB_ID-$DISTRIB_RELEASE
 fi
 
-EXTRAS=extras
-
 if [ -n "$ENABLE_BUILD_DOCUMENTATION" ]; then
     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"
 
@@ -89,8 +86,8 @@ PYTHON_IMAGING=python3-pil
 PYTHON_IMAGING_TK=python3-pil.imagetk
 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"
 YAPPS_RUNTIME="python3-yapps"
-DEBHELPER="debhelper (>= 9)"
-COMPAT="9"
+DEBHELPER="debhelper (>= 12)"
+COMPAT="12"
 
 case $DISTRIB_NAME in
     Ubuntu-21.*|Debian-11|Debian-11.*|Debian-testing|Debian-unstable)
@@ -120,7 +117,6 @@ KERNEL_DEPENDS_BUILD=libudev-dev
 KERNEL_HEADERS=
 KERNEL_VERSION=uspace
 MODUTILS_DEPENDS=
-EXTRA_FILES="usr/bin/rtapi_app"
 DISTRIB_NAME=uspace-$DISTRIB_NAME
 MAIN_PACKAGE_NAME=linuxcnc-uspace
 OTHER_MAIN_PACKAGE_NAME=linuxcnc
@@ -135,9 +131,7 @@ sed \
     -e "s#@DISTRIB_NAME@#$DISTRIB_NAME#g" \
     -e "s#@DOC_DEPENDS@#$DOC_DEPENDS#g" \
     -e "s#@EXTRA_BUILD@#$EXTRA_BUILD#g" \
-    -e "s#@EXTRA_FILES@#$EXTRA_FILES#g" \
     -e "s#@EXTRA_RECOMMENDS@#$EXTRA_RECOMMENDS#g" \
-    -e "s#@EXTRAS@#$EXTRAS#g" \
     -e "s#@KERNEL_DEPENDS@#$KERNEL_DEPENDS#g" \
     -e "s#@KERNEL_DEPENDS_BUILD@#$KERNEL_DEPENDS_BUILD#g" \
     -e "s#@KERNEL_HEADERS@#$KERNEL_HEADERS#g" \

debian/control.docs.in

@@ -2,6 +2,8 @@ Package: linuxcnc-doc-en
 Provides: linuxcnc-doc
 Architecture: all
 Depends: ${misc:Depends}
+Breaks: linuxcnc-uspace (<= 2.9.0~pre0+git20220402.2500863908-4),
+Replaces: linuxcnc-uspace (<= 2.9.0~pre0+git20220402.2500863908-4)
 Recommends: xdg-utils
 Suggests: pdf-viewer
 Description: motion controller for CNC machines and robots (English documentation)
@@ -15,6 +17,8 @@ Package: linuxcnc-doc-fr
 Provides: linuxcnc-doc
 Architecture: all
 Depends: ${misc:Depends}
+Breaks: linuxcnc-uspace (<= 2.9.0~pre0+git20220402.2500863908-4)
+Replaces: linuxcnc-uspace (<= 2.9.0~pre0+git20220402.2500863908-4)
 Recommends: xdg-utils
 Suggests: pdf-viewer
 Description: motion controller for CNC machines and robots (French documentation)
@@ -28,6 +32,8 @@ Package: linuxcnc-doc-es
 Provides: linuxcnc-doc
 Architecture: all
 Depends: ${misc:Depends}
+Breaks: linuxcnc-uspace (<= 2.9.0~pre0+git20220402.2500863908-4)
+Replaces: linuxcnc-uspace (<= 2.9.0~pre0+git20220402.2500863908-4)
 Recommends: xdg-utils
 Suggests: pdf-viewer
 Description: controlador de movimiento para máquinas CNC y robots (Español).

debian/control.main-pkg.in

@@ -1,5 +1,11 @@
 Package: @MAIN_PACKAGE_NAME@
-Conflicts: linuxcnc-sim, @OTHER_MAIN_PACKAGE_NAME@
+Conflicts:
+    linuxcnc-sim,
+    @OTHER_MAIN_PACKAGE_NAME@
+Breaks:
+    linuxcnc-doc-en (<= 2.9.0~pre0+git20220402.2500863908-4),
+    linuxcnc-doc-es (<= 2.9.0~pre0+git20220402.2500863908-4),
+    linuxcnc-doc-fr (<= 2.9.0~pre0+git20220402.2500863908-4)
 Architecture: any
 Depends:
     ${misc:Depends},

debian/linuxcnc-doc-en.doc-base

@@ -4,6 +4,7 @@ Section: Science/Engineering
 
 Format: PDF
 Files:
+ /usr/share/doc/linuxcnc/LinuxCNC_Developer.pdf
  /usr/share/doc/linuxcnc/LinuxCNC_Documentation.pdf
  /usr/share/doc/linuxcnc/LinuxCNC_Getting_Started.pdf
  /usr/share/doc/linuxcnc/LinuxCNC_Integrator.pdf

debian/linuxcnc-doc-en.docs

@@ -0,0 +1,15 @@
+usr/share/doc/linuxcnc/LinuxCNC_Developer.pdf
+usr/share/doc/linuxcnc/LinuxCNC_Documentation.pdf
+usr/share/doc/linuxcnc/LinuxCNC_Getting_Started.pdf
+usr/share/doc/linuxcnc/LinuxCNC_Integrator.pdf
+usr/share/doc/linuxcnc/LinuxCNC_Manual_Pages.pdf
+
+usr/share/doc/linuxcnc/AUTHORS
+usr/share/doc/linuxcnc/INSTALL.adoc
+usr/share/doc/linuxcnc/README.adoc
+usr/share/doc/linuxcnc/README.axis
+usr/share/doc/linuxcnc/axis_light_background
+usr/share/doc/linuxcnc/rtfaults.adoc
+usr/share/doc/linuxcnc/tklinuxcnc.adoc
+
+docs/html/gcode.html

debian/linuxcnc-doc-en.install

@@ -0,0 +1,5 @@
+debian/extras/usr/share/applications/linuxcnc-documentation.desktop   usr/share/applications
+debian/extras/usr/share/applications/linuxcnc-gcoderef.desktop        usr/share/applications
+debian/extras/usr/share/applications/linuxcnc-gettingstarted.desktop  usr/share/applications
+debian/extras/usr/share/applications/linuxcnc-integratorinfo.desktop  usr/share/applications
+debian/extras/usr/share/applications/linuxcnc-manualpages.desktop     usr/share/applications

debian/linuxcnc-doc-es.docs

@@ -0,0 +1,9 @@
+usr/share/doc/linuxcnc/LinuxCNC_Developer_es.pdf
+usr/share/doc/linuxcnc/LinuxCNC_Documentation_es.pdf
+usr/share/doc/linuxcnc/LinuxCNC_Getting_Started_es.pdf
+usr/share/doc/linuxcnc/LinuxCNC_Integrator_es.pdf
+
+usr/share/doc/linuxcnc/asciidoc-markup_es.adoc
+usr/share/doc/linuxcnc/rtfaults_es.adoc
+
+docs/html/es/gcode.html

debian/linuxcnc-doc-es.install

@@ -0,0 +1 @@
+debian/extras/usr/share/applications/*_es.desktop usr/share/applications/

debian/linuxcnc-doc-fr.docs

@@ -0,0 +1,6 @@
+usr/share/doc/linuxcnc/LinuxCNC_Developer_fr.pdf
+usr/share/doc/linuxcnc/LinuxCNC_Documentation_fr.pdf
+usr/share/doc/linuxcnc/LinuxCNC_Getting_Started_fr.pdf
+usr/share/doc/linuxcnc/LinuxCNC_Integrator_fr.pdf
+
+docs/html/fr/gcode.html

debian/linuxcnc-doc-fr.install

@@ -0,0 +1 @@
+debian/extras/usr/share/applications/*_fr.desktop usr/share/applications/

debian/linuxcnc-doc-zh-cn.docs

@@ -0,0 +1,6 @@
+usr/share/doc/linuxcnc/LinuxCNC_Developer_zh_CN.pdf
+usr/share/doc/linuxcnc/LinuxCNC_Documentation_zh_CN.pdf
+usr/share/doc/linuxcnc/LinuxCNC_Getting_Started_zh_CN.pdf
+usr/share/doc/linuxcnc/LinuxCNC_Integrator_zh_CN.pdf
+
+docs/html/zh_CN/gcode.html

debian/linuxcnc-doc-zh-cn.install

@@ -0,0 +1 @@
+debian/extras/usr/share/applications/*_zh_CN.desktop usr/share/applications/

debian/linuxcnc-uspace-dev.install

@@ -0,0 +1,7 @@
+usr/bin/halcompile
+usr/include/linuxcnc
+usr/lib/liblinuxcnc.a
+usr/lib/*.so
+usr/share/linuxcnc/Makefile.modinc
+usr/share/man/man1/halcompile.1
+usr/share/man/man3

debian/linuxcnc-uspace.docs

@@ -0,0 +1,3 @@
+usr/share/doc/linuxcnc/examples
+
+README.md

debian/linuxcnc-uspace.links

@@ -0,0 +1 @@
+usr/share/linuxcnc/ncfiles usr/share/doc/linuxcnc/examples/nc_files