debian: Update changelog for 1.4.0-2 upload

[sliver-openvswitch.git] / debian / rules

diff --git a/debian/rules b/debian/rules
index 224f095..c8b6c63 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -13,6 +13,11 @@
 # Official build number.  Leave set to 0 if not an official build.
 BUILD_NUMBER = 0
 
+PACKAGE=openvswitch
+pdkms=openvswitch-datapath-dkms
+DEB_UPSTREAM_VERSION=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([0-9]:)*([^-]+).*,\2,p')
+srcfiles := $(filter-out debian, $(wildcard * .[^.]*))
+
 ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
 PARALLEL = -j$(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
 else
@@ -74,6 +79,7 @@ install-indep: build-indep
        dh_testroot
        dh_prep -i
        dh_installdirs -i
+       $(MAKE) -C _debian DESTDIR=$(CURDIR)/debian/tmp install
        dh_install -i
        sed 's/^BUILD_NUMBER = .*/BUILD_NUMBER = $(BUILD_NUMBER)/' \
                < debian/rules.modules \
@@ -81,6 +87,16 @@ install-indep: build-indep
        chmod 755 debian/openvswitch-datapath-source/usr/src/modules/openvswitch-datapath/debian/rules
        cd debian/openvswitch-datapath-source/usr/src && tar -c modules | bzip2 -9 > openvswitch-datapath.tar.bz2 && rm -rf modules
 
+       #dkms stuff
+       # setup the dirs
+       dh_installdirs -p$(pdkms) usr/src/$(PACKAGE)-$(DEB_UPSTREAM_VERSION)
+
+       # copy the source
+       cd debian/$(pdkms)/usr/src/$(PACKAGE)-$(DEB_UPSTREAM_VERSION) && tar xvzf $(CURDIR)/_debian/openvswitch.tar.gz && mv openvswitch/* . && rmdir openvswitch
+
+       # Prepare dkms.conf from the dkms.conf.in template
+       sed "s/__VERSION__/$(DEB_UPSTREAM_VERSION)/g" debian/dkms.conf.in > debian/$(pdkms)/usr/src/$(PACKAGE)-$(DEB_UPSTREAM_VERSION)/dkms.conf
+
 install-arch: build-arch
        dh_testdir
        dh_testroot
@@ -101,14 +117,15 @@ binary-common:
        dh_installexamples
        dh_installdebconf
        dh_installlogrotate
-       dh_installinit -R
+       dh_installinit -R -Nopenvswitch-switch
+       dh_installinit -R -popenvswitch-switch --error-handler=init_script_error
        dh_installcron
-       dh_installman
+       dh_installman --language=C
        dh_link
        dh_strip --dbg-package=openvswitch-dbg
        dh_compress 
        dh_fixperms
-       dh_pysupport
+       dh_python2
        dh_perl
        dh_makeshlibs
        dh_installdeb