packaging: rename distro directories

diff --git a/distro/debian/debian/README.source b/distro/deb/debian/README.source
similarity index 100%
rename from distro/debian/debian/README.source
rename to distro/deb/debian/README.source

diff --git a/distro/debian/debian/changelog b/distro/deb/debian/changelog
similarity index 100%
rename from distro/debian/debian/changelog
rename to distro/deb/debian/changelog

diff --git a/distro/debian/debian/clean b/distro/deb/debian/clean
similarity index 100%
rename from distro/debian/debian/clean
rename to distro/deb/debian/clean

diff --git a/distro/debian/debian/compat b/distro/deb/debian/compat
similarity index 100%
rename from distro/debian/debian/compat
rename to distro/deb/debian/compat

diff --git a/distro/debian/debian/control b/distro/deb/debian/control
similarity index 100%
rename from distro/debian/debian/control
rename to distro/deb/debian/control

diff --git a/distro/debian/debian/copyright b/distro/deb/debian/copyright
similarity index 100%
rename from distro/debian/debian/copyright
rename to distro/deb/debian/copyright

diff --git a/distro/debian/debian/docs b/distro/deb/debian/docs
similarity index 100%
rename from distro/debian/debian/docs
rename to distro/deb/debian/docs

diff --git a/distro/debian/debian/init-d-script b/distro/deb/debian/init-d-script
similarity index 100%
rename from distro/debian/debian/init-d-script
rename to distro/deb/debian/init-d-script

diff --git a/distro/debian/debian/knot-resolver-doc.doc-base b/distro/deb/debian/knot-resolver-doc.doc-base
similarity index 100%
rename from distro/debian/debian/knot-resolver-doc.doc-base
rename to distro/deb/debian/knot-resolver-doc.doc-base

diff --git a/distro/debian/debian/knot-resolver-doc.docs b/distro/deb/debian/knot-resolver-doc.docs
similarity index 100%
rename from distro/debian/debian/knot-resolver-doc.docs
rename to distro/deb/debian/knot-resolver-doc.docs

diff --git a/distro/debian/debian/knot-resolver-doc.links b/distro/deb/debian/knot-resolver-doc.links
similarity index 100%
rename from distro/debian/debian/knot-resolver-doc.links
rename to distro/deb/debian/knot-resolver-doc.links

diff --git a/distro/debian/debian/knot-resolver-module-http.install b/distro/deb/debian/knot-resolver-module-http.install
similarity index 100%
rename from distro/debian/debian/knot-resolver-module-http.install
rename to distro/deb/debian/knot-resolver-module-http.install

diff --git a/distro/debian/debian/knot-resolver-module-http.links b/distro/deb/debian/knot-resolver-module-http.links
similarity index 100%
rename from distro/debian/debian/knot-resolver-module-http.links
rename to distro/deb/debian/knot-resolver-module-http.links

diff --git a/distro/debian/debian/knot-resolver-module-tinyweb.install b/distro/deb/debian/knot-resolver-module-tinyweb.install
similarity index 100%
rename from distro/debian/debian/knot-resolver-module-tinyweb.install
rename to distro/deb/debian/knot-resolver-module-tinyweb.install

diff --git a/distro/debian/debian/knot-resolver.dirs b/distro/deb/debian/knot-resolver.dirs
similarity index 100%
rename from distro/debian/debian/knot-resolver.dirs
rename to distro/deb/debian/knot-resolver.dirs

diff --git a/distro/debian/debian/knot-resolver.install b/distro/deb/debian/knot-resolver.install
similarity index 100%
rename from distro/debian/debian/knot-resolver.install
rename to distro/deb/debian/knot-resolver.install

diff --git a/distro/debian/debian/knot-resolver.kresd.default b/distro/deb/debian/knot-resolver.kresd.default
similarity index 100%
rename from distro/debian/debian/knot-resolver.kresd.default
rename to distro/deb/debian/knot-resolver.kresd.default

diff --git a/distro/debian/debian/knot-resolver.kresd.init b/distro/deb/debian/knot-resolver.kresd.init
similarity index 100%
rename from distro/debian/debian/knot-resolver.kresd.init
rename to distro/deb/debian/knot-resolver.kresd.init

diff --git a/distro/debian/debian/knot-resolver.links b/distro/deb/debian/knot-resolver.links
similarity index 100%
rename from distro/debian/debian/knot-resolver.links
rename to distro/deb/debian/knot-resolver.links

diff --git a/distro/debian/debian/knot-resolver.manpages b/distro/deb/debian/knot-resolver.manpages
similarity index 100%
rename from distro/debian/debian/knot-resolver.manpages
rename to distro/deb/debian/knot-resolver.manpages

diff --git a/distro/debian/debian/knot-resolver.postinst b/distro/deb/debian/knot-resolver.postinst
similarity index 100%
rename from distro/debian/debian/knot-resolver.postinst
rename to distro/deb/debian/knot-resolver.postinst

diff --git a/distro/debian/debian/knot-resolver.postrm b/distro/deb/debian/knot-resolver.postrm
similarity index 100%
rename from distro/debian/debian/knot-resolver.postrm
rename to distro/deb/debian/knot-resolver.postrm

diff --git a/distro/debian/debian/knot-resolver.triggers b/distro/deb/debian/knot-resolver.triggers
similarity index 100%
rename from distro/debian/debian/knot-resolver.triggers
rename to distro/deb/debian/knot-resolver.triggers

diff --git a/distro/debian/debian/kresd.conf b/distro/deb/debian/kresd.conf
similarity index 100%
rename from distro/debian/debian/kresd.conf
rename to distro/deb/debian/kresd.conf

diff --git a/distro/debian/debian/libkres-dev.install b/distro/deb/debian/libkres-dev.install
similarity index 100%
rename from distro/debian/debian/libkres-dev.install
rename to distro/deb/debian/libkres-dev.install

diff --git a/distro/debian/debian/libkres6.install b/distro/deb/debian/libkres6.install
similarity index 100%
rename from distro/debian/debian/libkres6.install
rename to distro/deb/debian/libkres6.install

diff --git a/distro/debian/debian/libkres6.symbols b/distro/deb/debian/libkres6.symbols
similarity index 100%
rename from distro/debian/debian/libkres6.symbols
rename to distro/deb/debian/libkres6.symbols

diff --git a/distro/debian/debian/not-installed b/distro/deb/debian/not-installed
similarity index 100%
rename from distro/debian/debian/not-installed
rename to distro/deb/debian/not-installed

diff --git a/distro/debian/debian/patches/0001-avoid-shipping-duplicate-root.hints-and-icann-ca.pem.patch b/distro/deb/debian/patches/0001-avoid-shipping-duplicate-root.hints-and-icann-ca.pem.patch
similarity index 100%
rename from distro/debian/debian/patches/0001-avoid-shipping-duplicate-root.hints-and-icann-ca.pem.patch
rename to distro/deb/debian/patches/0001-avoid-shipping-duplicate-root.hints-and-icann-ca.pem.patch

diff --git a/distro/debian/debian/patches/0002-Update-documentation-of-keyfile-ro.patch b/distro/deb/debian/patches/0002-Update-documentation-of-keyfile-ro.patch
similarity index 100%
rename from distro/debian/debian/patches/0002-Update-documentation-of-keyfile-ro.patch
rename to distro/deb/debian/patches/0002-Update-documentation-of-keyfile-ro.patch

diff --git a/distro/debian/debian/patches/0003-look-for-modules-in-python3.patch b/distro/deb/debian/patches/0003-look-for-modules-in-python3.patch
similarity index 100%
rename from distro/debian/debian/patches/0003-look-for-modules-in-python3.patch
rename to distro/deb/debian/patches/0003-look-for-modules-in-python3.patch

diff --git a/distro/debian/debian/patches/series b/distro/deb/debian/patches/series
similarity index 100%
rename from distro/debian/debian/patches/series
rename to distro/deb/debian/patches/series

diff --git a/distro/debian/debian/rules b/distro/deb/debian/rules
similarity index 100%
rename from distro/debian/debian/rules
rename to distro/deb/debian/rules

diff --git a/distro/debian/debian/source/format b/distro/deb/debian/source/format
similarity index 100%
rename from distro/debian/debian/source/format
rename to distro/deb/debian/source/format

diff --git a/distro/debian/debian/source/lintian-overrides b/distro/deb/debian/source/lintian-overrides
similarity index 100%
rename from distro/debian/debian/source/lintian-overrides
rename to distro/deb/debian/source/lintian-overrides

diff --git a/distro/debian/debian/tests/control b/distro/deb/debian/tests/control
similarity index 100%
rename from distro/debian/debian/tests/control
rename to distro/deb/debian/tests/control

diff --git a/distro/debian/knot-resolver.dsc b/distro/deb/knot-resolver.dsc
similarity index 100%
rename from distro/debian/knot-resolver.dsc
rename to distro/deb/knot-resolver.dsc

diff --git a/distro/fedora/knot-resolver.spec b/distro/rpm/knot-resolver.spec
similarity index 100%
rename from distro/fedora/knot-resolver.spec
rename to distro/rpm/knot-resolver.spec

diff --git a/distro/fedora/kresd.conf b/distro/rpm/kresd.conf
similarity index 100%
rename from distro/fedora/kresd.conf
rename to distro/rpm/kresd.conf

diff --git a/distro/fedora/root.keys b/distro/rpm/root.keys
similarity index 100%
rename from distro/fedora/root.keys
rename to distro/rpm/root.keys

diff --git a/scripts/build-in-obs.sh b/scripts/build-in-obs.sh
index fea8f1a4e3a8ca5b0081298c29441cc220318deb..b7409d2a0733d3194d7b1be83a849bb9807b4ca5 100755 (executable)
--- a/scripts/build-in-obs.sh
+++ b/scripts/build-in-obs.sh
@@ -12,10 +12,10 @@ osc co "${project}" "${package}"
 pushd "${project}/${package}"
 osc del * ||:
 cp ../../*.tar.xz ./
-cp -rL ../../distro/fedora/* ./
+cp -rL ../../distro/rpm/* ./
 cp -rL ../../distro/arch/* ./
-cp ../../distro/debian/*.debian.tar.xz ./
-cp "../../distro/debian/${package}.dsc" ./
+cp ../../distro/deb/*.debian.tar.xz ./
+cp "../../distro/deb/${package}.dsc" ./
 osc addremove
 osc ci -n
 popd

diff --git a/scripts/make-distrofiles.sh b/scripts/make-distrofiles.sh
index 576b21afe55884442196cee1f3a78ab2fa6f2b80..9c1228accb6413d0b16e633a3a1ba5384faa297c 100755 (executable)
--- a/scripts/make-distrofiles.sh
+++ b/scripts/make-distrofiles.sh
@@ -12,7 +12,7 @@ if [[ $(echo "${version}" | grep '^[[:alnum:].]$') -ne 0 ]]; then
 fi
 
 # Fill in VERSION field in distribution specific files
-files="distro/fedora/${package}.spec distro/debian/debian/changelog distro/debian/${package}.dsc distro/arch/PKGBUILD"
+files="distro/rpm/${package}.spec distro/deb/debian/changelog distro/deb/${package}.dsc distro/arch/PKGBUILD"
 for file in ${files}; do
        sed -i "s/__VERSION__/${version}/g" "${file}"
 done
@@ -21,10 +21,10 @@ done
 mv "${package}-${version}.tar.xz" "${package}_${version}.orig.tar.xz"
 
 # Create debian archive and dsc
-pushd distro/debian
+pushd distro/deb
 tar -chaf "${package}_${version}-1.debian.tar.xz" debian
 archive=${package}_${version}-1.debian.tar.xz
 echo " $(md5sum ${archive} | cut -d' ' -f1) $(wc -c ${archive})" >> ${package}.dsc
 popd
 archive=${package}_${version}.orig.tar.xz
-echo " $(md5sum ${archive} | cut -d' ' -f1) $(wc -c ${archive})" >> distro/debian/${package}.dsc
+echo " $(md5sum ${archive} | cut -d' ' -f1) $(wc -c ${archive})" >> distro/deb/${package}.dsc

diff --git a/scripts/make-srpm.sh b/scripts/make-srpm.sh
index dbccb3410224f1a3c14fcce045f3da59f54f93f3..760d865517b3f85caf5e1b6527fb3f5afe79af26 100755 (executable)
--- a/scripts/make-srpm.sh
+++ b/scripts/make-srpm.sh
@@ -5,8 +5,8 @@
 cd "$(git rev-parse --show-toplevel)"
 scripts/make-archive.sh
 scripts/make-distrofiles.sh
-mv knot-resolver_*.orig.tar.xz distro/fedora/
-cd distro/fedora
+mv knot-resolver_*.orig.tar.xz distro/rpm/
+cd distro/rpm
 rpkg srpm
 mv *.src.rpm ../../
 mv *.tar.xz ../../