X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=debian%2Frules;h=539c8f3d00bb96ee57df75631cdf939fb55324ea;hb=83090c3ae07f97af5d3ede3629d7c33e45545048;hp=da957ce388cf6daf010e6f3733d58ebfc00e41aa;hpb=4f76bd3121df2db23c17f0e80c9da14f3e4c0e34;p=sliver-openvswitch.git

diff --git a/debian/rules b/debian/rules
index da957ce38..539c8f3d0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -27,6 +27,11 @@ MA_DIR ?= /usr/share/modass
 
 -include debian/rules.ext
 
+DATAPATH_CONFIGURE_OPTS = --enable-snat
+
+# Official build number.  Leave set to 0 if not an official build.
+BUILD_NUMBER = 0
+
 configure: configure-stamp
 configure-stamp:
 	dh_testdir
@@ -35,7 +40,8 @@ configure-stamp:
 	cd _debian && ( \
 		test -e Makefile || \
 		../configure --prefix=/usr --localstatedir=/var --enable-ssl \
-			--enable-snat)
+			--with-build-number=$(BUILD_NUMBER) \
+			$(DATAPATH_CONFIGURE_OPTS))
 	$(ext_configure)
 	touch configure-stamp
 
@@ -87,7 +93,7 @@ binary-modules: prep-deb-files
 	dh_testroot
 	dh_clean -k
 	tar xzf openflow.tar.gz
-	cd openflow && ./configure --with-$(l2x)=$(KSRC)
+	cd openflow && ./configure --with-$(l2x)=$(KSRC) $(DATAPATH_CONFIGURE_OPTS) --with-build-number=$(BUILD_NUMBER)
 	cd openflow && $(MAKE) -C $(dpdir)
 	install -d -m755 $(DSTDIR)
 	install -m644 openflow/$(dpdir)/*_mod.$(KO)o $(DSTDIR)/
@@ -96,7 +102,7 @@ binary-modules: prep-deb-files
 	dh_compress
 	dh_fixperms
 	dh_installdeb
-	dh_gencontrol -- -v$(VERSION)
+	dh_gencontrol
 	dh_md5sums
 	dh_builddeb --destdir=$(DEB_DESTDIR)
 
@@ -106,9 +112,10 @@ install-indep: build-indep
 	dh_testroot
 	dh_clean -k -i 
 	dh_installdirs -i
+	dh_install -i
 	cd debian/openflow-datapath-source/usr/src && tar -c modules | bzip2 -9 > openflow-datapath.tar.bz2 && rm -rf modules
 	install -m644 debian/openflow-pki-server.apache2 debian/openflow-pki-server/etc/apache2/sites-available/openflow-pki
-	dh_install -i
+	install -m1777 -d debian/corekeeper/var/log/core
 	$(ext_install_indep)
 
 install-arch: build-arch
@@ -118,6 +125,7 @@ install-arch: build-arch
 	dh_installdirs -s
 	$(MAKE) -C _debian DESTDIR=$(CURDIR)/debian/openflow install
 	cp debian/openflow-switch-config.overrides debian/openflow-switch-config/usr/share/lintian/overrides/openflow-switch-config
+	cp debian/openflow-switch.template debian/openflow-switch/usr/share/openflow/switch/default.template
 	dh_install -s
 	$(ext_install_arch)
 
@@ -131,13 +139,14 @@ binary-common:
 	dh_installdocs
 	dh_installexamples
 	dh_installdebconf
-#	dh_installlogrotate
+	dh_installlogrotate
 	dh_installinit
+	dh_installcron
 	dh_installman
 	dh_link
-	dh_strip
+	dh_strip --dbg-package=openflow-dbg
 	dh_compress 
-	dh_fixperms
+	dh_fixperms -X var/log/core
 	dh_perl
 	dh_makeshlibs
 	dh_installdeb