prepare to upload

diff --git a/debian/changelog b/debian/changelog
index 68fd4cbd40ad9cd9dade23d5b1db2a4d32e2707c..6bd5b8da54827a9b2f90d7bef1115c312fa318fd 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
 ipip (1.1.9) UNRELEASED; urgency=low
 
   * add Vcs entries to the control file
+  * move gbp.conf to .git/
 
- -- Bdale Garbee <bdale@gag.com>  Fri, 12 Nov 2010 01:11:14 -0700
+ -- Bdale Garbee <bdale@gag.com>  Fri, 29 Jun 2012 07:31:05 -0600
 
 ipip (1.1.8) unstable; urgency=low
 

diff --git a/debian/gbp.conf b/debian/gbp.conf
deleted file mode 100644 (file)
index dd2ff23..0000000
--- a/debian/gbp.conf
+++ /dev/null
@@ -1,46 +0,0 @@
-# Configuration file for git-buildpackage and friends
-
-[DEFAULT]
-# the default build command:
-#builder = debuild -i\.git/ -I.git
-# the default clean command:
-#cleaner = debuild clean
-# the default branch for upstream sources:
-upstream-branch = upstream
-# the default branch for the debian patch:
-debian-branch = master
-# the default tag formats used:
-#upstream-tag = upstream/%(version)s
-#debian-tag = debian/%(version)s
-# use pristine-tar:
-pristine-tar = True
-
-# Options only affecting git-buildpackage
-[git-buildpackage]
-#upstream-branch = dfsgclean
-# uncomment this to automatically GPG sign tags
-#sign-tags = True
-# keyid to GPG sign tags with
-#keyid = 0xdeadbeef
-# push to a remote repository after a successful tag: 
-#posttag = git-push git.example.com
-# use this for more svn-buildpackage like behaviour:
-export-dir = ../build-area/$PKG/
-#tarball-dir = ../tarballs/
-
-# Options only affecting git-import-orig
-[git-import-orig]
-#upstream-branch = newupstream
-#debian-branch = dfsgclean
-#filter = .svn
-
-# Options only affecting git-import-dsc
-[git-import-dsc]
-#upstream-branch = svn-upstream
-#filter = [ 'CVS', '.cvsignore' ]
-
-# Options only affecting git-dch
-[git-dch]
-#git-log = --no-merges
-#snapshot-number = snapshot + 1
-