Index: work/OS/debian/control =================================================================== --- work/OS/debian/control (revision 33611) +++ work/OS/debian/control (revision 33612) @@ -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, pcb-rnd-import-net +Depends: ${misc:Depends}, ${shlibs:Depends}, pcb-rnd-core (= ${binary:Version}), pcb-rnd-io-standard (= ${binary:Version}), pcb-rnd-io-alien (= ${binary:Version}), pcb-rnd-hid-gtk2-gl (= ${binary:Version}), pcb-rnd-hid-gtk2-gdk (= ${binary:Version}), pcb-rnd-export (= ${binary:Version}), pcb-rnd-export-sim (= ${binary:Version}), pcb-rnd-export-extra (= ${binary:Version}), pcb-rnd-auto (= ${binary:Version}), pcb-rnd-extra (= ${binary:Version}), pcb-rnd-cloud (= ${binary:Version}), pcb-rnd-doc (= ${binary:Version}), pcb-rnd-import-net (= ${binary:Version}) Suggests: geda-gnetlist Description: Standard installation of pcb-rnd pcb-rnd is a highly modular PCB (Printed Circuit Board) layout tool @@ -136,7 +136,7 @@ Package: pcb-rnd-debug Architecture: any -Depends: ${misc:Depends}, ${shlibs:Depends}, pcb-rnd-core +Depends: ${misc:Depends}, ${shlibs:Depends}, pcb-rnd-core (= ${binary:Version}) Description: Debug and diagnostics. Extra action commands to help in debugging and diagnosing problems and bugs. @@ -143,7 +143,7 @@ Package: pcb-rnd-export Architecture: any -Depends: ${misc:Depends}, ${shlibs:Depends}, pcb-rnd-core +Depends: ${misc:Depends}, ${shlibs:Depends}, pcb-rnd-core (= ${binary:Version}) Description: Common export plugins. Export the board in vector graphics (svg, ps, eps), raster graphics (png, jpeg, etc.), gerber, 3d model in openscad, xy for pick and @@ -159,13 +159,13 @@ Package: pcb-rnd-export-sim Architecture: any -Depends: ${misc:Depends}, ${shlibs:Depends}, pcb-rnd-core +Depends: ${misc:Depends}, ${shlibs:Depends}, pcb-rnd-core (= ${binary:Version}) Description: Export plugins to simulators Export the board in formats that can be used for simulation: openems. Package: pcb-rnd-lib-gl Architecture: any -Depends: ${misc:Depends}, ${shlibs:Depends}, pcb-rnd-core +Depends: ${misc:Depends}, ${shlibs:Depends}, pcb-rnd-core (= ${binary:Version}) Description: Support library for rendering with opengl. Provides plugins for driving an opengl output, rendering pcb-rnd views on opengl. @@ -172,13 +172,13 @@ Package: pcb-rnd-hid-gtk2-gl Architecture: any -Depends: ${misc:Depends}, ${shlibs:Depends}, pcb-rnd-core, pcb-rnd-lib-gtk, pcb-rnd-lib-gl +Depends: ${misc:Depends}, ${shlibs:Depends}, pcb-rnd-core (= ${binary:Version}), pcb-rnd-lib-gtk (= ${binary:Version}), pcb-rnd-lib-gl (= ${binary:Version}) Description: GUI: gtk2, opengl Hardware accelerated (opengl) rendering on gtk2. Package: pcb-rnd-import-geo Architecture: any -Depends: ${misc:Depends}, ${shlibs:Depends}, pcb-rnd-core +Depends: ${misc:Depends}, ${shlibs:Depends}, pcb-rnd-core (= ${binary:Version}) Description: Geometry import plugins. Import geometry from HPGL plots. HPGL can be produced (plotted) with most mechanical cads. @@ -185,7 +185,7 @@ Package: pcb-rnd-import-net Architecture: any -Depends: ${misc:Depends}, ${shlibs:Depends}, pcb-rnd-core, pcb-rnd-lib-io +Depends: ${misc:Depends}, ${shlibs:Depends}, pcb-rnd-core (= ${binary:Version}), pcb-rnd-lib-io (= ${binary:Version}) Replaces: pcb-rnd (<< 2.2.0-2) Breaks: pcb-rnd (<< 2.2.0-2) Description: Netlist/schematics import plugins. @@ -194,19 +194,19 @@ Package: librnd-dev Architecture: any -Depends: ${misc:Depends}, ${shlibs:Depends}, librnd2 (= ${binary:Version}), pcb-rnd-core +Depends: ${misc:Depends}, ${shlibs:Depends}, librnd2 (= ${binary:Version}), pcb-rnd-core (= ${binary:Version}) 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, pcb-rnd-io-standard +Depends: ${misc:Depends}, ${shlibs:Depends}, pcb-rnd-core (= ${binary:Version}), pcb-rnd-lib-io (= ${binary:Version}), pcb-rnd-io-standard (= ${binary:Version}) Description: Autoroute and autoplace. Feature plugins for automated component placing and track routing. Package: pcb-rnd-lib-io Architecture: any -Depends: ${misc:Depends}, ${shlibs:Depends}, pcb-rnd-core +Depends: ${misc:Depends}, ${shlibs:Depends}, pcb-rnd-core (= ${binary:Version}) Description: Support library for alien file formats. Provides generic, low level parsers (such as s-expression parser) for I/O plugins that need to deal with alien file formats. @@ -213,7 +213,7 @@ Package: pcb-rnd-io-standard Architecture: any -Depends: ${misc:Depends}, ${shlibs:Depends}, pcb-rnd-core, pcb-rnd-lib-io +Depends: ${misc:Depends}, ${shlibs:Depends}, pcb-rnd-core (= ${binary:Version}), pcb-rnd-lib-io (= ${binary:Version}) Replaces: pcb-rnd (<< 2.2.0-2) Breaks: pcb-rnd (<< 2.2.0-2) Description: Commonly used non-native board and footprint file formats @@ -222,7 +222,7 @@ Package: pcb-rnd-lib-gui Architecture: any -Depends: ${misc:Depends}, ${shlibs:Depends}, pcb-rnd-core +Depends: ${misc:Depends}, ${shlibs:Depends}, pcb-rnd-core (= ${binary:Version}) Description: Support library for building the GUI. Provides pcb-rnd specific dialog boxes (e.g. fontsel) and top window GUI elements. @@ -239,7 +239,7 @@ Package: pcb-rnd-lib-gtk Architecture: any -Depends: ${misc:Depends}, ${shlibs:Depends}, pcb-rnd-core, pcb-rnd-lib-gui +Depends: ${misc:Depends}, ${shlibs:Depends}, pcb-rnd-core (= ${binary:Version}), pcb-rnd-lib-gui (= ${binary:Version}) Description: Support library for building the GUI with gtk. Provides the common gtk code (e.g. dialog box engine, input handling) for any gtk based HID plugin. @@ -246,7 +246,7 @@ Package: pcb-rnd-hid-lesstif Architecture: any -Depends: ${misc:Depends}, ${shlibs:Depends}, pcb-rnd-core, pcb-rnd-lib-gui +Depends: ${misc:Depends}, ${shlibs:Depends}, pcb-rnd-core (= ${binary:Version}), pcb-rnd-lib-gui (= ${binary:Version}) Description: GUI: motif/lesstif, software render Lightweight GUI and software rendering using the motif (lesstif) toolkit. @@ -253,13 +253,13 @@ Package: librnd2 Architecture: any -Depends: ${misc:Depends}, ${shlibs:Depends}, pcb-rnd-core +Depends: ${misc:Depends}, ${shlibs:Depends}, pcb-rnd-core (= ${binary:Version}) Description: pcb-rnd library, binaries. HID, polygons, infrastructure for 3rd party applications. Package: pcb-rnd-io-alien Architecture: any -Depends: ${misc:Depends}, ${shlibs:Depends}, pcb-rnd-core, pcb-rnd-lib-io +Depends: ${misc:Depends}, ${shlibs:Depends}, pcb-rnd-core (= ${binary:Version}), pcb-rnd-lib-io (= ${binary:Version}) Description: File format compatibility with other PCB layout designers. Load and/or save boards in file formats supported by other EDA tools, such as KiCAD, Eagle, protel/autotrax, etc. @@ -266,7 +266,7 @@ Package: pcb-rnd-cloud Architecture: any -Depends: ${misc:Depends}, ${shlibs:Depends}, wget, pcb-rnd-core +Depends: ${misc:Depends}, ${shlibs:Depends}, wget (= ${binary:Version}), pcb-rnd-core (= ${binary:Version}) Description: Networking plugins. 'Cloud' footprint access plugin that integrates edakrill and gedasymbols.org. @@ -273,7 +273,7 @@ Package: pcb-rnd-export-extra Architecture: any -Depends: ${misc:Depends}, ${shlibs:Depends}, pcb-rnd-core, pcb-rnd-export +Depends: ${misc:Depends}, ${shlibs:Depends}, pcb-rnd-core (= ${binary:Version}), pcb-rnd-export (= ${binary:Version}) Description: Export formats: special/extra Less commonly used export formats: fidocadj, ipc-356-d, direct printing with lpr. @@ -280,13 +280,13 @@ Package: pcb-rnd-hid-gtk2-gdk Architecture: any -Depends: ${misc:Depends}, ${shlibs:Depends}, pcb-rnd-core, pcb-rnd-lib-gtk +Depends: ${misc:Depends}, ${shlibs:Depends}, pcb-rnd-core (= ${binary:Version}), pcb-rnd-lib-gtk (= ${binary:Version}) Description: GUI: gtk2, software render Software rendering on gtk2, using the gdk API. Package: pcb-rnd-extra Architecture: any -Depends: ${misc:Depends}, ${shlibs:Depends}, pcb-rnd-core +Depends: ${misc:Depends}, ${shlibs:Depends}, pcb-rnd-core (= ${binary:Version}) Description: Extra action commands and optional functionality. Align objects in grid, optimize tracks, font editor, combine polygons, renumber subcircuits, apply vendor drill mapping. Index: work/OS/debian_gen/gen.sh =================================================================== --- work/OS/debian_gen/gen.sh (revision 33611) +++ work/OS/debian_gen/gen.sh (revision 33612) @@ -75,9 +75,11 @@ then dlong=`cat_desc $auto/$pkg.long` fi - deps="`sed 's/ /, /g' < $auto/$pkg.deps`" + deps="`cat $auto/$pkg.deps`" + if test ! -z "$deps" then + deps="`echo \"$deps\" | sed 's/ / (= \${binary:Version}), /g;s/$/ (= \${binary:Version})/'`" deps=", $deps" fi if test -z "$arch" @@ -150,7 +152,7 @@ gen_installs gen_rules -for n in `ls patches/*.patch` +for n in `ls patches/*.patch 2>/dev/null` do cat $n | (cd $debian && patch -p0) done Index: work/OS/debian_gen/patches/01_Bdale.patch =================================================================== --- work/OS/debian_gen/patches/01_Bdale.patch (revision 33611) +++ work/OS/debian_gen/patches/01_Bdale.patch (nonexistent) @@ -1,11 +0,0 @@ ---- control 2020-05-17 07:16:49.245630176 +0200 -+++ control.patched 2020-05-17 07:16:39.611630746 +0200 -@@ -130,7 +130,7 @@ - - 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. - Index: work/OS/debian_gen/patches/01_Bdale.txt =================================================================== --- work/OS/debian_gen/patches/01_Bdale.txt (revision 33611) +++ work/OS/debian_gen/patches/01_Bdale.txt (nonexistent) @@ -1,4 +0,0 @@ -- 'librnd2 (= ${binary:Version})': always depend on the same version (should be - removed once librnd is moved to a separate repo) - -