From 6276f0d797e3e4d4ffe3062d46ea1caf8522800a Mon Sep 17 00:00:00 2001 From: Evan Broder Date: Thu, 23 Oct 2008 21:56:39 -0400 Subject: [PATCH] Update sx-build-release and reprepro-env to work with sbuild instead of dpkg-buildpackage svn path=/trunk/packages/sipb-xen-dev/; revision=1170 --- debian/changelog | 7 +++++++ reprepro-env | 2 +- sx-build-release | 7 ++++--- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 6233301..85af810 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +sipb-xen-dev (26) unstable; urgency=low + + * Update sx-build-release and reprepro-env to work with sbuild instead + of dpkg-buildpackage + + -- Evan Broder Thu, 23 Oct 2008 21:56:17 -0400 + sipb-xen-dev (25) unstable; urgency=low * Don't sign packages when they're built diff --git a/reprepro-env b/reprepro-env index 25e17b1..5f7e575 100755 --- a/reprepro-env +++ b/reprepro-env @@ -1,5 +1,5 @@ #!/bin/sh set -e export HOME=/home/repository -exec sudo -H -u repository /usr/bin/reprepro -b /srv/repository "$@" +exec sudo -H -u repository /usr/bin/reprepro -b /srv/repository --ignore=wrongdistribution "$@" diff --git a/sx-build-release b/sx-build-release index 7705662..acfb2d7 100755 --- a/sx-build-release +++ b/sx-build-release @@ -15,7 +15,9 @@ cd build-release/$package eval `perl '-F:\s+' -lane 'print $F[0]."=".$F[1] if /^Version|^Source|^Distribution/' \ <(dpkg-parsechangelog)` -dpkg-buildpackage -us -uc -rfakeroot +dpkg-buildpackage -us -uc -rfakeroot -S +cd .. +sbuild -A -d hardy-amd64 "${Source}_${Version}.dsc" if ! svn ls $svnuri/package_tags/$Source >/dev/null 2>&1; then svn mkdir $svnuri/package_tags/$Source \ @@ -28,10 +30,9 @@ else echo "$(basename $0): tag already exists, not making again" fi -cd .. [ $Distribution = 'unstable' ] \ || echo "$(basename $0): warning: Distribution is ${Distribution}, script expects unstable" -changesfile=`pwd`/${Source}_*${Version}*.changes +changesfile="$(ls `pwd`/${Source}_*${Version}*.changes | grep -v 'source.changes$')" reprepro-env include unstable $changesfile reprepro-env copy stable unstable ${Source} \ $(perl '-F:\s+' -lane 'print $F[1]." " if /^Binary/' <$changesfile) -- 1.7.9.5