diff options
| author | Thomas Preud'homme <thomas.preudhomme@celest.fr> | 2011-04-12 13:17:05 +0200 |
|---|---|---|
| committer | Thomas Preud'homme <thomas.preudhomme@celest.fr> | 2011-04-12 18:17:50 +0200 |
| commit | f2fb5c037a3c4a29ae46b010e17082c4af048839 (patch) | |
| tree | 23bc6acfe099f47f6980d55f418a37ab4fdc4b00 | |
| parent | 240f54ed33e3707dc88c0cdd358fe28945840973 (diff) | |
Fix debian/source/local-options
* Remove workaround for git-pbuilder: git-pbuilder passes options to
dpkg-source on the command-line so it takes prevalence over options
from debian/source/local-options
* Add an ignore for .gitignore
| -rw-r--r-- | debian/source/local-options | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/debian/source/local-options b/debian/source/local-options index 292bc8f..4ad7093 100644 --- a/debian/source/local-options +++ b/debian/source/local-options @@ -1,8 +1,6 @@ # Also ignore .git-dpm and gbp.conf -# debian/source/local-options is included as well because I, -# Thomas Preud'homme, use git-buildpackage which override the default -# -i and -I options of dpkg-source -extend-diff-ignore = "(?:^|/)(\.git-dpm|gbp.conf|local-options)$" -tar-ignore = debian/source/local-options +extend-diff-ignore = "(?:^|/)\.git(ignore|-dpm)?(?:$|/.*$)" +extend-diff-ignore = "(?:^|/)gbp\.conf(?:$|/.*$)" +tar-ignore = .gitignore tar-ignore = .git-dpm tar-ignore = gbp.conf |