From 5950d646c192ea663ece061ce0dfb62908a32e94 Mon Sep 17 00:00:00 2001
From: Zhang Qiang <qiang.z.zhang@intel.com>
Date: Wed, 12 Sep 2012 21:53:50 +0800
Subject: [PATCH] Update packaging files

* Update dependency:
  build 2012.09.12
  gbp:  0822
  depanneur: 0.1
* Update Makefile:
  dsc depend on tarball

Change-Id: I8ccdd2320b06699f37f705aea181b96673f88d5a
---
 debian/control     | 11 ++++++-----
 debian/rules       |  7 ++-----
 distfiles/gbs.spec |  7 ++++---
 packaging/Makefile |  2 +-
 packaging/gbs.dsc  |  4 ++--
 5 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/debian/control b/debian/control
index 29b893d..d846bcc 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: gbs
 Section: devel
 Priority: extra
 Maintainer: Jian-feng Ding <jian-feng.ding@intel.com>
-Build-Depends: debhelper (>= 7.0.15), python-dev, dpatch, cdbs,
+Build-Depends: debhelper (>= 7.0.15), python-dev,
 Standards-Version: 3.8.0
 Homepage: http://www.tizen.org
 
@@ -10,14 +10,15 @@ Package: gbs
 Architecture: all
 Depends: ${misc:Depends}, ${python:Depends},
  git-core,
- osc (= 0.134.0-1tizen+1),
- build (= 2012.08.10-1),
  rpm,
  qemu-arm-static (>= 0.14.1) | qemu-user-static,
  binfmt-support,
  sudo,
- git-buildpackage-rpm (= 0.6.0git20120810),
- createrepo
+ createrepo,
+ osc (= 0.134.0-1tizen+1),
+ build (= 2012.09.12-1),
+ git-buildpackage-rpm (= 0.6.0git20120822),
+ depanneur (= 0.1)
 Description: The command line tools for Tizen package developers
   The command line tools for Tizen package developers will
   be used to do packaging related tasks.
diff --git a/debian/rules b/debian/rules
index c1f1589..05d0e94 100644
--- a/debian/rules
+++ b/debian/rules
@@ -2,15 +2,12 @@
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
-
-include /usr/share/dpatch/dpatch.make
-
 build: build-stamp
-build-stamp: patch-stamp
+build-stamp:
 	dh_testdir
 	python setup.py build
 
-clean: unpatch
+clean:
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp
diff --git a/distfiles/gbs.spec b/distfiles/gbs.spec
index 72e73b8..ac4cd69 100644
--- a/distfiles/gbs.spec
+++ b/distfiles/gbs.spec
@@ -11,13 +11,14 @@ Source0:    %{name}_%{version}.tar.gz
 Requires:   python >= 2.5
 Requires:   python-pycurl
 Requires:   git-core
-Requires:   osc = 0.134.0
-Requires:   build = 2012.08.10
 Requires:   qemu >= 0.14.1
 Requires:   qemu-arm-static >= 0.14.1
 Requires:   sudo
-Requires:   git-buildpackage-rpm = 0.6.0git20120810
 Requires:   createrepo
+Requires:   osc = 0.134.0
+Requires:   build = 2012.09.12
+Requires:   git-buildpackage-rpm = 0.6.0git20120822
+Requires:   depanneur = 0.1
 %if 0%{?fedora_version}
 Requires:   rpm-build
 %else
diff --git a/packaging/Makefile b/packaging/Makefile
index 9495972..1539ac7 100644
--- a/packaging/Makefile
+++ b/packaging/Makefile
@@ -4,7 +4,7 @@ PKG_VERSION := $(shell grep '^Version: ' $(SPECFILE)|awk '{print $$2}')
 
 TARBALL := $(PKG_NAME)_$(PKG_VERSION).tar.gz
 
-dsc:
+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:
diff --git a/packaging/gbs.dsc b/packaging/gbs.dsc
index fb98a9f..6b6cb01 100644
--- a/packaging/gbs.dsc
+++ b/packaging/gbs.dsc
@@ -5,6 +5,6 @@ Binary: gbs
 Maintainer: Jian-feng Ding <jian-feng.ding@intel.com>
 Architecture: all
 Standards-Version: 3.7.1
-Build-Depends: debhelper (>= 4.0.0), python-dev, dpatch, cdbs
+Build-Depends: debhelper (>= 4.0.0), python-dev
 Files:
- eb764ded2164913c0db9be45fa59ea6e 2456014 gbs_0.9.tar.gz
+ a7bb9873246861f5e2bdeee61e69b9e9 2450871 gbs_0.9.tar.gz
-- 
2.7.4