[SCM] BOINC packaging branch, SZTAKI, updated. debian/6.10.17+dfsg-3-301-g0f028e4

[Steffen Moeller]

The following commit has been merged in the SZTAKI branch:
commit 0f028e4ca40f58d5f10b13d418d7b34cbfa12b26
Author: Steffen Moeller <moeller at debian.org>
Date:   Mon Jun 13 00:00:44 2011 +0200

    Changed gdp.conf the way it was originally kept by SZTAKI

diff --git a/SZTAKI_patches_remaining_to_move_into_debian.patch_to_debian_folder b/SZTAKI_patches_remaining_to_move_into_debian.patch_to_debian_folder
index fc485c4..a9d8441 100644
--- a/SZTAKI_patches_remaining_to_move_into_debian.patch_to_debian_folder
+++ b/SZTAKI_patches_remaining_to_move_into_debian.patch_to_debian_folder
@@ -283,18 +283,6 @@
 +	dh_strip --dbg-package=boinc-server-dbg
 +	dh_makeshlibs -V 'boinc-server (>= 1:$(SRC_VERSION)), boinc-server (<< 1:$(NEXT_SRC_VERSION))'
 +	dh $@ --after dh_makeshlibs
---- boinc-server-6.11.0+r18946.orig/debian/gbp.conf
-+++ boinc-server-6.11.0+r18946/debian/gbp.conf
-@@ -0,0 +1,9 @@
-+[DEFAULT]
-+
-+upstream-branch = upstream-clean
-+debian-branch = master
-+
-+[git-buildpackage]
-+
-+sign-tags = False
-+pristine-tar = True
 --- boinc-server-6.11.0+r18946.orig/debian/boinc-server.manpages
 +++ boinc-server-6.11.0+r18946/debian/boinc-server.manpages
 @@ -0,0 +1 @@
diff --git a/debian/gbp.conf b/debian/gbp.conf
index d68298d..19a0ecf 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,5 +1,5 @@
 [DEFAULT]
-upstream-branch = upstream
+upstream-branch = upstream-clean
 debian-branch = master
 
 [git-buildpackage]

-- 
BOINC packaging