Skip to content

Commit 3766224

Browse files
committed
the new linuxcnc-doc-* debs conflict with the old linuxcnc-uspace, and vice versa
The G-code quick ref and its translations moved from linuxcnc-uspace to linuxcnc-doc-*, hence the conflict.
1 parent 1e58d54 commit 3766224

File tree

2 files changed

+13
-2
lines changed

2 files changed

+13
-2
lines changed

debian/control.docs.in

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ 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)
56
Recommends: xdg-utils
67
Suggests: pdf-viewer
78
Description: motion controller for CNC machines and robots (English documentation)
@@ -15,6 +16,7 @@ Package: linuxcnc-doc-fr
1516
Provides: linuxcnc-doc
1617
Architecture: all
1718
Depends: ${misc:Depends}
19+
Conflicts: linuxcnc-uspace (<= 2.9.0~pre0+git20220402.2500863908-4)
1820
Recommends: xdg-utils
1921
Suggests: pdf-viewer
2022
Description: motion controller for CNC machines and robots (French documentation)
@@ -28,6 +30,7 @@ Package: linuxcnc-doc-es
2830
Provides: linuxcnc-doc
2931
Architecture: all
3032
Depends: ${misc:Depends}
33+
Conflicts: linuxcnc-uspace (<= 2.9.0~pre0+git20220402.2500863908-4)
3134
Recommends: mailcap
3235
Suggests: pdf-viewer
3336
Description: controlador de movimiento para máquinas CNC y robots (Español).
@@ -43,7 +46,9 @@ Architecture: all
4346
Depends: ${misc:Depends}
4447
Recommends: xdg-utils
4548
Suggests: pdf-viewer
46-
Conflicts: linuxcnc-doc-cn
49+
Conflicts:
50+
linuxcnc-doc-cn,
51+
linuxcnc-uspace (<= 2.9.0~pre0+git20220402.2500863908-4)
4752
Replaces: linuxcnc-doc-cn
4853
Description: motion controller for CNC machines and robots (Chinese
4954
documentation)

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+
linuxcnc-doc-en (<= 2.9.0~pre0+git20220402.2500863908-4),
6+
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)
39
Architecture: any
410
Depends:
511
${misc:Depends},

0 commit comments

Comments
 (0)