From ac14dae95071ebb775f4ea7d8bb97dd1b2c0efbf Mon Sep 17 00:00:00 2001
From: Edric Milaret <edric.ladent-milaret@savoirfairelinux.com>
Date: Wed, 16 Sep 2015 10:16:06 -0400
Subject: [PATCH] packaging: fixes
- Release number was not correctly set
- Contact email was incorrect
Issue: #80006
Change-Id: I148352b9906193548d8d7ba9f9dfe6a1527e430d
---
.packer.json | 23 +++++++++++++----------
docker/debian_8/Dockerfile | 3 ++-
2 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/.packer.json b/.packer.json
index 7e6ecb4537..3d1e3efe95 100644
--- a/.packer.json
+++ b/.packer.json
@@ -7,6 +7,7 @@
"cp ring-daemon.spec ..",
"git archive --format=tar --prefix=ring-daemon/ -o /sources/daemon origin/master",
"cd ..",
+ "sed -i 's/define release .*/define release {{RELEASE_NUMBER}}/g' ring-daemon.spec",
"sed -i 's/%setup -q/%setup -n ring-daemon/' ring-daemon.spec",
"rpmbuild -ba ring-daemon.spec --define \"_sourcedir /sources\"",
"cp -R /root/rpmbuild/RPMS/x86_64/* /output"
@@ -17,6 +18,7 @@
"cp ring-daemon.spec ..",
"git archive --format=tar --prefix=ring-daemon/ -o /sources/daemon origin/master",
"cd ..",
+ "sed -i 's/define release .*/define release {{RELEASE_NUMBER}}/g' ring-daemon.spec",
"sed -i 's/%setup -q/%setup -n ring-daemon/' ring-daemon.spec",
"rpmbuild -ba ring-daemon.spec --define \"_sourcedir /sources\"",
"cp -R /root/rpmbuild/RPMS/i686/* /output"
@@ -27,6 +29,7 @@
"cp ring-daemon.spec ..",
"git archive --format=tar --prefix=ring-daemon/ -o /sources/daemon origin/master",
"cd ..",
+ "sed -i 's/define release .*/define release {{RELEASE_NUMBER}}/g' ring-daemon.spec",
"sed -i 's/%setup -q/%setup -n ring-daemon/' ring-daemon.spec",
"rpmbuild -ba ring-daemon.spec --define \"_sourcedir /sources\"",
"cp -R /root/rpmbuild/RPMS/x86_64/* /output"
@@ -35,7 +38,7 @@
"mkdir -p /sources/ring-daemon",
"cd /sources/ring-daemon",
"/ring-daemon/debian/rules get-orig-source",
- "dch --newversion $(dpkg-parsechangelog --show-field Version) \"Automatic nightly release\"",
+ "dch --newversion $(dpkg-parsechangelog | perl -ne 'print $1 if m{^Version:\\s+([\\d\\.]+)};')-{{RELEASE_NUMBER}} \"Automatic nightly release\"",
"dch --release --distribution \"unstable\" debian/changelog",
"dpkg-buildpackage -uc -us",
"cd .. ",
@@ -45,7 +48,7 @@
"mkdir -p /sources/ring-daemon",
"cd /sources/ring-daemon",
"/ring-daemon/debian/rules get-orig-source",
- "dch --newversion $(dpkg-parsechangelog --show-field Version) \"Automatic nightly release\"",
+ "dch --newversion $(dpkg-parsechangelog | perl -ne 'print $1 if m{^Version:\\s+([\\d\\.]+)};')-{{RELEASE_NUMBER}} \"Automatic nightly release\"",
"dch --release --distribution \"unstable\" debian/changelog",
"dpkg-buildpackage -uc -us",
"cd .. ",
@@ -55,7 +58,7 @@
"mkdir -p /sources/ring-daemon",
"cd /sources/ring-daemon",
"/ring-daemon/debian/rules get-orig-source",
- "dch --newversion $(dpkg-parsechangelog --show-field Version) \"Automatic nightly release\"",
+ "dch --newversion $(dpkg-parsechangelog | perl -ne 'print $1 if m{^Version:\\s+([\\d\\.]+)};')-{{RELEASE_NUMBER}} \"Automatic nightly release\"",
"dch --release --distribution \"unstable\" debian/changelog",
"dpkg-buildpackage -uc -us",
"cd .. ",
@@ -65,7 +68,7 @@
"mkdir -p /sources/ring-daemon",
"cd /sources/ring-daemon",
"/ring-daemon/debian/rules get-orig-source",
- "dch --newversion $(dpkg-parsechangelog --show-field Version) \"Automatic nightly release\"",
+ "dch --newversion $(dpkg-parsechangelog | perl -ne 'print $1 if m{^Version:\\s+([\\d\\.]+)};')-{{RELEASE_NUMBER}} \"Automatic nightly release\"",
"dch --release --distribution \"unstable\" debian/changelog",
"dpkg-buildpackage -uc -us",
"cd .. ",
@@ -75,7 +78,7 @@
"mkdir -p /sources/ring-daemon",
"cd /sources/ring-daemon",
"/ring-daemon/debian/rules get-orig-source",
- "dch --newversion $(dpkg-parsechangelog --show-field Version) \"Automatic nightly release\"",
+ "dch --newversion $(dpkg-parsechangelog | perl -ne 'print $1 if m{^Version:\\s+([\\d\\.]+)};')-{{RELEASE_NUMBER}} \"Automatic nightly release\"",
"dch --release --distribution \"unstable\" debian/changelog",
"dpkg-buildpackage -uc -us",
"cd .. ",
@@ -85,7 +88,7 @@
"mkdir -p /sources/ring-daemon",
"cd /sources/ring-daemon",
"/ring-daemon/debian/rules get-orig-source",
- "dch --newversion $(dpkg-parsechangelog --show-field Version) \"Automatic nightly release\"",
+ "dch --newversion $(dpkg-parsechangelog | perl -ne 'print $1 if m{^Version:\\s+([\\d\\.]+)};')-{{RELEASE_NUMBER}} \"Automatic nightly release\"",
"dch --release --distribution \"unstable\" debian/changelog",
"dpkg-buildpackage -uc -us",
"cd .. ",
@@ -95,7 +98,7 @@
"mkdir -p /sources/ring-daemon",
"cd /sources/ring-daemon",
"/ring-daemon/debian/rules get-orig-source",
- "dch --newversion $(dpkg-parsechangelog --show-field Version) \"Automatic nightly release\"",
+ "dch --newversion $(dpkg-parsechangelog | perl -ne 'print $1 if m{^Version:\\s+([\\d\\.]+)};')-{{RELEASE_NUMBER}} \"Automatic nightly release\"",
"dch --release --distribution \"unstable\" debian/changelog",
"dpkg-buildpackage -uc -us",
"cd .. ",
@@ -105,7 +108,7 @@
"mkdir -p /sources/ring-daemon",
"cd /sources/ring-daemon",
"/ring-daemon/debian/rules get-orig-source",
- "dch --newversion $(dpkg-parsechangelog --show-field Version) \"Automatic nightly release\"",
+ "dch --newversion $(dpkg-parsechangelog | perl -ne 'print $1 if m{^Version:\\s+([\\d\\.]+)};')-{{RELEASE_NUMBER}} \"Automatic nightly release\"",
"dch --release --distribution \"unstable\" debian/changelog",
"dpkg-buildpackage -uc -us",
"cd .. ",
@@ -115,7 +118,7 @@
"mkdir -p /sources/ring-daemon",
"cd /sources/ring-daemon",
"/ring-daemon/debian/rules get-orig-source",
- "dch --newversion $(dpkg-parsechangelog --show-field Version) \"Automatic nightly release\"",
+ "dch --newversion $(dpkg-parsechangelog | perl -ne 'print $1 if m{^Version:\\s+([\\d\\.]+)};')-{{RELEASE_NUMBER}} \"Automatic nightly release\"",
"dch --release --distribution \"unstable\" debian/changelog",
"dpkg-buildpackage -uc -us",
"cd .. ",
@@ -173,5 +176,5 @@
"ubuntu_15.04_i386": "@midnight"
},
"DeployScript": "ring-nightly-sign-deploy.sh",
- "NotificationMailAdress": ["Awesome Ring Team", "ring-dev@savoirfairelinux.com"]
+ "NotificationMailAdress": ["Awesome Ring Team", "ring-dev@lists.savoirfairelinux.net"]
}
diff --git a/docker/debian_8/Dockerfile b/docker/debian_8/Dockerfile
index 02afe04b89..53b1a2e0fd 100644
--- a/docker/debian_8/Dockerfile
+++ b/docker/debian_8/Dockerfile
@@ -1,7 +1,8 @@
FROM debian:8
RUN apt-get update && ( apt-get upgrade -y || apt-get upgrade -y || apt-get upgrade -y )
-RUN apt-get install -y devscripts debianutils debhelper build-essential tar rsync git autoconf automake libpulse-dev libsamplerate0-dev libtool libdbus-1-dev \
+RUN apt-get install -y devscripts debianutils debhelper build-essential tar \
+ rsync git autoconf automake libpulse-dev libsamplerate0-dev libtool libdbus-1-dev \
libasound2-dev libexpat1-dev libpcre3-dev libyaml-cpp-dev libboost-dev \
libdbus-c++-dev libsndfile1-dev libsrtp-dev libxext-dev \
libxfixes-dev yasm autopoint unbound-anchor git-core libspeex-dev \
--
GitLab