From 7f63fabeeebc5adae76d9ad513c9e864a48fe21f Mon Sep 17 00:00:00 2001
From: Takuya ASADA <syuu@scylladb.com>
Date: Wed, 8 Feb 2017 18:48:52 +0900
Subject: [PATCH] dist: rename dist/ubuntu to dist/debian

Now we supported both Ubuntu and Debian on dist/ubuntu, and Ubuntu is one of
Debian variant, so dist/debian is better naming.

Signed-off-by: Takuya ASADA <syuu@scylladb.com>
Message-Id: <1486547332-3247-1-git-send-email-syuu@scylladb.com>
---
 dist/{ubuntu => debian}/build_deb.sh              | 8 ++++----
 dist/{ubuntu => debian}/changelog.in              | 0
 dist/{ubuntu => debian}/debian/compat             | 0
 dist/{ubuntu => debian}/debian/control            | 0
 dist/{ubuntu => debian}/debian/copyright          | 0
 dist/{ubuntu => debian}/debian/scylla-jmx.upstart | 0
 dist/{ubuntu => debian}/debian/source/format      | 0
 dist/{ubuntu => debian}/debian/source/options     | 0
 dist/{ubuntu => debian}/rules.in                  | 0
 9 files changed, 4 insertions(+), 4 deletions(-)
 rename dist/{ubuntu => debian}/build_deb.sh (92%)
 rename dist/{ubuntu => debian}/changelog.in (100%)
 rename dist/{ubuntu => debian}/debian/compat (100%)
 rename dist/{ubuntu => debian}/debian/control (100%)
 rename dist/{ubuntu => debian}/debian/copyright (100%)
 rename dist/{ubuntu => debian}/debian/scylla-jmx.upstart (100%)
 rename dist/{ubuntu => debian}/debian/source/format (100%)
 rename dist/{ubuntu => debian}/debian/source/options (100%)
 rename dist/{ubuntu => debian}/rules.in (100%)

diff --git a/dist/ubuntu/build_deb.sh b/dist/debian/build_deb.sh
similarity index 92%
rename from dist/ubuntu/build_deb.sh
rename to dist/debian/build_deb.sh
index cc2ad4b..f57123e 100755
--- a/dist/ubuntu/build_deb.sh
+++ b/dist/debian/build_deb.sh
@@ -1,6 +1,6 @@
 #!/bin/bash -e
 
-if [ ! -e dist/ubuntu/build_deb.sh ]; then
+if [ ! -e dist/debian/build_deb.sh ]; then
     echo "run build_deb.sh in top of scylla dir"
     exit 1
 fi
@@ -39,9 +39,9 @@ fi
 echo $VERSION > version
 ./scripts/git-archive-all --extra version --force-submodules --prefix scylla-jmx ../scylla-jmx_$SCYLLA_VERSION-$SCYLLA_RELEASE.orig.tar.gz 
 
-cp -a dist/ubuntu/debian debian
-cp dist/ubuntu/changelog.in debian/changelog
-cp dist/ubuntu/rules.in debian/rules
+cp -a dist/debian/debian debian
+cp dist/debian/changelog.in debian/changelog
+cp dist/debian/rules.in debian/rules
 sed -i -e "s/@@VERSION@@/$SCYLLA_VERSION/g" debian/changelog
 sed -i -e "s/@@RELEASE@@/$SCYLLA_RELEASE/g" debian/changelog
 sed -i -e "s/@@CODENAME@@/$CODENAME/g" debian/changelog
diff --git a/dist/ubuntu/changelog.in b/dist/debian/changelog.in
similarity index 100%
rename from dist/ubuntu/changelog.in
rename to dist/debian/changelog.in
diff --git a/dist/ubuntu/debian/compat b/dist/debian/debian/compat
similarity index 100%
rename from dist/ubuntu/debian/compat
rename to dist/debian/debian/compat
diff --git a/dist/ubuntu/debian/control b/dist/debian/debian/control
similarity index 100%
rename from dist/ubuntu/debian/control
rename to dist/debian/debian/control
diff --git a/dist/ubuntu/debian/copyright b/dist/debian/debian/copyright
similarity index 100%
rename from dist/ubuntu/debian/copyright
rename to dist/debian/debian/copyright
diff --git a/dist/ubuntu/debian/scylla-jmx.upstart b/dist/debian/debian/scylla-jmx.upstart
similarity index 100%
rename from dist/ubuntu/debian/scylla-jmx.upstart
rename to dist/debian/debian/scylla-jmx.upstart
diff --git a/dist/ubuntu/debian/source/format b/dist/debian/debian/source/format
similarity index 100%
rename from dist/ubuntu/debian/source/format
rename to dist/debian/debian/source/format
diff --git a/dist/ubuntu/debian/source/options b/dist/debian/debian/source/options
similarity index 100%
rename from dist/ubuntu/debian/source/options
rename to dist/debian/debian/source/options
diff --git a/dist/ubuntu/rules.in b/dist/debian/rules.in
similarity index 100%
rename from dist/ubuntu/rules.in
rename to dist/debian/rules.in