diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2018-11-17 15:40:37 +0100 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2018-11-17 15:42:22 +0100 |
| commit | 8326890c2f94ef3cb4c83d45d37f618314bf319e (patch) | |
| tree | 5b99deba71678221dace6a4df41351057ef27720 /debian | |
| parent | 6e544d2af3d7ca9b4351dedd571b6b486ba23634 (diff) | |
| download | tde-packaging-8326890c2f94ef3cb4c83d45d37f618314bf319e.tar.gz tde-packaging-8326890c2f94ef3cb4c83d45d37f618314bf319e.zip | |
DEB tdebase: Add kdf-trinity (<< 4:14.0.6~) to Conflicts
for tdebase-data-trinity to ensure smooth upgrade.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 16f63a6530be7a18fc452f1aeec2a21310bf0a22)
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/lenny/tdebase/debian/control | 2 | ||||
| -rw-r--r-- | debian/squeeze/tdebase/debian/control | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/debian/lenny/tdebase/debian/control b/debian/lenny/tdebase/debian/control index 7e41dd7f0..7e7e953f0 100644 --- a/debian/lenny/tdebase/debian/control +++ b/debian/lenny/tdebase/debian/control @@ -126,7 +126,7 @@ Section: tde Architecture: all Replaces: kdebase-data-trinity (<< 4:14.0.0~) Breaks: kdebase-data-trinity (<< 4:14.0.0~) -Conflicts: kcontrol-trinity (<< 4:3.4.2-1), twin-trinity (<< 4:3.4.2-1), kicker-trinity (<< 4:3.4.2-1) +Conflicts: kcontrol-trinity (<< 4:3.4.2-1), twin-trinity (<< 4:3.4.2-1), kicker-trinity (<< 4:3.4.2-1), kdf-trinity (<< 4:14.0.6~) Description: shared data files for the TDE base module This package contains the architecture-independent shared data files needed for a basic Trinity desktop installation. diff --git a/debian/squeeze/tdebase/debian/control b/debian/squeeze/tdebase/debian/control index 62cee4bf6..b401d4b1a 100644 --- a/debian/squeeze/tdebase/debian/control +++ b/debian/squeeze/tdebase/debian/control @@ -126,7 +126,7 @@ Section: tde Architecture: all Replaces: kdebase-data-trinity (<< 4:14.0.0~) Breaks: kdebase-data-trinity (<< 4:14.0.0~) -Conflicts: kcontrol-trinity (<< 4:3.4.2-1), twin-trinity (<< 4:3.4.2-1), kicker-trinity (<< 4:3.4.2-1) +Conflicts: kcontrol-trinity (<< 4:3.4.2-1), twin-trinity (<< 4:3.4.2-1), kicker-trinity (<< 4:3.4.2-1), kdf-trinity (<< 4:14.0.6~) Description: shared data files for the TDE base module This package contains the architecture-independent shared data files needed for a basic Trinity desktop installation. |