separate libvyatta-cfg1 package

10 files changed, 27 insertions, 26 deletions

diff --git a/debian/control b/debian/control
index 33abac8..2d7e270 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,6 @@ Standards-Version: 3.7.2
 Package: vyatta-cfg
 Architecture: any
 Depends: sed (>= 4.1.5),
- perl (>= 5.8.8),
  procps (>= 1:3.2.7-3),
  coreutils (>= 5.97-5.3),
  vyatta-bash | bash (>= 3.1),
@@ -20,15 +19,12 @@ Depends: sed (>= 4.1.5),
  parted,
  dhcp3-client | vyatta-dhcp3-client,
  bsdutils (>=1:2.13),
- libc6 (>= 2.7-6),
- libsort-versions-perl,
- libfile-sync-perl,
  vlan,
  ethtool,
  iproute,
- libglib2.0-0,
  curl,
- libboost-filesystem1.40.0
+ libvyatta-cfg1 (=${binary:Version}),
+ ${perl:Depends}, ${shlibs:Depends}
 Replaces: vyatta-cfg-firewall, 
  vyatta-cfg-quagga
 Suggests: util-linux (>= 2.13-5),
@@ -36,17 +32,25 @@ Suggests: util-linux (>= 2.13-5),
  ncurses-bin (>= 5.5-5),
  ntpdate
 Description: Vyatta configuration system
- This package has the Vyatta configuration system, including the configuration
- back-end library, the base configuration templates, and the config-mode CLI
- completion mechanism.
+ This package provides the Vyatta configuration system, including the base
+ configuration templates and the config-mode CLI completion mechanism.
+
+Package: libvyatta-cfg1
+Architecture: any
+Depends: libsort-versions-perl,
+ libfile-sync-perl,
+ ${perl:Depends}, ${shlibs:Depends}
+Replaces: vyatta-cfg
+Description: vyatta-cfg back-end library
+ Vyatta configuration back-end library (libvyatta-cfg).
 
 Package: libvyatta-cfg-dev
 Architecture: any
 Priority: optional
 Section: libdevel
-Depends: libboost-filesystem1.40-dev, ${shlibs:Depends}
-Replaces: vyatta-cfg
-Description: vyatta-cfg development package
+Depends: libvyatta-cfg1 (=${binary:Version}),
+ libboost-filesystem1.40-dev
+Description: libvyatta-cfg development package
  Development header and library files for the Vyatta configuration back-end
  library.
 
diff --git a/debian/libvyatta-cfg-dev.install b/debian/libvyatta-cfg-dev.install
index dc001b8..450792e 100644
--- a/debian/libvyatta-cfg-dev.install
+++ b/debian/libvyatta-cfg-dev.install
@@ -1,3 +1,3 @@
 usr/include
-usr/lib/*.so*
+usr/lib/*.so
 usr/lib/*.*a
diff --git a/debian/libvyatta-cfg-dev.lintian-overrides b/debian/libvyatta-cfg-dev.lintian-overrides
index f4049b5..e69de29 100644
--- a/debian/libvyatta-cfg-dev.lintian-overrides
+++ b/debian/libvyatta-cfg-dev.lintian-overrides
@@ -1 +0,0 @@
-libvyatta-cfg-dev: package-name-doesnt-match-sonames
diff --git a/debian/libvyatta-cfg1.install b/debian/libvyatta-cfg1.install
new file mode 100644
index 0000000..29063b5
--- /dev/null
+++ b/debian/libvyatta-cfg1.install
@@ -0,0 +1,2 @@
+usr/lib/*.so.*
+opt/vyatta/share/perl5
diff --git a/debian/libvyatta-cfg1.lintian-overrides b/debian/libvyatta-cfg1.lintian-overrides
new file mode 100644
index 0000000..f038351
--- /dev/null
+++ b/debian/libvyatta-cfg1.lintian-overrides
@@ -0,0 +1,2 @@
+libvyatta-cfg1: dir-or-file-in-opt
+libvyatta-cfg1: file-in-unusual-dir
diff --git a/debian/rules b/debian/rules
index e5353c9..59c7712 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,7 +17,9 @@ clean:
 
 binary binary-arch binary-indep: install
 	rm -f debian/files
-	dh binary --before dh_gencontrol
+	dh binary --before dh_perl
+	dh_perl /opt/vyatta/share/perl5 /opt/vyatta/share/perl5/Vyatta
+	dh binary --after dh_perl --before dh_gencontrol
 	rm -f debian/*/DEBIAN/conffiles
 	if [ -f "../.VYATTA_DEV_BUILD" ]; then \
 		dh_gencontrol -- -v999.dev; \
diff --git a/debian/vyatta-cfg.install b/debian/vyatta-cfg.install
index a41d29e..5c1fdb4 100644
--- a/debian/vyatta-cfg.install
+++ b/debian/vyatta-cfg.install
@@ -1,3 +1,4 @@
-usr/lib/*.so.*
-opt
 etc
+opt/vyatta/share/enumeration
+opt/vyatta/sbin
+opt/vyatta/etc
diff --git a/debian/vyatta-cfg.lintian-overrides b/debian/vyatta-cfg.lintian-overrides
index ee5e9e1..217dc83 100644
--- a/debian/vyatta-cfg.lintian-overrides
+++ b/debian/vyatta-cfg.lintian-overrides
@@ -1,5 +1,4 @@
 vyatta-cfg: file-in-unusual-dir
 vyatta-cfg: dir-or-file-in-opt
-vyatta-cfg: package-name-doesnt-match-sonames
 vyatta-cfg: file-in-etc-not-marked-as-conffile
 vyatta-cfg: init.d-script-not-marked-as-conffile
diff --git a/debian/vyatta-cfg.postinst.in b/debian/vyatta-cfg.postinst.in
index c307803..c007538 100644
--- a/debian/vyatta-cfg.postinst.in
+++ b/debian/vyatta-cfg.postinst.in
@@ -5,10 +5,6 @@ exec_prefix=@exec_prefix@
 sysconfdir=@sysconfdir@
 sbindir=@sbindir@
 
-if [ "$1" = "configure" ]; then
-	ldconfig
-fi
-
 for dir in $sysconfdir/config $prefix/config; do
   if [ -d "$dir" ]; then
     # already exists
diff --git a/debian/vyatta-cfg.postrm.in b/debian/vyatta-cfg.postrm.in
index 2e50b32..c211589 100644
--- a/debian/vyatta-cfg.postrm.in
+++ b/debian/vyatta-cfg.postrm.in
@@ -1,9 +1,5 @@
 #!/bin/bash
 
-if [ "$1" = "remove" ]; then
-	ldconfig
-fi
-
 if [ "$1" = "purge" ]; then
   update-rc.d vyatta-router remove >/dev/null || exit $?
 fi