Merge lp:~robru/cupstream2distro/fix-ubuntu-push into lp:cupstream2distro

[Robert Bruce Park]

Tweak orig.tar creation.

[lp:~robru/cupstream2distro/fix-ubuntu-push]

1399. By Robert Bruce Park on 2016-05-03

Revert buildpackage changes.

1400. By Robert Bruce Park on 2016-05-03

Try more explicit excludes.

[Colin Watson (cjwatson)]

This probably won't make much difference to the problem at hand, will
it? --exclude-vcs is documented to skip .bzrignore and .gitignore too.

[lp:~robru/cupstream2distro/fix-ubuntu-push]

1401. By Robert Bruce Park on 2016-05-03

Exclude only from source tree root.

1402. By Robert Bruce Park on 2016-05-03

Pin debian dir also to source root.

[Robert Bruce Park (robru)]

Yeah I'm just iterating a bit on this. Have another look.

[lp:~robru/cupstream2distro/fix-ubuntu-push]

1403. By Robert Bruce Park on 2016-05-03

Fix whitespace.

[Colin Watson (cjwatson)]

Seems fair if it works :-)

[Robert Bruce Park (robru)]

It works in the sense that it successfully strips .bzr* only from the root and not recursively, and the build succeeds & uploads to the PPA, however it's not clear to me that this is actually the Correct behavior, I've asked Steve for his opinion on how to proceed with this.

[lp:~robru/cupstream2distro/fix-ubuntu-push]

1404. By Robert Bruce Park on 2016-05-03

Fix dpkg-buildpackage to ignore VCS files.

1405. By Robert Bruce Park on 2016-05-03

Fix regex.

1406. By Robert Bruce Park on 2016-05-03

What if I try...

=== modified file 'tools/buildpackage.sh'
--- tools/buildpackage.sh	2016-04-06 19:12:11 +0000
+++ tools/buildpackage.sh	2016-05-03 18:58:27 +0000
@@ -26,9 +26,8 @@
 # -sa: Force inclusion of original source.
 # -d:  Do not check build dependencies and conflicts.
 # -S:  Only build source package, no binaries.
-# -i:  Ignore VCS files from generated diff.
-# -I:  Ignore VCS files from generated tarball.
+# -i:  Ignore bzr/git files from generated diff (can only be specified once).
+# -I:  Ignore VCS files from generated tarball, plus .bzr-builddeb which isn't included in default -I
 # -nc: Do not run `./debian/rules clean`
 # -k:  Sign .changes with this key.
-# -i'^.bzr' and -I'.bzr*': Ignore .bzr-builddeb which default -i and -I miss.
-dpkg-buildpackage -sa -d -S -i -i'^.bzr' -I -I'.bzr*' -nc -k"$gpg_key" 1>&2
+dpkg-buildpackage -sa -d -S -i'(^|/)(\.bzr|\.git)' -I -I'.bzr*' -nc -k"$gpg_key" 1>&2