Merge branch 'current' into lithiumlithium

Conflicts:
	lib/OPMode.pm
	scripts/vyatta-show-ipsec-status.pl
	templates/show/vpn/ipsec/sa/node.def
	templates/show/vpn/ipsec/sa/peer/node.def
	templates/show/vpn/ipsec/status/node.def

8 files changed, 51 insertions, 15 deletions

diff --git a/debian/autogen.sh b/debian/autogen.sh
index e8c94af..70ecdeb 100755
--- a/debian/autogen.sh
+++ b/debian/autogen.sh
@@ -4,6 +4,7 @@
 rm -rf config
 rm -f aclocal.m4 config.guess config.statusconfig.sub configure INSTALL
 
+mkdir -p
 autoreconf --force --install
 
 rm -f config.sub config.guess
diff --git a/debian/changelog b/debian/changelog
index d8a41b8..13bbddd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,38 @@
+vyatta-op-vpn (0.15.0+vyos2+current2+nmu1) UNRELEASED; urgency=low
+
+  * Non-maintainer upload.
+  * address lintian issues
+  - script-not-executable: removed #!/usr/bin/perl from .pm files
+  - debhelper-but-no-misc-depends: added ${misc:Depends} to Depends: field
+  - debian-rules-missing-recommended-target: added build-arch build-indep
+  - out-of-date-standards-version: updated standards version to 3.9.4
+  - package-contains-linda-override: removed linda override
+  - file-in-unusual-dir: not triggering, removed from override
+  - script-with-language-extension: renamed vyatta-gen-x509-keypair.sh
+    vyatta-gen-x509-keypair
+  * address dpkg-gencontrol issue:
+  - unknown substitution variable ${shlibs:Depends} - removed
+  * address dpkg-source issue:
+  - debian/source/format set to "3.0 (native)"
+  * removed all references to /opt/vyatta but one from source
+
+ -- C.J. Collier <cjcollier@linuxfoundation.org>  Wed, 11 May 2016 02:33:38 +0000
+
+vyatta-op-vpn (0.15.0+vyos2+current2) unstable; urgency=low
+
+  * Remove vyatta-ipsec dependency for migration to upstream strongswan.
+
+ -- Daniil Baturin <daniil@baturin.org>  Mon, 25 Jan 2016 14:23:46 +0100
+
+vyatta-op-vpn (0.15.0+vyos2+current1) unstable; urgency=medium
+
+  [ Thomas Jepp ]
+  * Fix build depends.
+
+  [ Kim Hagen ]
+
+ -- Kim Hagen <kim.sidney@gmail.com>  Sun, 24 Jan 2016 15:22:51 -0500
+
 vyatta-op-vpn (0.15.0+vyos2+lithium8) unstable; urgency=low
 
   * vyatta-op-vpn: update dh_gencontrol with new development build flag
diff --git a/debian/conffiles b/debian/conffiles
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/debian/conffiles
@@ -0,0 +1 @@
+
diff --git a/debian/control b/debian/control
index 57dcaeb..c3f2ec0 100644
--- a/debian/control
+++ b/debian/control
@@ -2,20 +2,20 @@ Source: vyatta-op-vpn
 Section: contrib/net
 Priority: extra
 Maintainer: VyOS Package Maintainers <maintainers@vyos.net>
-Build-Depends: debhelper (>= 5), autotools-dev
-Standards-Version: 3.7.2
+Build-Depends: debhelper (>= 5), autotools-dev, automake, autoconf, cpio, libtool
+Standards-Version: 3.9.4
 
 Package: vyatta-op-vpn
 Architecture: all
 Depends: vyatta-op,
  vyatta-bash | bash (>= 3.1),
  vyatta-cfg-vpn,
- vyatta-ipsec,
- ${shlibs:Depends}
+ strongswan (>= 5.2),
+ ${misc:Depends}
 Suggests: util-linux (>= 2.13-5),
  net-tools,
  ethtool,
  ncurses-bin (>= 5.5-5),
  ntpdate
-Description: VyOS operational commands for VPN
- VyOS commands to operate openswan VPN.
+Description: VyOS operational commands for IPsec VPN
+ VyOS commands for IPsec VPN operations.
diff --git a/debian/linda b/debian/linda
deleted file mode 100644
index 0381d9d..0000000
--- a/debian/linda
+++ /dev/null
@@ -1 +0,0 @@
-Tag: file-in-opt
diff --git a/debian/lintian b/debian/lintian
index a5d78e0..7a94f59 100644
--- a/debian/lintian
+++ b/debian/lintian
@@ -1,2 +1,2 @@
-vyatta-op-vpn: file-in-unusual-dir
-vyatta-op-vpn: dir-or-file-in-opt
+# It's a hassle to move it out of /opt.  I'll get to it later
+#vyatta-op-vpn binary: dir-or-file-in-opt
diff --git a/debian/rules b/debian/rules
index 4b68fde..9231584 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,7 +22,6 @@ CFLAGS = -Wall -g
 configure	 = ./configure
 configure	+= --host=$(DEB_HOST_GNU_TYPE)
 configure	+= --build=$(DEB_BUILD_GNU_TYPE)
-configure	+= --prefix=/opt/vyatta
 configure	+= --mandir=\$${prefix}/share/man
 configure	+= --infodir=\$${prefix}/share/info
 configure	+= CFLAGS="$(CFLAGS)"
@@ -43,9 +42,10 @@ config.status: configure
 	rm -f config.cache
 	$(configure)
 
-build: build-stamp
-
-build-stamp:  config.status
+build: build-arch build-indep
+build-arch: build-stamp
+build-indep: build-stamp
+build-stamp: config.status
 	dh_testdir
 	$(MAKE)
 	touch $@
@@ -68,13 +68,12 @@ clean-patched:
 install: build
 	dh_testdir
 	dh_testroot
-	dh_clean -k 
+	dh_prep
 	dh_installdirs
 
 	$(MAKE) DESTDIR=$(PKGDIR) install
 
 	install -D --mode=0644 debian/lintian $(PKGDIR)/usr/share/lintian/overrides/$(PACKAGE)
-	install -D --mode=0644 debian/linda $(PKGDIR)/usr/share/linda/overrides/$(PACKAGE)
 
 # Build architecture-independent files here.
 binary-indep: build install
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..9f67427
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (native)
\ No newline at end of file