Skip to content

Commit 1ffed0f

Browse files
committed
the new linuxcnc-doc-* debs conflict with the old linuxcnc-uspace, and 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}.
1 parent dfd4ab3 commit 1ffed0f

File tree

2 files changed

+13
-1
lines changed

2 files changed

+13
-1
lines changed

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},

0 commit comments

Comments
 (0)