From a9dc3cc90a7b30b79083210fe0385fd790b89f0f Mon Sep 17 00:00:00 2001 From: FujiApple Date: Sun, 15 Sep 2024 11:03:38 +0800 Subject: [PATCH] build: rename debian/ as `ubuntu-ppa/` This is to avoid a clash with downstream Debian which also maintains a `debian/` directory. --- {debian => ubuntu-ppa}/Dockerfile | 2 +- {debian => ubuntu-ppa}/README.debian | 0 {debian => ubuntu-ppa}/README.md | 0 {debian => ubuntu-ppa}/cargo.config | 0 {debian => ubuntu-ppa}/changelog | 0 {debian => ubuntu-ppa}/control | 0 {debian => ubuntu-ppa}/copyright | 0 {debian => ubuntu-ppa}/release.sh | 4 ++-- {debian => ubuntu-ppa}/rules | 0 {debian => ubuntu-ppa}/source/format | 0 {debian => ubuntu-ppa}/source/include-binaries | 0 {debian => ubuntu-ppa}/trippy.docs | 0 {debian => ubuntu-ppa}/trippy.install | 0 13 files changed, 3 insertions(+), 3 deletions(-) rename {debian => ubuntu-ppa}/Dockerfile (89%) rename {debian => ubuntu-ppa}/README.debian (100%) rename {debian => ubuntu-ppa}/README.md (100%) rename {debian => ubuntu-ppa}/cargo.config (100%) rename {debian => ubuntu-ppa}/changelog (100%) rename {debian => ubuntu-ppa}/control (100%) rename {debian => ubuntu-ppa}/copyright (100%) rename {debian => ubuntu-ppa}/release.sh (95%) rename {debian => ubuntu-ppa}/rules (100%) rename {debian => ubuntu-ppa}/source/format (100%) rename {debian => ubuntu-ppa}/source/include-binaries (100%) rename {debian => ubuntu-ppa}/trippy.docs (100%) rename {debian => ubuntu-ppa}/trippy.install (100%) diff --git a/debian/Dockerfile b/ubuntu-ppa/Dockerfile similarity index 89% rename from debian/Dockerfile rename to ubuntu-ppa/Dockerfile index beba414c..78f1b9cd 100644 --- a/debian/Dockerfile +++ b/ubuntu-ppa/Dockerfile @@ -10,4 +10,4 @@ COPY release.sh release.sh WORKDIR /data -CMD ["./debian/release.sh"] \ No newline at end of file +CMD ["./ubuntu-ppa/release.sh"] \ No newline at end of file diff --git a/debian/README.debian b/ubuntu-ppa/README.debian similarity index 100% rename from debian/README.debian rename to ubuntu-ppa/README.debian diff --git a/debian/README.md b/ubuntu-ppa/README.md similarity index 100% rename from debian/README.md rename to ubuntu-ppa/README.md diff --git a/debian/cargo.config b/ubuntu-ppa/cargo.config similarity index 100% rename from debian/cargo.config rename to ubuntu-ppa/cargo.config diff --git a/debian/changelog b/ubuntu-ppa/changelog similarity index 100% rename from debian/changelog rename to ubuntu-ppa/changelog diff --git a/debian/control b/ubuntu-ppa/control similarity index 100% rename from debian/control rename to ubuntu-ppa/control diff --git a/debian/copyright b/ubuntu-ppa/copyright similarity index 100% rename from debian/copyright rename to ubuntu-ppa/copyright diff --git a/debian/release.sh b/ubuntu-ppa/release.sh similarity index 95% rename from debian/release.sh rename to ubuntu-ppa/release.sh index 66c2cc2d..4e6936fc 100755 --- a/debian/release.sh +++ b/ubuntu-ppa/release.sh @@ -42,13 +42,13 @@ fi # Vendor the cargo dependencies cargo vendor -tar cJf debian/vendor.tar.xz vendor +tar cJf ubuntu-ppa/vendor.tar.xz vendor for series in "${SERIES[@]}"; do UBUNTU_VERSION=$(distro-info --series "${series}" -r | cut -d' ' -f1) BUILD_DIR="build-${series}" mkdir -p "${BUILD_DIR}" - cp -r debian "${BUILD_DIR}/debian" + cp -r ubuntu-ppa "${BUILD_DIR}/debian" cd "${BUILD_DIR}" # Update changelog for the specific series diff --git a/debian/rules b/ubuntu-ppa/rules similarity index 100% rename from debian/rules rename to ubuntu-ppa/rules diff --git a/debian/source/format b/ubuntu-ppa/source/format similarity index 100% rename from debian/source/format rename to ubuntu-ppa/source/format diff --git a/debian/source/include-binaries b/ubuntu-ppa/source/include-binaries similarity index 100% rename from debian/source/include-binaries rename to ubuntu-ppa/source/include-binaries diff --git a/debian/trippy.docs b/ubuntu-ppa/trippy.docs similarity index 100% rename from debian/trippy.docs rename to ubuntu-ppa/trippy.docs diff --git a/debian/trippy.install b/ubuntu-ppa/trippy.install similarity index 100% rename from debian/trippy.install rename to ubuntu-ppa/trippy.install