[Pkg-samba-maint] [samba] 02/04: Update README.source and remove build-orig.sh

[Mathieu Parent]

This is an automated email from the git hooks/post-receive script.

sathieu pushed a commit to branch master
in repository samba.

commit 48ca6c4689a392e27f22a3810632cc8b19bbeca3
Author: Mathieu Parent <math.parent at gmail.com>
Date:   Sat Jun 11 04:24:44 2016 +0200

    Update README.source and remove build-orig.sh
---
 debian/README.source | 17 +++++------------
 debian/build-orig.sh | 37 -------------------------------------
 2 files changed, 5 insertions(+), 49 deletions(-)

diff --git a/debian/README.source b/debian/README.source
index 1d181b6..fcb987e 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -1,9 +1,9 @@
 
-The packaging is kept in git://git.debian.org/git/pkg-samba/samba.git (web
-interface: http://git.debian.org/?p=pkg-samba/samba.git).
+The packaging is kept in https://anonscm.debian.org/git/pkg-samba/samba.git
+(web interface: https://anonscm.debian.org/cgit/pkg-samba/samba.git).
 
 The version in unstable is on the 'master' branch, with the corresponding
-upstream version in the 'upstream_4.0' branch (with pristine-tar information
+upstream version in the 'upstream_4.4' branch (with pristine-tar information
 in the pristine-tar branch).
 
 It should be possible to build the package by just running 'git-buildpackage'.
@@ -14,21 +14,14 @@ Merging upstream releases
 
 Importing a new upstream version can be done like this:
 
-# recompress tarball
-gunzip samba-4.0.6.tar.gz
-xz samba-4.0.6.tar
 # go to git repo
 cd $GIT_DIR
 # make sure to be on the right branch
 git checkout master
-git-import-orig --upstream-version=4.0.6+dfsg --upstream-vcs-tag=samba-4.0.6 \
-    ../samba-4.0.6.tar.xz
+# Import latest version
+gbp import-orig --uscan
 # all done :)
 
 
 Please note that there are some files that are not dfsg-free and they need to
 be filtered. The settings in the gpb.conf should take care of that.
-
-
-
-
diff --git a/debian/build-orig.sh b/debian/build-orig.sh
deleted file mode 100755
index 75a2d27..0000000
--- a/debian/build-orig.sh
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/bash -e
-
-version=$( dpkg-parsechangelog -l`dirname $0`/changelog | sed -n 's/^Version: \(.*:\|\)//p' | sed 's/-[0-9.]\+$//' )
-
-if echo "$version" | egrep "(bzr|git)" >/dev/null; then
-	if [ -z "$SAMBA_GIT_URL" ]; then
-		SAMBA_GIT_URL=git://git.samba.org/samba.git
-	fi
-
-	if [ -d "$SAMBA_GIT_URL/.bzr" ]; then
-		bzr co --lightweight "$SAMBA_GIT_URL" samba4-upstream-$version
-	else
-		git clone "$SAMBA_GIT_URL" samba4-upstream-$version
-	fi
-
-	pushd "samba4-upstream-$version"
-	./configure
-	./buildtools/bin/waf dist
-	tar xfz samba-4.*.tar.gz
-	rm samba-4*.tar.gz
-	mv samba-4* "../samba4-$version"
-	popd
-	rm -rf "samba4-upstream-$version"
-else
-	upstream_version=`echo $version | sed -e 's/~alpha1~tp/tp/;s/~beta/beta/;s/~alpha/alpha/;s/~rc/rc/;s/.dfsg[0-9]*$//;'`
-	wget ftp://ftp.samba.org/pub/samba/samba-$upstream_version.tar.gz
-	wget ftp://ftp.samba.org/pub/samba/samba-$upstream_version.tar.asc
-	gunzip samba-$upstream_version.tar.gz
-	gpg --verify samba-$upstream_version.tar.asc
-	tar xvf samba-$upstream_version.tar
-	mv samba-$upstream_version samba-$version
-	rm samba-$upstream_version.tar.asc samba-$upstream_version.tar
-fi
-`dirname $0`/dfsg-clean.sh "samba-$version"
-tar cfz samba_$version.orig.tar.gz "samba-$version"
-rm -rf "samba-$version"
-exit 0

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-samba/samba.git