Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update debian packaging #1887

Merged
merged 20 commits into from
Aug 17, 2022
Merged

Update debian packaging #1887

merged 20 commits into from
Aug 17, 2022

Commits on Aug 16, 2022

  1. Makefile: generate and install the {pnc,step}conf desktop files

    @SebKuzminsky
    SebKuzminsky committed Aug 16, 2022
    Configuration menu
    Copy the full SHA
    a6bc92c View commit details
    Browse the repository at this point in the history

  2. d/configure: get rid of EXTRAS, we don't use it anymore

    @SebKuzminsky
    SebKuzminsky committed Aug 16, 2022
    Configuration menu
    Copy the full SHA
    aa77f2a View commit details
    Browse the repository at this point in the history

  3. d/configure: get rid of EXTRA_FILES, it's not used

    @SebKuzminsky
    SebKuzminsky committed Aug 16, 2022
    Configuration menu
    Copy the full SHA
    728c832 View commit details
    Browse the repository at this point in the history

  4. d/rules: simplify validation of *.desktop files 

    The tools have gotten better, we don't need this clumsy work-around
any more.
    @SebKuzminsky
    SebKuzminsky committed Aug 16, 2022
    Configuration menu
    Copy the full SHA
    dfb16c8 View commit details
    Browse the repository at this point in the history

  5. d/rules: remove dead code

    @SebKuzminsky
    SebKuzminsky committed Aug 16, 2022
    Configuration menu
    Copy the full SHA
    e896b41 View commit details
    Browse the repository at this point in the history

  6. Makefiles: new targets to build & install just software or just docs 

    This is mostly to help the debian packaging build just the
architecture-dependent parts (the software, via `dpkg-buildpackage -B`) or
just the architecture-independent parts (the docs, via `dpkg-buildpackage
-A`).
    @SebKuzminsky
    SebKuzminsky committed Aug 16, 2022
    Configuration menu
    Copy the full SHA
    9f4e940 View commit details
    Browse the repository at this point in the history

  7. d/rules: only build the software (no docs) for architecture-dependent… 

    … packages
    @SebKuzminsky
    SebKuzminsky committed Aug 16, 2022
    Configuration menu
    Copy the full SHA
    fe3d7f6 View commit details
    Browse the repository at this point in the history

  8. d/rules: sort dh_auto_install stuff into -arch and -indep

    @SebKuzminsky
    SebKuzminsky committed Aug 16, 2022
    Configuration menu
    Copy the full SHA
    ebc55fa View commit details
    Browse the repository at this point in the history

  9. linuxcnc-uspace: use dh_install to install the appropriate 'extra' files

    @SebKuzminsky
    SebKuzminsky committed Aug 16, 2022
    Configuration menu
    Copy the full SHA
    2579992 View commit details
    Browse the repository at this point in the history

  10. linuxcnc-uspace: include the optional axis config files & README

    @SebKuzminsky
    SebKuzminsky committed Aug 16, 2022
    Configuration menu
    Copy the full SHA
    97e3e29 View commit details
    Browse the repository at this point in the history

  11. linuxcnc-uspace: use dh_installdocs to include a missing doc

    @SebKuzminsky
    SebKuzminsky committed Aug 16, 2022
    Configuration menu
    Copy the full SHA
    223bf76 View commit details
    Browse the repository at this point in the history

  12. d/rules: change DESTDIR to debian/tmp

    @SebKuzminsky
    SebKuzminsky committed Aug 16, 2022
    Configuration menu
    Copy the full SHA
    2022c4e View commit details
    Browse the repository at this point in the history

  13. linuxcnc-doc-*: use dh_install and dh_installdocs 

    Install docs with dh_installdocs, other files (like .desktop entries)
with dh_install.

Install all docs in /usr/share/doc/linuxcnc, not
/usr/share/doc/linuxcnc-uspace, because that's where the .desktop files
look for the docs.

Handle each lang explicitly because we'll need to different special
things for -en vs all the others.
    @SebKuzminsky
    SebKuzminsky committed Aug 16, 2022
    Configuration menu
    Copy the full SHA
    97c29db View commit details
    Browse the repository at this point in the history

  14. move g-code quick ref from linuxcnc-uspace to doc debs 

    The new translation infrastructure means we need to build the translated
docs to generate the g-code quick refs.

Since we have separate "-arch" and "-indep" targets in debian/rules now,
we don't build the docs when building linuxcnc-uspace, so the g-code
refs need to move to the doc debs.
    @SebKuzminsky
    SebKuzminsky committed Aug 16, 2022
    Configuration menu
    Copy the full SHA
    bed446b View commit details
    Browse the repository at this point in the history

  15. move LinuxCNC_Developer doc from -dev to -doc-en

    @SebKuzminsky
    SebKuzminsky committed Aug 16, 2022
    Configuration menu
    Copy the full SHA
    7aa8362 View commit details
    Browse the repository at this point in the history

  16. linuxcnc-uspace: dh_install stuff from debian/tmp 

    We need to list everything we want in linuxcnc-uspace explicitly now,
since we changed DESTDIR to install into debian/tmp.
    @SebKuzminsky
    SebKuzminsky committed Aug 16, 2022
    Configuration menu
    Copy the full SHA
    9e3c5f1 View commit details
    Browse the repository at this point in the history

  17. linuxcnc-uspace-dev: install with dh_install

    @SebKuzminsky
    SebKuzminsky committed Aug 16, 2022
    Configuration menu
    Copy the full SHA
    51cb55c View commit details
    Browse the repository at this point in the history

  18. linuxcnc-uspace: handle sample configs as docs 

    The sample configs need to live in /usr/share/doc/linuxcnc (not
/usr/share/doc/linuxcnc-uspace), because that's where the linuxcnc
launcher script looks for them.

Handle example nc_files/ symlink with dh_link rather than "by hand".
    @SebKuzminsky
    SebKuzminsky committed Aug 16, 2022
    Configuration menu
    Copy the full SHA
    dfd4ab3 View commit details
    Browse the repository at this point in the history

  19. the new linuxcnc-doc-* debs conflict with the old linuxcnc-uspace, an… 

    …d vice versa

Some documentation files (gcode*.html) moved from linuxcnc-uspace to
linuxcnc-doc-{en,es,fr} (but none moved to -zh-cn).

Thus the new linuxcnc-doc-{en,es,fr} debs Break old linuxcnc-uspace,
and Replace old linuxcnc-uspace, and the new linuxcnc-uspace Breaks
old linuxcnc-doc-{en,es,fr}.
    @SebKuzminsky
    SebKuzminsky committed Aug 16, 2022
    Configuration menu
    Copy the full SHA
    1ffed0f View commit details
    Browse the repository at this point in the history

  20. bump debhelper to 12 (available in buster), no longer need --parallel

    @SebKuzminsky
    SebKuzminsky committed Aug 16, 2022
    Configuration menu
    Copy the full SHA
    5932f22 View commit details
    Browse the repository at this point in the history