summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Lehtonen <markus.lehtonen@linux.intel.com>2013-04-25 16:51:50 +0300
committerMarkus Lehtonen <markus.lehtonen@linux.intel.com>2013-05-13 15:41:12 +0300
commit098a0eada51dbf8d3106e6627cc1888e709cf452 (patch)
tree4e553a29ab6a459849c82afc32985e398765c7b8
parent228e01e307d82f81ef5213bec4e9f46965bcb079 (diff)
downloadgit-buildpackage-098a0eada51dbf8d3106e6627cc1888e709cf452.tar.gz
git-buildpackage-098a0eada51dbf8d3106e6627cc1888e709cf452.tar.bz2
git-buildpackage-098a0eada51dbf8d3106e6627cc1888e709cf452.zip
Remove all OBS hacks for building debian packages
Change-Id: Ifa83d048dc199e1d37d1c2d708218fd360373003 Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
-rw-r--r--.gbp.conf2
-rw-r--r--debian/control4
-rw-r--r--packaging/git-buildpackage.dsc13
-rwxr-xr-xpackaging/update-dsc.sh12
4 files changed, 3 insertions, 28 deletions
diff --git a/.gbp.conf b/.gbp.conf
index e613e635..3473a39e 100644
--- a/.gbp.conf
+++ b/.gbp.conf
@@ -16,5 +16,3 @@ packaging-dir=packaging
patch-export = True
patch-numbers = True
patch-export-ignore-path = (.gbp.conf|packaging/.*)
-# Export hook
-postexport=./update-dsc.sh
diff --git a/debian/control b/debian/control
index 2ea969af..aadbb74d 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,9 @@ Build-Depends: debhelper (>= 7.0.50~), python (>> 2.6.6-3~),
pychecker, gtk-doc-tools, sgml2x, docbook-utils, jade, python-nose,
bash-completion, perl, python-epydoc, python-coverage, python-setuptools, python-rpm,
# For the testsuite
- git, bzip2, unzip, pristine-tar, devscripts
+ git, bzip2, unzip, pristine-tar, devscripts,
+# For epydoc
+ python-rpm
Standards-Version: 3.9.3
Vcs-Git: git://honk.sigxcpu.org/git/git-buildpackage.git
Vcs-Browser: http://git.debian.org/?p=users/agx/git-buildpackage.git
diff --git a/packaging/git-buildpackage.dsc b/packaging/git-buildpackage.dsc
deleted file mode 100644
index 9d606795..00000000
--- a/packaging/git-buildpackage.dsc
+++ /dev/null
@@ -1,13 +0,0 @@
-Format: 1.0
-Source: git-buildpackage
-Version: 0.6.0git20130329-tizen20130403
-Binary: git-buildpackage-common, git-buildpackage, git-buildpackage-rpm
-Maintainer: Adrian Schroeter <adrian@suse.de>
-Architecture: all
-Standards-Version: 3.8.3
-Build-Depends: debhelper (>= 7.0.50~), python (>> 2.6.6-3~),
- pychecker, gtk-doc-tools, sgml2x, docbook-utils, jade, python-nose,
- bash-completion, perl, python-epydoc, python-coverage, python-distribute, python-rpm,
- git, bzip2, unzip, pristine-tar, devscripts
-Files:
- bc0a3fb7ca5edeabea938cd4ed1160e3 182687 git-buildpackage_0.6.0git20130314.tar.gz
diff --git a/packaging/update-dsc.sh b/packaging/update-dsc.sh
deleted file mode 100755
index baf663cd..00000000
--- a/packaging/update-dsc.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash -e
-_PKG_NAME=git-buildpackage
-_SPECFILE=${_PKG_NAME}.spec
-_PKG_VERSION=`grep '^Version: ' $_SPECFILE | awk '{print $2}'`
-_TARBALL=${_PKG_NAME}_${_PKG_VERSION}.tar.gz
-
-echo "Updating dsc file to version $_PKG_VERSION"
-_TARBALL_BYTES=` stat -c '%s' $_TARBALL`
-_MD5=`md5sum $_TARBALL | sed "s/ / $_TARBALL_BYTES /"`
-sed -i "s/^Version:.*/Version: ${_PKG_VERSION}/" ${_PKG_NAME}.dsc
-sed -i "s/ [a-f0-9]\+ [0-9]\+ ${_PKG_NAME}.*tar.*/ ${_MD5}/" ${_PKG_NAME}.dsc
-