Index: debian/control
===================================================================
--- debian/control	(revision 29876)
+++ debian/control	(revision 29877)
@@ -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.
@@ -95,9 +96,9 @@
 Description: Export plugins to simulators
  Export the board in formats that can be used for simulation: openems.
 
-Package: librnd2-dev
+Package: librnd-dev
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, librnd2, pcb-rnd-core
+Depends: ${misc:Depends}, ${shlibs:Depends}, librnd2 (= ${binary:Version}), pcb-rnd-core
 Description: pcb-rnd library, headers.
  HID, polygons, infrastructure for 3rd party applications.
 
@@ -123,6 +124,7 @@
 
 Package: pcb-rnd-import-net
 Architecture: any
+Replaces: pcb-rnd (<< 2.2.0-2)
 Depends: ${misc:Depends}, ${shlibs:Depends}, pcb-rnd-core, pcb-rnd-lib-io
 Description: Netlist/schematics import plugins.
  Import netlist and footprint information from edif, ltspice, mentor
@@ -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: debian_gen/gen.sh
===================================================================
--- debian_gen/gen.sh	(revision 29876)
+++ debian_gen/gen.sh	(revision 29877)
@@ -128,3 +128,7 @@
 gen_installs
 gen_rules
 
+for n in `ls patches/*.patch`
+do
+	cat $n | (cd $debian && patch -p0)
+done
Index: debian_gen/patches/01_Bdale.patch
===================================================================
--- debian_gen/patches/01_Bdale.patch	(nonexistent)
+++ debian_gen/patches/01_Bdale.patch	(revision 29877)
@@ -0,0 +1,38 @@
+--- control	2020-01-16 09:26:23.917824729 +0100
++++ control.bdale	2020-02-25 02:33:31.000000000 +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.
+@@ -95,9 +96,9 @@
+ Description: Export plugins to simulators
+  Export the board in formats that can be used for simulation: openems.
+ 
+-Package: librnd2-dev
++Package: librnd-dev
+ Architecture: any
+-Depends: ${misc:Depends}, ${shlibs:Depends}, librnd2, pcb-rnd-core
++Depends: ${misc:Depends}, ${shlibs:Depends}, librnd2 (= ${binary:Version}), pcb-rnd-core
+ Description: pcb-rnd library, headers.
+  HID, polygons, infrastructure for 3rd party applications.
+ 
+@@ -123,6 +124,7 @@
+ 
+ Package: pcb-rnd-import-net
+ Architecture: any
++Replaces: pcb-rnd (<< 2.2.0-2)
+ Depends: ${misc:Depends}, ${shlibs:Depends}, pcb-rnd-core, pcb-rnd-lib-io
+ Description: Netlist/schematics import plugins.
+  Import netlist and footprint information from edif, ltspice, mentor
+@@ -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: debian_gen/patches/01_Bdale.txt
===================================================================
--- debian_gen/patches/01_Bdale.txt	(nonexistent)
+++ debian_gen/patches/01_Bdale.txt	(revision 29877)
@@ -0,0 +1,7 @@
+- '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)
+
+