Skip to content

Commit 1a928c8

Browse files
committed
fix linuxcnc-* package relationships
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}.
1 parent 0f1edc5 commit 1a928c8

File tree

2 files changed

+10
-9
lines changed

2 files changed

+10
-9
lines changed

debian/control.docs.in

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ Package: linuxcnc-doc-en
22
Provides: linuxcnc-doc
33
Architecture: all
44
Depends: ${misc:Depends}
5-
Conflicts: linuxcnc-uspace (<= 2.9.0~pre0+git20220402.2500863908-4)
5+
Breaks: linuxcnc-uspace (<= 2.9.0~pre0+git20220402.2500863908-4),
6+
Replaces: linuxcnc-uspace (<= 2.9.0~pre0+git20220402.2500863908-4)
67
Recommends: xdg-utils
78
Suggests: pdf-viewer
89
Description: motion controller for CNC machines and robots (English documentation)
@@ -16,7 +17,8 @@ Package: linuxcnc-doc-fr
1617
Provides: linuxcnc-doc
1718
Architecture: all
1819
Depends: ${misc:Depends}
19-
Conflicts: linuxcnc-uspace (<= 2.9.0~pre0+git20220402.2500863908-4)
20+
Breaks: linuxcnc-uspace (<= 2.9.0~pre0+git20220402.2500863908-4)
21+
Replaces: linuxcnc-uspace (<= 2.9.0~pre0+git20220402.2500863908-4)
2022
Recommends: xdg-utils
2123
Suggests: pdf-viewer
2224
Description: motion controller for CNC machines and robots (French documentation)
@@ -30,7 +32,8 @@ Package: linuxcnc-doc-es
3032
Provides: linuxcnc-doc
3133
Architecture: all
3234
Depends: ${misc:Depends}
33-
Conflicts: linuxcnc-uspace (<= 2.9.0~pre0+git20220402.2500863908-4)
35+
Breaks: linuxcnc-uspace (<= 2.9.0~pre0+git20220402.2500863908-4)
36+
Replaces: linuxcnc-uspace (<= 2.9.0~pre0+git20220402.2500863908-4)
3437
Recommends: mailcap
3538
Suggests: pdf-viewer
3639
Description: controlador de movimiento para máquinas CNC y robots (Español).
@@ -46,9 +49,7 @@ Architecture: all
4649
Depends: ${misc:Depends}
4750
Recommends: xdg-utils
4851
Suggests: pdf-viewer
49-
Conflicts:
50-
linuxcnc-doc-cn,
51-
linuxcnc-uspace (<= 2.9.0~pre0+git20220402.2500863908-4)
52+
Conflicts: linuxcnc-doc-cn
5253
Replaces: linuxcnc-doc-cn
5354
Description: motion controller for CNC machines and robots (Chinese
5455
documentation)

debian/control.main-pkg.in

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
Package: @MAIN_PACKAGE_NAME@
22
Conflicts:
33
linuxcnc-sim,
4-
@OTHER_MAIN_PACKAGE_NAME@,
4+
@OTHER_MAIN_PACKAGE_NAME@
5+
Breaks:
56
linuxcnc-doc-en (<= 2.9.0~pre0+git20220402.2500863908-4),
67
linuxcnc-doc-es (<= 2.9.0~pre0+git20220402.2500863908-4),
7-
linuxcnc-doc-fr (<= 2.9.0~pre0+git20220402.2500863908-4),
8-
linuxcnc-doc-zh-cn (<= 2.9.0~pre0+git20220402.2500863908-4)
8+
linuxcnc-doc-fr (<= 2.9.0~pre0+git20220402.2500863908-4)
99
Architecture: any
1010
Depends:
1111
${misc:Depends},

0 commit comments

Comments
 (0)