X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=debian%2Frules;h=51a2e51e0aea5608491392220bd2e02418b14714;hb=67d84df5d9cf03fcaf5825ca2dc679b53614dc05;hp=fb781e6c3b28a6a371b29927fb2fc21b20ff51fe;hpb=49c57a8fef46461da911802e8bf82329924ea329;p=openvswitch

diff --git a/debian/rules b/debian/rules
index fb781e6c..51a2e51e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,12 +10,9 @@
 # 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: ([^-]+).*,\1,p')
+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)))
@@ -41,8 +38,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 +69,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 +79,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 +93,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 +111,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
@@ -119,12 +126,12 @@ binary-common:
 	dh_installlogrotate
 	dh_installinit -R
 	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