From d1e3ae723a01cd4f127043752986e2e069c09b89 Mon Sep 17 00:00:00 2001
From: Zhang Qiang <qiang.z.zhang@intel.com>
Date: Thu, 7 Nov 2013 14:16:18 +0800
Subject: [PATCH] Enable building with git-buildpackage

Also change the Debian packaging format as 1.0 native and remove
unnecessary Debian packaging files from the (rpm) packaging/ directory.

Change-Id: I0dfcdfcee18afac95bbbc255bc00057eab360c1c
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
---
 .gbp.conf          |  3 +--
 debian/changelog   |  2 +-
 packaging/Makefile | 17 -----------------
 packaging/gbs.dsc  | 10 ----------
 4 files changed, 2 insertions(+), 30 deletions(-)
 delete mode 100644 packaging/Makefile
 delete mode 100644 packaging/gbs.dsc

diff --git a/.gbp.conf b/.gbp.conf
index 3d416ed..ed62168 100644
--- a/.gbp.conf
+++ b/.gbp.conf
@@ -3,5 +3,4 @@
 vendor=Tizen
 # Subdir for RPM packaging data
 packaging-dir=packaging
-# Export hook
-postexport=if [ -f Makefile ]; then make dsc; fi
+packaging-tag=%(upstreamversion)s
diff --git a/debian/changelog b/debian/changelog
index c1af3ab..79b8b55 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-gbs (0.19-1) unstable; urgency=high
+gbs (0.19) unstable; urgency=high
   * upgrade to gbs v0.19, which contains the following bug fixing & features:
   * [build] support comments(#) in binary-list file for --binary-from-file
   * [build] remove previous built rpm and srpm if new version has been built out
diff --git a/packaging/Makefile b/packaging/Makefile
deleted file mode 100644
index d62a453..0000000
--- a/packaging/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-PKG_NAME := gbs
-SPECFILE = $(addsuffix .spec, $(PKG_NAME))
-PKG_VERSION := $(shell grep '^Version: ' $(SPECFILE)|awk '{print $$2}')
-
-TARBALL := $(PKG_NAME)_$(PKG_VERSION).tar.gz
-
-dsc: $(TARBALL)
-	@sed  -i 's/ [a-f0-9]\+ [0-9]\+ $(TARBALL)/ $(shell md5sum $(TARBALL) | sed "s/  / $(shell stat -c '%s' $(TARBALL)) /")/' $(PKG_NAME).dsc
-
-$(TARBALL):
-	@cd .. && git archive --prefix $(PKG_NAME)-$(PKG_VERSION)/ HEAD \
-		| gzip > packaging/$(TARBALL)
-
-clean:
-	@rm -f *.tar.gz
-
-all: clean dsc
diff --git a/packaging/gbs.dsc b/packaging/gbs.dsc
deleted file mode 100644
index 01f68d0..0000000
--- a/packaging/gbs.dsc
+++ /dev/null
@@ -1,10 +0,0 @@
-Format: 1.0
-Source: gbs
-Version: 0.19
-Binary: gbs, gbs-api, gbs-export, gbs-remotebuild
-Maintainer: Jian-feng Ding <jian-feng.ding@intel.com>
-Architecture: all
-Standards-Version: 3.7.1
-Build-Depends: debhelper, python-support
-Files:
- 574996dfeeb001e70f20239a0e621daf 2457861 gbs_0.19.tar.gz
-- 
2.7.4