[SCM] VLC media player packaging branch, sid, updated. debian/0.9.8a-2-15-g45a44da

[siretart at users.alioth.debian.org]

The following commit has been merged in the sid branch:
commit 45a44dac645c561e766324b5ae95901b96b966ae
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Mar 14 12:46:10 2009 +0100

    remove duplicate .gbp.conf, port differences to debian/gbp.conf

diff --git a/.gbp.conf b/.gbp.conf
deleted file mode 100644
index 78a673a..0000000
--- a/.gbp.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-[DEFAULT]
-upstream-branch = upstream
-debian-branch = sid
-upstream-tag = upstream/%(version)s
-debian-tag = debian/%(version)s
-pristine-tar = True
diff --git a/debian/gbp.conf b/debian/gbp.conf
index 2f0bc49..658446a 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -5,4 +5,8 @@ builder=debuild -i\.git -I.git
 upstream-branch=upstream
 # the default branch for the debian patch
 debian-branch=sid
-
+#versioning conventions (defaults)
+upstream-tag = upstream/%(version)s
+debian-tag = debian/%(version)s
+# use pristine tar
+pristine-tar = True

-- 
VLC media player packaging