Index: work/OS/debian/librnd2-dev.install
===================================================================
--- work/OS/debian/librnd2-dev.install	(revision 29878)
+++ work/OS/debian/librnd2-dev.install	(nonexistent)
@@ -1,4 +0,0 @@
-/usr/include/librnd/*
-/usr/share/librnd/librnd.mak
-/usr/lib/librnd
-/usr/lib/*.so
Index: work/OS/debian/control
===================================================================
--- work/OS/debian/control	(revision 29878)
+++ work/OS/debian/control	(revision 29879)
@@ -11,7 +11,7 @@
 
 Package: pcb-rnd
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, pcb-rnd-core, pcb-rnd-io-standard, pcb-rnd-io-alien, pcb-rnd-hid-gtk2-gl, pcb-rnd-hid-gtk2-gdk, pcb-rnd-export, pcb-rnd-export-sim, pcb-rnd-export-extra, pcb-rnd-auto, pcb-rnd-extra, pcb-rnd-cloud, pcb-rnd-doc
+Depends: ${misc:Depends}, ${shlibs:Depends}, pcb-rnd-core, pcb-rnd-io-standard, pcb-rnd-io-alien, pcb-rnd-hid-gtk2-gl, pcb-rnd-hid-gtk2-gdk, pcb-rnd-export, pcb-rnd-export-sim, pcb-rnd-export-extra, pcb-rnd-auto, pcb-rnd-extra, pcb-rnd-cloud, pcb-rnd-doc, pcb-rnd-import-net
 Suggests: geda-gnetlist
 Description: Standard installation of pcb-rnd
  pcb-rnd is a highly modular PCB (Printed Circuit Board) layout tool
@@ -96,12 +96,6 @@
 Description: Export plugins to simulators
  Export the board in formats that can be used for simulation: openems.
 
-Package: librnd-dev
-Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, librnd2 (= ${binary:Version}), pcb-rnd-core
-Description: pcb-rnd library, headers.
- HID, polygons, infrastructure for 3rd party applications.
-
 Package: pcb-rnd-lib-gl
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}, pcb-rnd-core
@@ -124,12 +118,17 @@
 
 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
  graphics, gschem and tinycad.
 
+Package: librnd-dev
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends}, librnd2 (= ${binary:Version}), pcb-rnd-core
+Description: pcb-rnd library, headers.
+ HID, polygons, infrastructure for 3rd party applications.
+
 Package: pcb-rnd-auto
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}, pcb-rnd-core, pcb-rnd-lib-io
@@ -145,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
Index: work/OS/debian/librnd-dev.install
===================================================================
--- work/OS/debian/librnd-dev.install	(nonexistent)
+++ work/OS/debian/librnd-dev.install	(revision 29879)
@@ -0,0 +1,6 @@
+/usr/include/librnd/*
+/usr/share/librnd/librnd.mak
+/usr/lib/librnd
+/usr/lib/*.so
+/usr/lib/librnd/gen_conf
+/usr/lib/librnd/puplug
Index: work/OS/debian/pcb-rnd-core.install
===================================================================
--- work/OS/debian/pcb-rnd-core.install	(revision 29878)
+++ work/OS/debian/pcb-rnd-core.install	(revision 29879)
@@ -2,6 +2,9 @@
 /usr/share/man/man1/pcb-rnd.1
 /etc/pcb-rnd/pcb-conf.lht
 /etc/pcb-rnd/pcb-menu-default.lht
+/etc/pcb-rnd/default2.lht
+/etc/pcb-rnd/default4.lht
+/etc/pcb-rnd/default_font
 /usr/bin/fp2preview
 /usr/bin/fp2subc
 /usr/bin/pcb-prj2lht
@@ -8,3 +11,4 @@
 /usr/share/man/man1/fp2preview.1
 /usr/share/man/man1/fp2subc.1
 /usr/share/man/man1/pcb-prj2lht.1
+/usr/share/pcb-rnd/pcblib/*
Index: work/OS/debian_gen/patches/01_Bdale.patch
===================================================================
--- work/OS/debian_gen/patches/01_Bdale.patch	(revision 29878)
+++ work/OS/debian_gen/patches/01_Bdale.patch	(revision 29879)
@@ -1,5 +1,5 @@
---- control	2020-01-16 09:26:23.917824729 +0100
-+++ control.bdale	2020-02-25 02:33:31.000000000 +0100
+--- 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
@@ -8,12 +8,9 @@
  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.
+@@ -124,7 +125,7 @@
  
--Package: librnd2-dev
-+Package: librnd-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
@@ -20,14 +17,14 @@
  Description: pcb-rnd library, headers.
   HID, polygons, infrastructure for 3rd party applications.
  
-@@ -123,6 +124,7 @@
+@@ -143,6 +144,7 @@
  
- Package: pcb-rnd-import-net
+ 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: Netlist/schematics import plugins.
-  Import netlist and footprint information from edif, ltspice, mentor
+ 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