X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=debian%2Fautomake.mk;h=c6e584a07b7cbbad13854eb3c692d076d9a76942;hb=b725cf028c85d0ebafcf55e503d332bb96fb708c;hp=5a23d46326fcd92b34d3c404c0c0fa23cea2146a;hpb=3d92fe960c9ad10fab3978623e4f77045340c36b;p=sliver-openvswitch.git

diff --git a/debian/automake.mk b/debian/automake.mk
index 5a23d4632..c6e584a07 100644
--- a/debian/automake.mk
+++ b/debian/automake.mk
@@ -4,9 +4,7 @@ EXTRA_DIST += \
 	debian/control \
 	debian/control.modules.in \
 	debian/copyright \
-	debian/corekeeper.cron.daily \
-	debian/corekeeper.init \
-	debian/corekeeper.override \
+	debian/copyright.in \
 	debian/dirs \
 	debian/openvswitch-common.dirs \
 	debian/openvswitch-common.install \
@@ -23,10 +21,9 @@ EXTRA_DIST += \
 	debian/openvswitch-datapath-source.copyright \
 	debian/openvswitch-datapath-source.dirs \
 	debian/openvswitch-datapath-source.install \
-	debian/openvswitch-pki-server.apache2 \
-	debian/openvswitch-pki-server.dirs \
-	debian/openvswitch-pki-server.install \
-	debian/openvswitch-pki-server.postinst \
+	debian/openvswitch-ipsec.dirs \
+	debian/openvswitch-ipsec.init \
+	debian/openvswitch-ipsec.install \
 	debian/openvswitch-pki.postinst \
 	debian/openvswitch-switch.README.Debian \
 	debian/openvswitch-switch.dirs \
@@ -37,16 +34,31 @@ EXTRA_DIST += \
 	debian/openvswitch-switch.postinst \
 	debian/openvswitch-switch.postrm \
 	debian/openvswitch-switch.template \
+	debian/ovs-bugtool \
+	debian/ovs-bugtool.8 \
+	debian/ovs-monitor-ipsec \
+	debian/python-openvswitch.dirs \
+	debian/python-openvswitch.install \
 	debian/rules \
 	debian/rules.modules
 
 check-debian-changelog-version:
-	@if $(FGREP) '($(VERSION))' $(srcdir)/debian/changelog >/dev/null; \
-	then								   \
-	  :;								   \
-	else								   \
-	  echo "Update debian/changelog to mention version $(VERSION)";	   \
-	  exit 1;							   \
+	@DEB_VERSION=`echo '$(VERSION)' | sed 's/pre/~pre/'`;		     \
+	if $(FGREP) '($(DEB_VERSION)' $(srcdir)/debian/changelog >/dev/null; \
+	then								     \
+	  :;								     \
+	else								     \
+	  echo "Update debian/changelog to mention version $(VERSION)";	     \
+	  exit 1;							     \
 	fi
 ALL_LOCAL += check-debian-changelog-version
 DIST_HOOKS += check-debian-changelog-version
+
+$(srcdir)/debian/copyright: AUTHORS debian/copyright.in
+	{ sed -n -e '/%AUTHORS%/q' -e p < $(srcdir)/debian/copyright.in;   \
+	  sed '1,/^$$/d' $(srcdir)/AUTHORS |				   \
+		sed -n -e '/^$$/q' -e 's/^/  /p';			   \
+	  sed -e '1,/%AUTHORS%/d' $(srcdir)/debian/copyright.in;	   \
+	} > $@
+
+DISTCLEANFILES += debian/copyright