From 0d35495cda35a57da492a18a4bf3e7e95b50a024 Mon Sep 17 00:00:00 2001 From: Gui Chen Date: Thu, 27 Feb 2014 00:51:03 -0500 Subject: [PATCH] packaging: use gbp packaging service Change version in debian/changelog to Debian source package format "1.0 native". Change-Id: I6a4017a814cb04a808389e9b11851ce49e8765e0 Signed-off-by: Gui Chen Signed-off-by: Markus Lehtonen --- .gbp.conf | 6 ++++++ debian/changelog | 2 +- packaging/Makefile | 21 --------------------- packaging/mic.dsc | 11 ----------- packaging/mic.spec | 8 +++++++- 5 files changed, 14 insertions(+), 34 deletions(-) create mode 100644 .gbp.conf delete mode 100644 packaging/Makefile delete mode 100644 packaging/mic.dsc diff --git a/.gbp.conf b/.gbp.conf new file mode 100644 index 0000000..ed62168 --- /dev/null +++ b/.gbp.conf @@ -0,0 +1,6 @@ +[DEFAULT] +# Vendor/Distro name +vendor=Tizen +# Subdir for RPM packaging data +packaging-dir=packaging +packaging-tag=%(upstreamversion)s diff --git a/debian/changelog b/debian/changelog index d7ef87c..6dde95d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -mic (0.23-0.rc1) unstable; urgency=low +mic (0.23~rc1) unstable; urgency=low * new distribution support: Ubuntu 13.10 and OpenSUSE 13.1 * split requirements to subpackage 'mic-native' to reduce mic's dependencies * support arm64 architecture image creation in native mode diff --git a/packaging/Makefile b/packaging/Makefile deleted file mode 100644 index ae431d6..0000000 --- a/packaging/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -PKG_NAME := mic -SPECFILE = $(addsuffix .spec, $(PKG_NAME)) -PKG_VERSION := $(shell grep '^Version: ' $(SPECFILE)|awk '{print $$2}') - -TARBALL := $(PKG_NAME)_$(PKG_VERSION).tar.gz - -dsc: $(TARBALL) - $(eval MD5=$(shell md5sum $(TARBALL) | sed "s/ / $(shell stat -c '%s' $(TARBALL)) /")) - @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 - -$(TARBALL): - cd "$$(git rev-parse --show-toplevel)" \ - && git archive --prefix $(PKG_NAME)-$(PKG_VERSION)/ HEAD \ - | gzip > "$(CURDIR)/$(TARBALL)" - -clean: - rm -f $(PKG_NAME)*.tar.gz - -all: clean dsc - diff --git a/packaging/mic.dsc b/packaging/mic.dsc deleted file mode 100644 index 881b8b2..0000000 --- a/packaging/mic.dsc +++ /dev/null @@ -1,11 +0,0 @@ -Format: 1.0 -Source: mic -Binary: mic, mic-native -Architecture: all -Version: 0.23 -Maintainer: Gui Chen -Homepage: https://review.tizen.org/gerrit/tools/mic -Standards-Version: 3.8.0 -Build-Depends: debhelper (>= 7.0.15), dpatch, cdbs, python-dev, python-support, python-docutils -Files: - 1f266944838a142e657aa0244e7f15e5 1684957 mic_0.23.tar.gz diff --git a/packaging/mic.spec b/packaging/mic.spec index e28ba75..1f224df 100644 --- a/packaging/mic.spec +++ b/packaging/mic.spec @@ -1,9 +1,15 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} +%define rc_version 1 + +%if 0%{?rc_version} +%define release_prefix 0.rc%{rc_version}. +%endif + Name: mic Summary: Image Creator for Linux Distributions Version: 0.23 -Release: 0.rc1.. +Release: %{?release_prefix}%{?opensuse_bs:.}%{!?opensuse_bs:0} Group: Development/Tools License: GPLv2 BuildArch: noarch -- 2.7.4