Index: work/OS/debian_gen/gen.sh =================================================================== --- work/OS/debian_gen/gen.sh (revision 30813) +++ work/OS/debian_gen/gen.sh (revision 30814) @@ -23,8 +23,13 @@ DLONG["pcb-rnd"]="`cat $auto/../description.txt`" ARCH["pcb-rnd-doc"]="all" -# Bdale's patches for smooth upgrade +# Bdale's patches for smooth upgrade: +# 'Replaces:' make sure the modular packaging replaces the old, monoithic +# package without file collision CONTROL_BONUS["pcb-rnd-import-net"]="Replaces: pcb-rnd (<< 2.2.0-2)" +CONTROL_BONUS["pcb-rnd-doc"]="Replaces: pcb-rnd (<< 2.2.0-2)" +CONTROL_BONUS["pcb-rnd-io-standard"]="Replaces: pcb-rnd (<< 2.2.0-2)" +CONTROL_BONUS["pcb-rnd-core"]="Replaces: pcb-rnd (<< 2.2.0-2)" ### implementation ### Index: work/OS/debian_gen/patches/01_Bdale.patch =================================================================== --- work/OS/debian_gen/patches/01_Bdale.patch (revision 30813) +++ work/OS/debian_gen/patches/01_Bdale.patch (revision 30814) @@ -1,13 +1,5 @@ --- control.orig 2020-02-26 04:54:37.835261701 +0100 +++ control 2020-02-26 04:54:37.861261700 +0100 -@@ -85,6 +85,7 @@ - - Package: pcb-rnd-doc - Architecture: all -+Replaces: pcb-rnd (<< 2.2.0-2) - Depends: ${misc:Depends}, ${shlibs:Depends} - Description: Documentation for pcb-rnd - User manual (html) and manual pages. @@ -124,7 +125,7 @@ Package: librnd-dev @@ -17,19 +9,3 @@ Description: pcb-rnd library, headers. HID, polygons, infrastructure for 3rd party applications. -@@ -143,6 +144,7 @@ - - Package: pcb-rnd-io-standard - Architecture: any -+Replaces: pcb-rnd (<< 2.2.0-2) - Depends: ${misc:Depends}, ${shlibs:Depends}, pcb-rnd-core, pcb-rnd-lib-io - Description: Commonly used non-native board and footprint file formats - Plugins for tEDAx footprint format and the gEDA/PCB file formats -@@ -157,6 +159,7 @@ - - Package: pcb-rnd-core - Architecture: any -+Replaces: pcb-rnd (<< 2.2.0-2) - Depends: ${misc:Depends}, ${shlibs:Depends} - Description: pcb-rnd executable with the core functionality - Includes the data model, the most common action commands, the native Index: work/OS/debian_gen/patches/01_Bdale.txt =================================================================== --- work/OS/debian_gen/patches/01_Bdale.txt (revision 30813) +++ work/OS/debian_gen/patches/01_Bdale.txt (revision 30814) @@ -1,6 +1,3 @@ -- 'Replaces:' make sure the modular packaging replaces the old, monoithic - package without file collision - - 'librnd2 (= ${binary:Version})': always depend on the same version (should be removed once librnd is moved to a separate repo)