summaryrefslogtreecommitdiffstats
path: root/ubuntu/_base
diff options
context:
space:
mode:
Diffstat (limited to 'ubuntu/_base')
-rw-r--r--ubuntu/_base/dependencies/tde-cmake/debian/cdbs/cmake-versions.pl (renamed from ubuntu/_base/common/cmake/debian/cdbs/cmake-versions.pl)0
-rw-r--r--ubuntu/_base/dependencies/tde-cmake/debian/cdbs/debian-tde.mk (renamed from ubuntu/_base/common/cmake/debian/cdbs/debian-tde.mk)0
-rw-r--r--ubuntu/_base/dependencies/tde-cmake/debian/cdbs/versions.pl (renamed from ubuntu/_base/common/cmake/debian/cdbs/versions.pl)0
-rw-r--r--ubuntu/_base/dependencies/tde-cmake/debian/changelog (renamed from ubuntu/_base/common/cmake/debian/changelog)6
-rw-r--r--ubuntu/_base/dependencies/tde-cmake/debian/compat (renamed from ubuntu/_base/common/cmake/debian/compat)0
-rw-r--r--ubuntu/_base/dependencies/tde-cmake/debian/control (renamed from ubuntu/_base/common/cmake/debian/control)7
-rw-r--r--ubuntu/_base/dependencies/tde-cmake/debian/copyright (renamed from ubuntu/_base/common/cmake/debian/copyright)0
-rw-r--r--ubuntu/_base/dependencies/tde-cmake/debian/patches/series (renamed from ubuntu/_base/common/cmake/debian/patches/series)0
-rwxr-xr-xubuntu/_base/dependencies/tde-cmake/debian/rules (renamed from ubuntu/_base/common/cmake/debian/rules)0
-rw-r--r--ubuntu/_base/dependencies/tde-cmake/debian/source/format (renamed from ubuntu/_base/common/cmake/debian/source/format)0
-rw-r--r--ubuntu/_base/dependencies/tde-cmake/debian/source/options (renamed from ubuntu/_base/common/cmake/debian/source/options)0
11 files changed, 11 insertions, 2 deletions
diff --git a/ubuntu/_base/common/cmake/debian/cdbs/cmake-versions.pl b/ubuntu/_base/dependencies/tde-cmake/debian/cdbs/cmake-versions.pl
index 6bbbec325..6bbbec325 100644
--- a/ubuntu/_base/common/cmake/debian/cdbs/cmake-versions.pl
+++ b/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
index f36e3527c..f36e3527c 100644
--- a/ubuntu/_base/common/cmake/debian/cdbs/debian-tde.mk
+++ b/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
index 1b110f7af..1b110f7af 100644
--- a/ubuntu/_base/common/cmake/debian/cdbs/versions.pl
+++ b/ubuntu/_base/dependencies/tde-cmake/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/common/cmake/debian/changelog b/ubuntu/_base/dependencies/tde-cmake/debian/changelog
index a5303f852..368e8ed98 100644
--- a/ubuntu/_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 <slavek.banko@axis.cz> 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
index ec635144f..ec635144f 100644
--- a/ubuntu/_base/common/cmake/debian/compat
+++ b/ubuntu/_base/dependencies/tde-cmake/debian/compat
diff --git a/ubuntu/_base/common/cmake/debian/control b/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 <team-debian@trinitydesktop.org>
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
index 82d825030..82d825030 100644
--- a/ubuntu/_base/common/cmake/debian/copyright
+++ b/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
index e69de29bb..e69de29bb 100644
--- a/ubuntu/_base/common/cmake/debian/patches/series
+++ b/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
index 95a42b3f7..95a42b3f7 100755
--- a/ubuntu/_base/common/cmake/debian/rules
+++ b/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
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/_base/common/cmake/debian/source/format
+++ b/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
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/_base/common/cmake/debian/source/options
+++ b/ubuntu/_base/dependencies/tde-cmake/debian/source/options