From d45550108f41d6ba51aa13dad8301bd767469b62 Mon Sep 17 00:00:00 2001
From: Oliver Smith <osmith@sysmocom.de>
Date: Thu, 28 May 2020 09:39:40 +0200
Subject: fixup 2

Change-Id: Ib3300bbbbf6d70722eb4f4650dbef1f7fce5e3fa
---
 scripts/common-obs.sh | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/scripts/common-obs.sh b/scripts/common-obs.sh
index 6b41886..b67ca7d 100644
--- a/scripts/common-obs.sh
+++ b/scripts/common-obs.sh
@@ -36,7 +36,7 @@ osmo_obs_prepare_conflict() {
 	mkdir -p "$pkgname/debian/source"
 	cd "$pkgname/debian"
 
-	# Fill control, changelog, rules
+	# Fill control
 	cat << EOF > control
 Source: ${pkgname}
 Section: unknown
@@ -50,18 +50,22 @@ Depends: \${misc:Depends}
 Architecture: any
 EOF
 	printf "Conflicts: " >> control
-	first=0
+	first=1
 	for i in "$@"; do
-		if [ "$first" -eq 0 ]; then
-			first=1
+		if [ "$first" -eq 1 ]; then
+			first=0
 		else
-			printf ", "
+			printf ", " >> control
 		fi
 		printf "%s" "$i" >> control
 	done
+	printf "\n" >> control
 	cat << EOF >> control
 Description: Dummy package, which conflicts with: $@
 EOF
+	cat control
+
+	# Fill changelog
 	cat << EOF > changelog
 ${pkgname} (${pkgver}) unstable; urgency=medium
 
@@ -69,6 +73,8 @@ ${pkgname} (${pkgver}) unstable; urgency=medium
 
  -- Oliver Smith <osmith@sysmocom.de>  Thu, 13 Jun 2019 12:50:19 +0200
 EOF
+
+	# Fill rules
 	cat << EOF > rules
 #!/usr/bin/make -f
 %:
-- 
cgit v1.2.3