From 9a6dd2b8bf4426a490b8e50539e694bcf0e78a73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Fri, 13 Jan 2023 15:43:18 +0100 Subject: [PATCH] DEB tde-cmake: Move from common submodule to dependencies. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko --- .../tde-cmake}/debian/cdbs/cmake-versions.pl | 0 .../tde-cmake}/debian/cdbs/debian-tde.mk | 0 .../tde-cmake}/debian/cdbs/versions.pl | 0 .../_base/dependencies/tde-cmake}/debian/changelog | 6 ++++++ .../{common/cmake => dependencies/tde-cmake}/debian/compat | 0 .../_base/dependencies/tde-cmake}/debian/control | 7 +++++-- .../cmake => dependencies/tde-cmake}/debian/copyright | 0 .../cmake => dependencies/tde-cmake}/debian/patches/series | 0 .../{common/cmake => dependencies/tde-cmake}/debian/rules | 0 .../cmake => dependencies/tde-cmake}/debian/source/format | 0 .../cmake => dependencies/tde-cmake}/debian/source/options | 0 .../tde-cmake}/debian/cdbs/cmake-versions.pl | 0 .../tde-cmake}/debian/cdbs/debian-tde.mk | 0 .../tde-cmake}/debian/cdbs/versions.pl | 0 .../cmake => dependencies/tde-cmake}/debian/changelog | 6 ++++++ .../{common/cmake => dependencies/tde-cmake}/debian/compat | 0 .../cmake => dilos/dependencies/tde-cmake}/debian/control | 7 +++++-- .../cmake => dependencies/tde-cmake}/debian/copyright | 0 .../cmake => dependencies/tde-cmake}/debian/patches/series | 0 .../{common/cmake => dependencies/tde-cmake}/debian/rules | 0 .../cmake => dependencies/tde-cmake}/debian/source/format | 0 .../cmake => dependencies/tde-cmake}/debian/source/options | 0 .../tde-cmake}/debian/cdbs/cmake-versions.pl | 0 .../tde-cmake}/debian/cdbs/debian-tde.mk | 0 .../tde-cmake}/debian/cdbs/versions.pl | 0 .../_base/dependencies/tde-cmake}/debian/changelog | 6 ++++++ .../{common/cmake => dependencies/tde-cmake}/debian/compat | 0 .../cmake => dependencies/tde-cmake}/debian/control | 7 +++++-- .../cmake => dependencies/tde-cmake}/debian/copyright | 0 .../cmake => dependencies/tde-cmake}/debian/patches/series | 0 .../{common/cmake => dependencies/tde-cmake}/debian/rules | 0 .../cmake => dependencies/tde-cmake}/debian/source/format | 0 .../cmake => dependencies/tde-cmake}/debian/source/options | 0 33 files changed, 33 insertions(+), 6 deletions(-) rename debian/_base/{common/cmake => dependencies/tde-cmake}/debian/cdbs/cmake-versions.pl (100%) rename debian/_base/{common/cmake => dependencies/tde-cmake}/debian/cdbs/debian-tde.mk (100%) rename debian/_base/{common/cmake => dependencies/tde-cmake}/debian/cdbs/versions.pl (100%) rename {ubuntu/_base/common/cmake => debian/_base/dependencies/tde-cmake}/debian/changelog (50%) rename debian/_base/{common/cmake => dependencies/tde-cmake}/debian/compat (100%) rename {dilos/common/cmake => debian/_base/dependencies/tde-cmake}/debian/control (81%) rename debian/_base/{common/cmake => dependencies/tde-cmake}/debian/copyright (100%) rename debian/_base/{common/cmake => dependencies/tde-cmake}/debian/patches/series (100%) rename debian/_base/{common/cmake => dependencies/tde-cmake}/debian/rules (100%) rename debian/_base/{common/cmake => dependencies/tde-cmake}/debian/source/format (100%) rename debian/_base/{common/cmake => dependencies/tde-cmake}/debian/source/options (100%) rename dilos/{common/cmake => dependencies/tde-cmake}/debian/cdbs/cmake-versions.pl (100%) rename dilos/{common/cmake => dependencies/tde-cmake}/debian/cdbs/debian-tde.mk (100%) rename dilos/{common/cmake => dependencies/tde-cmake}/debian/cdbs/versions.pl (100%) rename dilos/{common/cmake => dependencies/tde-cmake}/debian/changelog (50%) rename dilos/{common/cmake => dependencies/tde-cmake}/debian/compat (100%) rename {debian/_base/common/cmake => dilos/dependencies/tde-cmake}/debian/control (81%) rename dilos/{common/cmake => dependencies/tde-cmake}/debian/copyright (100%) rename dilos/{common/cmake => dependencies/tde-cmake}/debian/patches/series (100%) rename dilos/{common/cmake => dependencies/tde-cmake}/debian/rules (100%) rename dilos/{common/cmake => dependencies/tde-cmake}/debian/source/format (100%) rename dilos/{common/cmake => dependencies/tde-cmake}/debian/source/options (100%) rename ubuntu/_base/{common/cmake => dependencies/tde-cmake}/debian/cdbs/cmake-versions.pl (100%) rename ubuntu/_base/{common/cmake => dependencies/tde-cmake}/debian/cdbs/debian-tde.mk (100%) rename ubuntu/_base/{common/cmake => dependencies/tde-cmake}/debian/cdbs/versions.pl (100%) rename {debian/_base/common/cmake => ubuntu/_base/dependencies/tde-cmake}/debian/changelog (50%) rename ubuntu/_base/{common/cmake => dependencies/tde-cmake}/debian/compat (100%) rename ubuntu/_base/{common/cmake => dependencies/tde-cmake}/debian/control (81%) rename ubuntu/_base/{common/cmake => dependencies/tde-cmake}/debian/copyright (100%) rename ubuntu/_base/{common/cmake => dependencies/tde-cmake}/debian/patches/series (100%) rename ubuntu/_base/{common/cmake => dependencies/tde-cmake}/debian/rules (100%) rename ubuntu/_base/{common/cmake => dependencies/tde-cmake}/debian/source/format (100%) rename ubuntu/_base/{common/cmake => dependencies/tde-cmake}/debian/source/options (100%) diff --git a/debian/_base/common/cmake/debian/cdbs/cmake-versions.pl b/debian/_base/dependencies/tde-cmake/debian/cdbs/cmake-versions.pl similarity index 100% rename from debian/_base/common/cmake/debian/cdbs/cmake-versions.pl rename to debian/_base/dependencies/tde-cmake/debian/cdbs/cmake-versions.pl diff --git a/debian/_base/common/cmake/debian/cdbs/debian-tde.mk b/debian/_base/dependencies/tde-cmake/debian/cdbs/debian-tde.mk similarity index 100% rename from debian/_base/common/cmake/debian/cdbs/debian-tde.mk rename to debian/_base/dependencies/tde-cmake/debian/cdbs/debian-tde.mk diff --git a/debian/_base/common/cmake/debian/cdbs/versions.pl b/debian/_base/dependencies/tde-cmake/debian/cdbs/versions.pl similarity index 100% rename from debian/_base/common/cmake/debian/cdbs/versions.pl rename to debian/_base/dependencies/tde-cmake/debian/cdbs/versions.pl diff --git a/ubuntu/_base/common/cmake/debian/changelog b/debian/_base/dependencies/tde-cmake/debian/changelog similarity index 50% rename from ubuntu/_base/common/cmake/debian/changelog rename to debian/_base/dependencies/tde-cmake/debian/changelog index a5303f852..368e8ed98 100644 --- a/ubuntu/_base/common/cmake/debian/changelog +++ b/debian/_base/dependencies/tde-cmake/debian/changelog @@ -1,3 +1,9 @@ +tde-cmake (4:14.1.0~pre-0debian10.0.0+0) buster; urgency=low + + * Move from common submodule to dependencies. + + -- Slávek Banko Fri, 13 Jan 2023 15:36:28 +0100 + cmake-trinity (4:14.1.0~pre-0debian10.0.0+0) buster; urgency=low * Initial release as a standalone package. diff --git a/debian/_base/common/cmake/debian/compat b/debian/_base/dependencies/tde-cmake/debian/compat similarity index 100% rename from debian/_base/common/cmake/debian/compat rename to debian/_base/dependencies/tde-cmake/debian/compat diff --git a/dilos/common/cmake/debian/control b/debian/_base/dependencies/tde-cmake/debian/control similarity index 81% rename from dilos/common/cmake/debian/control rename to debian/_base/dependencies/tde-cmake/debian/control index 50ea830ef..81aef4b41 100644 --- a/dilos/common/cmake/debian/control +++ b/debian/_base/dependencies/tde-cmake/debian/control @@ -1,13 +1,16 @@ -Source: cmake-trinity +Source: tde-cmake Section: tde Priority: optional Maintainer: TDE Debian Team Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake (>= 3.1~) Standards-Version: 3.8.4 -Package: cmake-trinity +Package: tde-cmake Architecture: all Depends: cmake (>= ${CMake-Version2}~), cmake (<< ${CMake-Next-Version2}~), perl-base, libxml-parser-perl +Replaces: cmake-trinity (<< 4:14.1.0~) +Breaks: cmake-trinity (<< 4:14.1.0~) +Provides: cmake-trinity Description: TDE CMake modules TDE uses its own set of modules and macros to simplify CMake rules. . diff --git a/debian/_base/common/cmake/debian/copyright b/debian/_base/dependencies/tde-cmake/debian/copyright similarity index 100% rename from debian/_base/common/cmake/debian/copyright rename to debian/_base/dependencies/tde-cmake/debian/copyright diff --git a/debian/_base/common/cmake/debian/patches/series b/debian/_base/dependencies/tde-cmake/debian/patches/series similarity index 100% rename from debian/_base/common/cmake/debian/patches/series rename to debian/_base/dependencies/tde-cmake/debian/patches/series diff --git a/debian/_base/common/cmake/debian/rules b/debian/_base/dependencies/tde-cmake/debian/rules similarity index 100% rename from debian/_base/common/cmake/debian/rules rename to debian/_base/dependencies/tde-cmake/debian/rules diff --git a/debian/_base/common/cmake/debian/source/format b/debian/_base/dependencies/tde-cmake/debian/source/format similarity index 100% rename from debian/_base/common/cmake/debian/source/format rename to debian/_base/dependencies/tde-cmake/debian/source/format diff --git a/debian/_base/common/cmake/debian/source/options b/debian/_base/dependencies/tde-cmake/debian/source/options similarity index 100% rename from debian/_base/common/cmake/debian/source/options rename to debian/_base/dependencies/tde-cmake/debian/source/options diff --git a/dilos/common/cmake/debian/cdbs/cmake-versions.pl b/dilos/dependencies/tde-cmake/debian/cdbs/cmake-versions.pl similarity index 100% rename from dilos/common/cmake/debian/cdbs/cmake-versions.pl rename to dilos/dependencies/tde-cmake/debian/cdbs/cmake-versions.pl diff --git a/dilos/common/cmake/debian/cdbs/debian-tde.mk b/dilos/dependencies/tde-cmake/debian/cdbs/debian-tde.mk similarity index 100% rename from dilos/common/cmake/debian/cdbs/debian-tde.mk rename to dilos/dependencies/tde-cmake/debian/cdbs/debian-tde.mk diff --git a/dilos/common/cmake/debian/cdbs/versions.pl b/dilos/dependencies/tde-cmake/debian/cdbs/versions.pl similarity index 100% rename from dilos/common/cmake/debian/cdbs/versions.pl rename to dilos/dependencies/tde-cmake/debian/cdbs/versions.pl diff --git a/dilos/common/cmake/debian/changelog b/dilos/dependencies/tde-cmake/debian/changelog similarity index 50% rename from dilos/common/cmake/debian/changelog rename to dilos/dependencies/tde-cmake/debian/changelog index a5303f852..368e8ed98 100644 --- a/dilos/common/cmake/debian/changelog +++ b/dilos/dependencies/tde-cmake/debian/changelog @@ -1,3 +1,9 @@ +tde-cmake (4:14.1.0~pre-0debian10.0.0+0) buster; urgency=low + + * Move from common submodule to dependencies. + + -- Slávek Banko Fri, 13 Jan 2023 15:36:28 +0100 + cmake-trinity (4:14.1.0~pre-0debian10.0.0+0) buster; urgency=low * Initial release as a standalone package. diff --git a/dilos/common/cmake/debian/compat b/dilos/dependencies/tde-cmake/debian/compat similarity index 100% rename from dilos/common/cmake/debian/compat rename to dilos/dependencies/tde-cmake/debian/compat diff --git a/debian/_base/common/cmake/debian/control b/dilos/dependencies/tde-cmake/debian/control similarity index 81% rename from debian/_base/common/cmake/debian/control rename to dilos/dependencies/tde-cmake/debian/control index 50ea830ef..81aef4b41 100644 --- a/debian/_base/common/cmake/debian/control +++ b/dilos/dependencies/tde-cmake/debian/control @@ -1,13 +1,16 @@ -Source: cmake-trinity +Source: tde-cmake Section: tde Priority: optional Maintainer: TDE Debian Team Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake (>= 3.1~) Standards-Version: 3.8.4 -Package: cmake-trinity +Package: tde-cmake Architecture: all Depends: cmake (>= ${CMake-Version2}~), cmake (<< ${CMake-Next-Version2}~), perl-base, libxml-parser-perl +Replaces: cmake-trinity (<< 4:14.1.0~) +Breaks: cmake-trinity (<< 4:14.1.0~) +Provides: cmake-trinity Description: TDE CMake modules TDE uses its own set of modules and macros to simplify CMake rules. . diff --git a/dilos/common/cmake/debian/copyright b/dilos/dependencies/tde-cmake/debian/copyright similarity index 100% rename from dilos/common/cmake/debian/copyright rename to dilos/dependencies/tde-cmake/debian/copyright diff --git a/dilos/common/cmake/debian/patches/series b/dilos/dependencies/tde-cmake/debian/patches/series similarity index 100% rename from dilos/common/cmake/debian/patches/series rename to dilos/dependencies/tde-cmake/debian/patches/series diff --git a/dilos/common/cmake/debian/rules b/dilos/dependencies/tde-cmake/debian/rules similarity index 100% rename from dilos/common/cmake/debian/rules rename to dilos/dependencies/tde-cmake/debian/rules diff --git a/dilos/common/cmake/debian/source/format b/dilos/dependencies/tde-cmake/debian/source/format similarity index 100% rename from dilos/common/cmake/debian/source/format rename to dilos/dependencies/tde-cmake/debian/source/format diff --git a/dilos/common/cmake/debian/source/options b/dilos/dependencies/tde-cmake/debian/source/options similarity index 100% rename from dilos/common/cmake/debian/source/options rename to dilos/dependencies/tde-cmake/debian/source/options diff --git a/ubuntu/_base/common/cmake/debian/cdbs/cmake-versions.pl b/ubuntu/_base/dependencies/tde-cmake/debian/cdbs/cmake-versions.pl similarity index 100% rename from ubuntu/_base/common/cmake/debian/cdbs/cmake-versions.pl rename to ubuntu/_base/dependencies/tde-cmake/debian/cdbs/cmake-versions.pl diff --git a/ubuntu/_base/common/cmake/debian/cdbs/debian-tde.mk b/ubuntu/_base/dependencies/tde-cmake/debian/cdbs/debian-tde.mk similarity index 100% rename from ubuntu/_base/common/cmake/debian/cdbs/debian-tde.mk rename to ubuntu/_base/dependencies/tde-cmake/debian/cdbs/debian-tde.mk diff --git a/ubuntu/_base/common/cmake/debian/cdbs/versions.pl b/ubuntu/_base/dependencies/tde-cmake/debian/cdbs/versions.pl similarity index 100% rename from ubuntu/_base/common/cmake/debian/cdbs/versions.pl rename to ubuntu/_base/dependencies/tde-cmake/debian/cdbs/versions.pl diff --git a/debian/_base/common/cmake/debian/changelog b/ubuntu/_base/dependencies/tde-cmake/debian/changelog similarity index 50% rename from debian/_base/common/cmake/debian/changelog rename to ubuntu/_base/dependencies/tde-cmake/debian/changelog index a5303f852..368e8ed98 100644 --- a/debian/_base/common/cmake/debian/changelog +++ b/ubuntu/_base/dependencies/tde-cmake/debian/changelog @@ -1,3 +1,9 @@ +tde-cmake (4:14.1.0~pre-0debian10.0.0+0) buster; urgency=low + + * Move from common submodule to dependencies. + + -- Slávek Banko Fri, 13 Jan 2023 15:36:28 +0100 + cmake-trinity (4:14.1.0~pre-0debian10.0.0+0) buster; urgency=low * Initial release as a standalone package. diff --git a/ubuntu/_base/common/cmake/debian/compat b/ubuntu/_base/dependencies/tde-cmake/debian/compat similarity index 100% rename from ubuntu/_base/common/cmake/debian/compat rename to ubuntu/_base/dependencies/tde-cmake/debian/compat diff --git a/ubuntu/_base/common/cmake/debian/control b/ubuntu/_base/dependencies/tde-cmake/debian/control similarity index 81% rename from ubuntu/_base/common/cmake/debian/control rename to ubuntu/_base/dependencies/tde-cmake/debian/control index 50ea830ef..81aef4b41 100644 --- a/ubuntu/_base/common/cmake/debian/control +++ b/ubuntu/_base/dependencies/tde-cmake/debian/control @@ -1,13 +1,16 @@ -Source: cmake-trinity +Source: tde-cmake Section: tde Priority: optional Maintainer: TDE Debian Team Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake (>= 3.1~) Standards-Version: 3.8.4 -Package: cmake-trinity +Package: tde-cmake Architecture: all Depends: cmake (>= ${CMake-Version2}~), cmake (<< ${CMake-Next-Version2}~), perl-base, libxml-parser-perl +Replaces: cmake-trinity (<< 4:14.1.0~) +Breaks: cmake-trinity (<< 4:14.1.0~) +Provides: cmake-trinity Description: TDE CMake modules TDE uses its own set of modules and macros to simplify CMake rules. . diff --git a/ubuntu/_base/common/cmake/debian/copyright b/ubuntu/_base/dependencies/tde-cmake/debian/copyright similarity index 100% rename from ubuntu/_base/common/cmake/debian/copyright rename to ubuntu/_base/dependencies/tde-cmake/debian/copyright diff --git a/ubuntu/_base/common/cmake/debian/patches/series b/ubuntu/_base/dependencies/tde-cmake/debian/patches/series similarity index 100% rename from ubuntu/_base/common/cmake/debian/patches/series rename to ubuntu/_base/dependencies/tde-cmake/debian/patches/series diff --git a/ubuntu/_base/common/cmake/debian/rules b/ubuntu/_base/dependencies/tde-cmake/debian/rules similarity index 100% rename from ubuntu/_base/common/cmake/debian/rules rename to ubuntu/_base/dependencies/tde-cmake/debian/rules diff --git a/ubuntu/_base/common/cmake/debian/source/format b/ubuntu/_base/dependencies/tde-cmake/debian/source/format similarity index 100% rename from ubuntu/_base/common/cmake/debian/source/format rename to ubuntu/_base/dependencies/tde-cmake/debian/source/format diff --git a/ubuntu/_base/common/cmake/debian/source/options b/ubuntu/_base/dependencies/tde-cmake/debian/source/options similarity index 100% rename from ubuntu/_base/common/cmake/debian/source/options rename to ubuntu/_base/dependencies/tde-cmake/debian/source/options