distro/deb: simplify deb sources hierarchy

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

diff --git a/distro/deb/knot-resolver.dsc b/distro/deb/knot-resolver.dsc
deleted file mode 100644 (file)
index 00bd8c3..0000000
--- a/distro/deb/knot-resolver.dsc
+++ /dev/null
@@ -1,40 +0,0 @@
-Format: 3.0 (quilt)
-Source: knot-resolver
-Binary:
- knot-resolver,
- knot-resolver-module-http,
- knot-resolver-doc,
- libkres7,
- libkres-dev
-Architecture: any all
-Version: __VERSION__-1
-Maintainer: Knot Resolver <knot-resolver@labs.nic.cz>
-Uploaders:  Tomas Krizek <tomas.krizek@nic.cz>
-Homepage: https://www.knot-resolver.cz/
-Testsuite: autopkgtest
-Build-Depends:
- debhelper (>= 9~),
- dns-root-data,
- libcmocka-dev (>= 1.0.0),
- libedit-dev,
- libgeoip-dev,
- libgnutls28-dev,
- libknot-dev (>= 2.6.7),
- liblmdb-dev,
- libluajit-5.1-dev,
- libsystemd-dev (>= 227),
- libuv1-dev,
- luajit,
- pkg-config,
-Build-Depends-Indep:
- doxygen,
- python3-breathe,
- python3-sphinx,
- python3-sphinx-rtd-theme
-Package-List:
- knot-resolver deb net optional arch=any
- knot-resolver-doc deb doc optional arch=all
- knot-resolver-module-http deb net optional arch=all
- libkres-dev deb libdevel optional arch=any
- libkres7 deb libs optional arch=any
-Files:

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

diff --git a/scripts/build-in-obs.sh b/scripts/build-in-obs.sh
index fa990a8a23506c9ad370367d9027064feada17aa..51d55420759c050f3c1c68034d6d1c32d7df1636 100755 (executable)
--- a/scripts/build-in-obs.sh
+++ b/scripts/build-in-obs.sh
@@ -19,11 +19,9 @@ fi
 osc co "${project}" "${package}"
 pushd "${project}/${package}"
 osc del * ||:
-cp ../../*.tar.xz ./
+cp -L ../../*.orig.tar.xz ../../*.debian.tar.xz ../../*.dsc ./
 cp -rL ../../distro/rpm/* ./
 cp -rL ../../distro/arch/* ./
-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 944062760ca7f09508428f18e27b81d53708e021..205787d8e53e1ceaa5da50daeb865c0798be56f3 100755 (executable)
--- a/scripts/make-distrofiles.sh
+++ b/scripts/make-distrofiles.sh
@@ -27,7 +27,7 @@ if [[ $(echo "${version}" | grep '^[[:alnum:].]$') -ne 0 ]]; then
 fi
 
 # Fill in VERSION field in distribution specific files
-files="distro/rpm/${package}.spec distro/deb/debian/changelog distro/arch/PKGBUILD"
+files="distro/rpm/${package}.spec distro/deb/changelog distro/arch/PKGBUILD"
 for file in ${files}; do
        sed -i "s/__VERSION__/${version}/g" "${file}"
 done
@@ -40,7 +40,7 @@ mv "${pkgname}.tar.xz" "${debname}.tar.xz"
 # Prepare clean debian-specific directory
 tar -xf "${debname}.tar.xz"
 pushd "${pkgname}" > /dev/null
-cp -arL ../distro/deb/debian .
+cp -arL ../distro/deb debian
 
 # Optionally remove symbols file
 if [ "$withsymbols" = false ]; then