change to pve packaging

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>

diff --git a/Makefile b/Makefile
index eee1ac356b3da670f7001bee28ecd5d035ea46f4..bbd3d58f743d63c7740e3ab3efa3b506edf532c5 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 PACKAGE=ifupdown2
-VER=1.1
-PKGREL=2.0
+VER=2.0.0
+PKGREL=1~pvetest1
 
 SRCDIR=ifupdown2
 BUILDDIR=${SRCDIR}.tmp
@@ -23,8 +23,9 @@ deb: ${DEB}
 ${DEB}: | submodule
        rm -f *.deb
        rm -rf $(BUILDDIR)
-       cp -rpa ${SRCDIR} ${BUILDDIR}
-       cp -a debian ${BUILDDIR}
+       mkdir $(BUILDDIR)
+       cp -a $(SRCDIR)/* $(BUILDDIR)/
+       cp -R debian/* $(BUILDDIR)/debian/
        cd ${BUILDDIR}; dpkg-buildpackage -rfakeroot -b -uc -us
 
 .PHONY: upload

diff --git a/debian/changelog b/debian/changelog
index 772b13c10af4b2b1b50ffe841ee0b13690684d42..ad2114f198d6c89a645151f228bb68961b5bdea4 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,185 +1,5 @@
-ifupdown2 (2.0.0) UNRELEASED; urgency=medium
+ifupdown2 (2.0.0-1~pvetest1) unstable; urgency=medium
 
-  * Package architecture refactoring and cleanups
-  * Package can be build/install as debian, pip or rpm package
-  * Makefile to easily perform tasks (i.e.: install, build, test, upload..)
-  * New. Enabled: traditional bridge support for mstpctl attributes
-    (portautoedge, portrestrrole)
+  * Initial 2.0.0 package
 
- -- Julien Fortin <julien@cumulusnetworks.com>  Thu, 24 May 2018 15:42:42 +0200
-
-ifupdown2 (1.1.18) RELEASED; urgency=medium
-
-  * Fix: Link down does not work on SVI configured in a VRF
-  * Fix: ifreload causes MTU to drop on bridge SVIs
-  * Fix: addons: addressvirtual: check if SVI name is first in routing table
-  * Fix: ifreload error on deleting bond slaves from an already configured bond
-  * Fix: ifupdown2 error is confusing when netmask is specified for vxlan-local-tunnelip
-  * Fix: ifupdown2 syntax check needed for vxlan interfaces
-  * Fix: vxlan-ageing default timer doesn't align with bridge-ageing
-  * Fix: Error with "ifreload -a -n" when MGMT VRF is not Applied
-  * Fix: using reserved VLAN range reports error but ifreload returns 0
-  * Fix: unable to set bridge-portmcrouter to "2"
-  * Fix: vxlan syntax-check warn on missing vxlan-local-tunnelip
-  * Fix: traditional bridge svi breaks when extra bridge added
-  * Fix: github #39: addons: vrf: fix vrf slave link kind
-  * New. Enabled: addons: vxlan: add support for vxlan-port attribute
-
- -- Julien Fortin <julien@cumulusnetworks.com>  Thu, 12 Apr 2018 11:10:04 +0200
-
-ifupdown2 (1.1.17) RELEASED; urgency=medium
-
-  * Fix: ip[6]-forward attributes not set at boot
-
- -- Julien Fortin <julien@cumulusnetworks.com>  Thu, 08 Feb 2018 09:48:37 +0100
-
-ifupdown2 (1.1.16) RELEASED; urgency=medium
-
-  * Fix: python exception on macvlans address dump
-  * Fix: eth0 doesn't acquire DHCP address when mgmt VRF is enabled
-
- -- Julien Fortin <julien@cumulusnetworks.com>  Tue, 09 Jan 2018 02:02:58 +0100
-
-ifupdown2 (1.1.15) RELEASED; urgency=medium
-
-  * New. Enabled: bridge: add support for bridge-l2protocol-tunnel
-  * New. Enabled: bridge attributes, when removed reset to default
-  * New. Enabled: vxlan attributes, when removed reset to default
-  * New. Enabled: improve handling of optional resources (if missing bridge-utils/ethtool)
-  * Fix: policy "iface_defaults" not supported for MTU
-  * Fix: address module: handling of ipv4 & ipv6 (add/remove)
-  * Fix: warning for vlan reserved range
-  * Fix: MTU handling on bridge SVIs
-
- -- Julien Fortin <julien@cumulusnetworks.com>  Wed, 22 Nov 2017 19:07:43 +0100
-
-ifupdown2 (1.1.14) RELEASED; urgency=medium
-
-  * New. Enabled: default policy for bridge MAC address
-  * Fix: ethtool: don't set link speed and duplex if autoneg is on
-
- -- Julien Fortin <julien@cumulusnetworks.com>  Wed, 25 Oct 2017 23:12:27 +0200
-
-ifupdown2 (1.1.13) RELEASED; urgency=medium
-
-  * Fix: VRF: ssh session not killed on ifreload
-
- -- Julien Fortin <julien@cumulusnetworks.com>  Fri, 15 Sep 2017 22:43:12 +0200
-
-ifupdown2 (1.1.12) RELEASED; urgency=medium
-
-  * New. Enabled: mpls-enable attribute
-  * New. Enabled: bond and bridge module moved to netlink configuration
-  * New. Enabled: handle a mix of auto and specified vrf table ids
-  * Fix: igmp attribute reset to defaults when removed from config
-
- -- Julien Fortin <julien@cumulusnetworks.com>  Mon, 07 Aug 2017 22:14:03 +0200
-
-ifupdown2 (1.1.11) RELEASED; urgency=medium
-
-  * Fix: link-down attribute not applied on slave ports
-  * Fix: bug that prevented config of mtu below 1280
-
- -- Julien Fortin <julien@cumulusnetworks.com>  Thu, 18 May 2017 12:45:21 -0700
-
-ifupdown2 (1.1.10) RELEASED; urgency=medium
-
-  * New. Enabled: drop the dependency to pkg_resources, hardcode version number (closes: #855401)
-  * New. Enabled: adjust allow-hotplug behavior to ifupdown (closes: #855598)
-  * New. Enabled: bond-lacp-rate support slow/fast argument
-  * New. Enabled: ifquery --syntax-help: add support for json output
-  * New. Enabled: vlan: add new attribute 'vlan-protocol'
-  * New. Enabled: address: add new attribute 'ip6-forward'
-  * New. Enabled: bridge: add new attribute 'bridge-mcstats'
-  * New. Enabled: bridge: add new attribute 'bridge-vlan-stats'
-  * New. Enabled: bridge: add new attribute 'bridge-vlan-protocol'
-  * New. Enabled: bridge: add new attribute 'bridge-arp-nd-suppress'
-  * Fix: bond: add attribute bond-(up|down)delay
-  * Fix: bridge-vids: --syntax-check accepts legacy syntax
-
- -- Julien Fortin <julien@cumulusnetworks.com>  Mon, 17 Apr 2017 06:18:04 +0200
-
-ifupdown2 (1.1.9) RELEASED; urgency=medium
-
-  * New. Enabled: support for bridge-learning attribute
-
- -- Julien Fortin <julien@cumulusnetworks.com>  Mon, 06 Feb 2017 13:22:51 -0800
-
-ifupdown2 (1.1.8) RELEASED; urgency=medium
-
-  * New. Enabled: update link-speed values: add 25G and 50G
-  * New. Enabled: new 'link-down' [yes|no] attribute to keep link down
-
- -- Julien Fortin <julien@cumulusnetworks.com>  Tue, 17 Jan 2017 08:39:29 +0100
-
-ifupdown2 (1.1.7) RELEASED; urgency=medium
-
-  * New. Enabled: fix for inet and inet6 dhcp on the same interface
-  * New. Enabled: syntax check to warn on common configuration mistakes
-  * New. Enabled: addons: bridge: disable ip fwding on a bridge with no ip
-    and no upperifaces
-  * Fix: fixes for MTU handling
-  * Fix: dhcpv6 fails if interface doesn't have link-local addr
-
- -- Julien Fortin <julien@cumulusnetworks.com>  Wed, 07 Dec 2016 05:48:45 +0100
-
-ifupdown2 (1.1.6) RELEASED; urgency=medium
-
-  * Closes: github #14. add environment variables passed to user scripts
-  * New. Enabled: addons may provide a list of ifupdown scripts to ignore
-
- -- Julien Fortin <julien@cumulusnetworks.com>  Mon, 19 Sep 2016 16:37:36 -0700
-
-ifupdown2 (1.1.5) RELEASED; urgency=medium
-
-  * Fix: handling of EXISTS errors on address add
-  * Fix: handling of mtu on addressvirtual macvlan devices
-  * Fix: mako namespace handling
-
- -- Julien Fortin <julien@cumulusnetworks.com>  Fri, 16 Sep 2016 12:48:04 -0700
-
-ifupdown2 (1.1.4) RELEASED; urgency=medium
-
-  * Performance improvements
-  * New. Enabled: sbin: start-networking: support hotplug class from init script
-  * New. Enabled: support for classical numerical bond modes
-  * New. Enabled: extend ifquery support for mstpctl addons
-  * New. Enabled: each addon may perform semantic and syntax checks by
-    implementing a custom method
-  * Fix: Support for address-virtual lines under a vrf slave
-  * Fix: Defaults for link attributes were not applied
-  * Fix: Disable IPv6 duplicate address detection on VRR interfaces
-  * Fix: ifquery to extract vlan-id from iface if not preset
-  * Fix: ifquery -c bridge pvid error on a valid config
-
- -- Julien Fortin <julien@cumulusnetworks.com>  Fri, 29 Jul 2016 08:55:50 -0700
-
-ifupdown2 (1.1.3) RELEASED; urgency=medium
-
-  * Fix: Interface configuration parsing error when keyword vlan
-    is the interface name.
-
- -- Julien Fortin <julien@cumulusnetworks.com>  Sun, 05 Jun 2016 08:55:50 -0700
-
-ifupdown2 (1.1.2) RELEASED; urgency=medium
-
-  * Fix: checks for invalid address-virtual attributes
-  * New. Deprecated: `mstpctl-stp` attribute
-  * New. Deprecated: lacp parameters: bond-ad-sys-priority, bond-ad-sys-mac-addr
-  * New. Enabled: addon module for configuring vrf
-  * New. Enabled: bridge: display warning when (in vlan unware bridge)
-    an untagged bridge is not configured
-  * New. Enabled: adjusting MTU for vlan devices depending on lower device mtu
-  * New. Enabled: introduce checks for reserved vrf table names
-  * New. Enabled: ifquery: new option '--with-defaults' to include default
-    attributes
-  * New. Enabled: bridge: disabling ipv6 on bridge if any VXLAN port
-  * New. Enabled: vrf awareness in dhcp addon module
-
- -- Julien Fortin <julien@cumulusnetworks.com>  Tue, 3 May 2016 14:42:42 -0700
-
-ifupdown2 (1.1.0) unstable; urgency=low
-
-  * Initial release.
-
- -- Roopa Prabhu <roopa@cumulusnetworks.com>  Thu, 20 Aug 2015 06:14:24 -0700
+ -- Proxmox Support Team <support@proxmox.com>  Fri, 15 Jun 2018 09:14:59 +0200

diff --git a/debian/compat b/debian/compat
deleted file mode 100644 (file)
index ec63514..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-9

diff --git a/debian/control b/debian/control
index a6178e460ce4429875c7c9a2e9ea3688f6b871d1..e62a15d6d49c2c10e8cf29c795d9841c77d37bb4 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
 Source: ifupdown2
 Section: admin
 Priority: optional
-Maintainer: Julien Fortin <julien@cumulusnetworks.com>
+Maintainer: Proxmox Support Team <support@proxmox.com>
 Build-Depends: debhelper (>=9),
                dh-systemd,
                dh-python,

diff --git a/debian/copyright b/debian/copyright
deleted file mode 100644 (file)
index 51d5604..0000000
--- a/debian/copyright
+++ /dev/null
@@ -1,28 +0,0 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: ifupdown2
-Upstream-Contact: Julien Fortin <julien@cumulusnetworks.com>
-Source: https://github.com/cumulusnetworks/ifupdown2
-
-Files: *
-Copyright: 2014,2015,2016,2017,2018 Cumulus Networks, Inc.
-License: GPL-2
-
-Files: debian/*
-Copyright: 2014,2015,2016,2017,2018 Cumulus Networks, Inc.
-License: GPL-2
-
-License: GPL-2
- This package is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License
- .
- This package is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
- .
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>
- .
- On Debian systems, the complete text of the GNU General
- Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".

diff --git a/debian/rules b/debian/rules
deleted file mode 100755 (executable)
index 7f8667a..0000000
--- a/debian/rules
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/usr/bin/make -f
-
-#export DH_VERBOSE=1
-export PYBUILD_NAME=ifupdown2
-export PYBUILD_INSTALL_ARGS=--install-lib=/usr/share/ --install-scripts=/usr/share/
-
-%:
-       dh $@ --with python2 --with systemd --buildsystem=pybuild --with quilt
-
-override_dh_installman:
-       ./ifupdown2/man/genmanpages.sh ./ifupdown2/man ./man
-       dh_installman
-
-override_dh_systemd_start:
-       dh_systemd_start --name=networking --no-start
-
-override_dh_systemd_enable:
-       dh_systemd_enable --name=networking
-
-override_dh_compress:
-       dh_compress -X.py

diff --git a/debian/source/format b/debian/source/format
new file mode 100644 (file)
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)