[SCM] TANGO distributed control system. branch, master, updated. debian/6.1.1c-1-61-gd0bc7a0

[Frédéric-Emmanuel PICCA]

The following commit has been merged in the master branch:
commit d115cefd5b2391bad6c5d7ca8451db16f3ad000a
Author: Frédéric-Emmanuel PICCA <picca at synchrotron-soleil.fr>
Date:   Wed Oct 6 08:51:28 2010 +0200

    * add the git-buildpackage configuration file for the dfsg_clean branch
    
    now I use the dfsg_clean branch to build the package.

diff --git a/debian/gbp.conf b/debian/gbp.conf
new file mode 100644
index 0000000..d68fcc5
--- /dev/null
+++ b/debian/gbp.conf
@@ -0,0 +1,6 @@
+[git-import-orig]
+upstream-branch=upstream
+no-merge=1
+
+[git-buildpackage]
+upstream-branch=dfsg_clean

-- 
TANGO distributed control system.