Merge lp:~awe/network-manager/openvpn-ubuntu.0.7.1 into lp:~network-manager/network-manager/openvpn-ubuntu.0.7.1

[Tony Espy]

[Tony Espy (awe)]

Here's my revised merge...

[Alexander Sack (asac)]

looks ok. i added a "make distclean" after autogen.sh in order to produce a cleaner tarball.

review: Approve

=== modified file '.bzr-builddeb/default.conf'
--- .bzr-builddeb/default.conf	2009-04-08 23:49:59 +0000
+++ .bzr-builddeb/default.conf	2009-06-25 17:37:57 +0000
@@ -1,3 +1,2 @@
 [BUILDDEB]
-export-upstream-revision = revid:svn-v3-trunk0:bcea4615-760a-421e-8543-3a9231f862fb:branches%2FNETWORKMANAGER_0_7:64
 merge = True

=== modified file 'changelog'
--- changelog	2009-04-08 23:59:22 +0000
+++ changelog	2009-06-25 18:48:15 +0000
@@ -1,3 +1,15 @@
+network-manager-openvpn (0.7.1-0ubuntu1) karmic; urgency=low
+
+  * New upstream release 0.7.1 final  
+  * updated build-depends to 0.7.1 final; add Vcs-Bzr line
+    - update debian/control
+  * added get-orig-source to generate .orig.tar.gz
+    - update debian/rules
+  * removed unused export-upstream-revision statement
+    - update .bzr-builddeb/default.conf
+
+ -- Tony Espy <[e-mail]>  Thu, 25 Jun 2009 14:29:37 -0400
+
 network-manager-openvpn (0.7.1~rc4.1.20090323+bzr27-0ubuntu2) jaunty; urgency=low
 
   * fix build failure by adding libglade2-dev to build-depends

=== modified file 'control'
--- control	2009-04-08 23:59:22 +0000
+++ control	2009-06-25 18:48:15 +0000
@@ -5,9 +5,9 @@
 XSBC-Original-Maintainer: Soren Hansen <[e-mail]>
 Build-Depends: cdbs,
 	debhelper (>= 5),
-	network-manager-dev (>= 0.7.1~),
-	libnm-util-dev (>= 0.7.1~),
-	libnm-glib-dev (>= 0.7.1~),
+	network-manager-dev (>= 0.7.1),
+	libnm-util-dev (>= 0.7.1),
+	libnm-glib-dev (>= 0.7.1),
 	automake1.9,
 	gnome-common,
 	intltool,
@@ -17,6 +17,7 @@
 	quilt,
 	libglade2-dev
 Standards-Version: 3.7.2
+Vcs-Bzr: http://code.launchpad.net/~network-manager/network-manager/openvpn-ubuntu.0.7.1
 
 Package: network-manager-openvpn
 Architecture: any

=== modified file 'rules'
--- rules	2009-02-15 02:49:33 +0000
+++ rules	2009-06-25 17:51:25 +0000
@@ -1,4 +1,12 @@
 #!/usr/bin/make -f
+
+GIT_URL = git://git.gnome.org/network-manager-openvpn
+TAG_PREFIX := "NETWORKMANAGER_OPENVPN_"
+
+DEB_SOURCE := $(shell dpkg-parsechangelog | grep Source: | sed -e 's/Source: //')
+DEB_VERSION := $(shell dpkg-parsechangelog | grep Version: | sed -e 's/Version: //')
+DEB_UPSTREAM_VERSION := $(shell echo $(DEB_VERSION) | sed -e 's/-[^-]*$$//')
+DEB_TAG_VERSION := $(shell echo $(DEB_UPSTREAM_VERSION) | sed -e 's/\./_/g')
   
 include /usr/share/cdbs/1/class/makefile.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
@@ -7,16 +15,24 @@
 
 #DEB_DH_MAKESHLIBS_ARGS_network-manager-openvpn := -n
 
-makebuilddir/network-manager-openvpn:: debian/stamp-bootstrap
-
-debian/stamp-bootstrap:
-	NOCONFIGURE=1 ./autogen.sh
-	touch debian/stamp-bootstrap
-
-clean::
-	rm -f aclocal.m4 auth-dialog/Makefile.in compile config.guess \
-	   config.h.in config.sub configure depcomp install-sh \
-	   intltool-extract.in intltool-merge.in intltool-update.in \
-	   ltmain.sh Makefile.in missing mkinstalldirs po/Makefile.in.in \
-	   properties/Makefile.in src/Makefile.in debian/stamp-bootstrap
-
+DEB_DESTDIR = $(CURDIR)/debian/tmp/
+
+get-orig-source::
+	set -e; if echo $(DEB_VERSION) | grep -c "git"; \
+	then \
+		git_version=`echo $(DEB_VERSION) | sed -e 's/^.*git\.*\([0-9]*\.\)*\(.*\)-.*$$/\2/g'`; \
+	else \
+		git_version=$(TAG_PREFIX)$(DEB_TAG_VERSION); \
+	fi; \
+	tmpdir=`mktemp -d -t`; \
+	cd $$tmpdir; \
+	echo "cloning upstream repository ..."; \
+	git clone $(GIT_URL); echo "getting specific upstream revision/tag: $$git_version"; \
+	cd `ls | head -n 1`; git checkout -b orig $$git_version; \
+	echo "autotools bootstrapping ..."; \
+	sh ./autogen.sh; \
+	echo "cleaning up autotools caches (autom4te.cache) ..."; \
+	rm -rf autom4te.cache; \
+	echo "OK!"; \
+	cd ..; tar --exclude=.git -cvzf $(CURDIR)/$(DEB_SOURCE)_$(DEB_UPSTREAM_VERSION).orig.tar.gz `ls | head -n 1`; \
+	cd $(CURDIR); rm -rf $$tmpdir