Update our network-manager-strongswan/debian to what is actually used downstream
authorMartin Willi <martin@revosec.ch>
Mon, 2 Jul 2012 08:18:59 +0000 (10:18 +0200)
committerMartin Willi <martin@revosec.ch>
Mon, 2 Jul 2012 08:20:03 +0000 (10:20 +0200)
packages/network-manager-strongswan/Makefile
packages/network-manager-strongswan/debian/changelog
packages/network-manager-strongswan/debian/control
packages/network-manager-strongswan/debian/copyright
packages/network-manager-strongswan/debian/network-manager-strongswan.postinst
packages/network-manager-strongswan/debian/rules

index 0a30dad..afc64c9 100644 (file)
@@ -1,6 +1,6 @@
 
 SOURCE:=../../src/frontends/gnome
-VERSION:=1.1.0rc1
+VERSION:=1.3.0
 
 source:        prepare
        cd build/NetworkManager-strongswan-$(VERSION) && debuild -S
index ad73083..b467e0c 100644 (file)
@@ -1,23 +1,46 @@
-network-manager-strongswan (1.1.0rc1-1~ppa1~jaunty1) jaunty; urgency=low
+network-manager-strongswan (1.3.0-1) unstable; urgency=low
 
-  * ported to NetworkManager 7.1
+  * New upstream release, support for NetworkManager 0.9 (Closes: #639400)
 
- -- Martin Willi <martin@strongswan.org>  Thu, 19 Mar 2009 10:32:13 +0100
+ -- Martin Willi <martin@strongswan.org>  Mon, 02 Jul 2012 09:55:20 +0200
 
-network-manager-strongswan (1.0.0-3~ppa1~intrepid1) intrepid; urgency=low
+network-manager-strongswan (1.1.2-2) unstable; urgency=low
 
-  * depend on EAP-Identity plugin
+  * Do not install unused libtool and static libraries
+    (Closes: #622499)
 
- -- Martin Willi <martin@strongswan.org>  Tue, 24 Feb 2009 11:31:19 +0100
+ -- Martin Willi <martin@strongswan.org>  Tue, 19 Apr 2011 11:07:10 +0200
 
-network-manager-strongswan (1.0.0-2~ppa1~intrepid1) intrepid; urgency=low
+network-manager-strongswan (1.1.2-1) unstable; urgency=low
 
-  * depend on EAP-MD5 and EAP-MSCHAPv2 plugins
+  * New upstream release, fixes pkgconfig for new libnm-glib packages
+    (Closes: #569302)
 
- -- Martin Willi <martin@strongswan.org>  Mon, 23 Feb 2009 14:28:56 +0100
+ -- Martin Willi <martin@strongswan.org>  Thu, 18 Feb 2010 09:41:39 +0100
 
-network-manager-strongswan (1.0.0-1~ppa1~intrepid1) intrepid; urgency=low
+network-manager-strongswan (1.1.1-2) unstable; urgency=low
 
-  * new build based on modular strongSwan packages
+  * Added ${shlibs:Depends} dependency
+  * Reload network-manager after installation, reloading dbus is insufficient.
+  * Fixed debhelper-but-no-misc-depends, out-of-date-standards-version and
+    copyright-without-copyright-notice lintian warnings
 
- -- Martin Willi <martin@strongswan.org>  Mon, 16 Feb 2009 16:15:46 +0100
+ -- Martin Willi <martin@strongswan.org>  Mon, 12 Oct 2009 10:19:40 +0200
+
+network-manager-strongswan (1.1.1-1) unstable; urgency=low
+
+  * New upstream release fixing a crasher when saving connections
+  * Fix "Wrong path to network-manager initscript in postinst"
+    Reload dbus instead of network-manager, as other VPN plugins do.
+    (Closes: #529189)
+  * Fix "FTBFS: No package 'libnm-util' found"
+    added dependencies to libnm-util-dev and libnm-glib-vpn-dev
+    (Closes: #528977)
+
+ -- Martin Willi <martin@strongswan.org>  Tue, 19 May 2009 13:16:51 +0200
+
+network-manager-strongswan (1.1.0-1) unstable; urgency=low
+
+  * Initial Debian packaging of NetworkManager plugin for strongSwan
+
+ -- Martin Willi <martin@strongswan.org>  Wed, 25 Mar 2009 09:07:05 +0100
index f471d2b..dc3cc47 100644 (file)
@@ -4,22 +4,19 @@ Priority: extra
 Maintainer: Martin Willi <martin@strongswan.org>
 Build-Depends: cdbs,
        debhelper (>= 7),
-       network-manager-dev (>= 0.7.1~rc1),
-       libnm-glib-dev (>= 0.7.1~rc1),
+       network-manager-dev (>= 0.9),
+       libnm-util-dev (>= 0.9),
+       libnm-glib-dev (>= 0.9),
+       libnm-glib-vpn-dev (>= 0.9),
        libdbus-glib-1-dev,
-       libgtk2.0-dev,
-       libglade2-dev,
        libgnomeui-dev,
-       libgconf2-dev,
-       libgnome-keyring-dev,
-       automake1.9,
+       automake,
        gnome-common,
-       intltool,
-Standards-Version: 3.8.0
+Standards-Version: 3.9.1
 
 Package: network-manager-strongswan
 Architecture: any
-Depends: strongswan-nm, strongswan-eap-gtc, strongswan-eap-md5, strongswan-eap-mschapv2, strongswan-eap-identity, strongswan-agent, strongswan-openssl|strongswan-crypto-plugins
+Depends: ${shlibs:Depends}, ${misc:Depends}, strongswan-nm, network-manager (>= 0.9)
 Description: network management framework (strongSwan plugin)
  NetworkManager attempts to keep an active network connection available at
  all times.  It is intended primarily for laptops where it allows easy
index 0a83b4f..8542aea 100644 (file)
@@ -1,7 +1,10 @@
-Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=437
-Upstream-Name: NetworkManager-strongswan
-Upstream-Source: http://download.strongswan.org/NetworkManager
-Files: *
+Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=59
+Name: NetworkManager-strongswan
+Source: http://download.strongswan.org/NetworkManager
+
+Copyright: 2008-2009, Martin Willi <martin@strongswan.org>
+           2005-2008, Dan Williams
+           2005, David Zeuthen
 License: GPL-2
  On Debian systems the full text of the GNU General Public License can be found
  in the `/usr/share/common-licenses/GPL-2' file.
index e59acf9..f855e71 100644 (file)
@@ -4,10 +4,14 @@ set -e
 
 case "$1" in
        configure)
-               if [ -x "/etc/dbus-1/event.d/25NetworkManager" ]; then
-                       /etc/dbus-1/event.d/25NetworkManager restart
+               if [ -x "/etc/init.d/network-manager" ]; then
+                       if [ -x /usr/sbin/invoke-rc.d ]; then
+                               invoke-rc.d network-manager force-reload || true
+                       else
+                               /etc/init.d/network-manager force-reload || true
+                       fi
                fi
-        ;;
+               ;;
 esac
 
 #DEBHELPER#
index 76a5ed4..ca981dd 100755 (executable)
@@ -1,15 +1,16 @@
 #!/usr/bin/make -f
-  
+
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
 
-DEB_CONFIGURE_EXTRA_FLAGS := --with-charon=/usr/lib/strongswan/charon
+DEB_CONFIGURE_EXTRA_FLAGS := --with-charon=/usr/lib/ipsec/charon
+
+DEB_CONFIGURE_LIBEXECDIR := "\$$(prefix)/lib/NetworkManager"
+
+DEB_DH_MAKESHLIBS_ARGS_ALL := -X/usr/lib/NetworkManager/
 
-makebuilddir/network-manager-vpnc:: debian/stamp-bootstrap
+DEB_DH_INSTALL_SOURCEDIR := debian/tmp
 
-debian/stamp-bootstrap:
-       NOCONFIGURE=1 ./autogen.sh
-       touch debian/stamp-bootstrap
 
-clean::
-       [ ! -f Makefile ] || $(MAKE) clean
+install/network-manager-strongswan::
+       rm debian/network-manager-strongswan/usr/lib/NetworkManager/libnm-strongswan-properties.*a