X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=debian%2Frules;h=d34bdb3d0f85ef945ccd044a91f9ec71a1a9a7cf;hb=bbb8dee92d639331e8bd81823638267dcc895396;hp=c8b6c636fcdc57917fab428bdd15d88db3ae284a;hpb=77912ae717298cb06544f1bebd9701d0b3c2f2f0;p=sliver-openvswitch.git

diff --git a/debian/rules b/debian/rules
index c8b6c636f..d34bdb3d0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,9 +10,6 @@
 # Modified to make a template file for a multi-binary package with separated
 # build-arch and build-indep targets  by Bill Allombert 2001
 
-# 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')
@@ -25,6 +22,7 @@ PARALLEL =
 endif
 MAKEFLAGS += $(PARALLEL)
 
+CFLAGS += -g
 ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 CFLAGS += -O0
 else
@@ -41,8 +39,8 @@ configure-stamp:
 	cd _debian && ( \
 		test -e Makefile || \
 		../configure --prefix=/usr --localstatedir=/var --enable-ssl \
-			--sysconfdir=/etc --with-build-number=$(BUILD_NUMBER) \
-			CFLAGS="$(CFLAGS)" $(DATAPATH_CONFIGURE_OPTS))
+			--sysconfdir=/etc CFLAGS="$(CFLAGS)" \
+			$(DATAPATH_CONFIGURE_OPTS))
 	touch configure-stamp
 
 #Architecture 
@@ -72,6 +70,7 @@ clean:
 	rm -rf _debian
 	[ ! -f Makefile ] || $(MAKE) distclean
 	dh_clean 
+	rm -f python/ovs/*.pyc python/ovs/db/*.pyc
 
 install: install-indep install-arch
 install-indep: build-indep
@@ -81,9 +80,7 @@ install-indep: build-indep
 	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 \
-		> debian/openvswitch-datapath-source/usr/src/modules/openvswitch-datapath/debian/rules
+	cp debian/rules.modules debian/openvswitch-datapath-source/usr/src/modules/openvswitch-datapath/debian/rules
 	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
 
@@ -97,6 +94,16 @@ install-indep: build-indep
 	# 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
 
+	# We don't need the debian folder in there, just upstream sources...
+	rm -rf debian/$(pdkms)/usr/src/$(PACKAGE)-$(DEB_UPSTREAM_VERSION)/debian
+	# We don't need the rhel stuff in there either
+	rm -rf debian/$(pdkms)/usr/src/$(PACKAGE)-$(DEB_UPSTREAM_VERSION)/rhel
+	# And we should also clean useless license files, which are already
+	# descriped in our debian/copyright anyway.
+	rm -f debian/$(pdkms)/usr/src/$(PACKAGE)-$(DEB_UPSTREAM_VERSION)/COPYING \
+		debian/$(pdkms)/usr/src/$(PACKAGE)-$(DEB_UPSTREAM_VERSION)/ovsdb/ovsdbmonitor/COPYING \
+		debian/$(pdkms)/usr/src/$(PACKAGE)-$(DEB_UPSTREAM_VERSION)/xenserver/LICENSE
+
 install-arch: build-arch
 	dh_testdir
 	dh_testroot
@@ -105,6 +112,7 @@ install-arch: build-arch
 	$(MAKE) -C _debian DESTDIR=$(CURDIR)/debian/tmp install
 	cp debian/openvswitch-switch.template debian/openvswitch-switch/usr/share/openvswitch/switch/default.template
 	dh_install -s
+	dh_link -s
 
 # Must not depend on anything. This is to be called by
 # binary-arch/binary-indep
@@ -117,8 +125,7 @@ binary-common:
 	dh_installexamples
 	dh_installdebconf
 	dh_installlogrotate
-	dh_installinit -R -Nopenvswitch-switch
-	dh_installinit -R -popenvswitch-switch --error-handler=init_script_error
+	dh_installinit -R
 	dh_installcron
 	dh_installman --language=C
 	dh_link