Update kdebase-kio-plugins version in Conflicts for tdelibs-data on Debian and Ubuntu
to allow smooth upgrade by apt-get
This resolves Bug 2245

Signed-off-by: Slávek Banko <slavek.banko@...>

diff --git a/debian/lenny/tdelibs/debian/control b/debian/lenny/tdelibs/debian/control
index e5a3ec6..68394e0 100644
--- a/debian/lenny/tdelibs/debian/control
+++ b/debian/lenny/tdelibs/debian/control
@@ -43,7 +43,7 @@
 Architecture: all
 Replaces: kdelibs-data-trinity (<< 4:14.0.0~)
 Breaks: kdelibs-data-trinity (<< 4:14.0.0~)
-Conflicts: kdebase-kio-plugins-trinity (<= 4:3.5.13.2)
+Conflicts: kdebase-kio-plugins-trinity (<= 4:14.0.0~)
 Depends: hicolor-icon-theme
 Provides: tdelibs-data
 Description: core shared data for all TDE applications
diff --git a/debian/squeeze/tdelibs/debian/control b/debian/squeeze/tdelibs/debian/control
index e5a3ec6..68394e0 100644
--- a/debian/squeeze/tdelibs/debian/control
+++ b/debian/squeeze/tdelibs/debian/control
@@ -43,7 +43,7 @@
 Architecture: all
 Replaces: kdelibs-data-trinity (<< 4:14.0.0~)
 Breaks: kdelibs-data-trinity (<< 4:14.0.0~)
-Conflicts: kdebase-kio-plugins-trinity (<= 4:3.5.13.2)
+Conflicts: kdebase-kio-plugins-trinity (<= 4:14.0.0~)
 Depends: hicolor-icon-theme
 Provides: tdelibs-data
 Description: core shared data for all TDE applications
diff --git a/ubuntu/maverick/tdelibs/debian/control b/ubuntu/maverick/tdelibs/debian/control
index 85867e6..9289c4e 100644
--- a/ubuntu/maverick/tdelibs/debian/control
+++ b/ubuntu/maverick/tdelibs/debian/control
@@ -44,7 +44,7 @@
 Architecture: all
 Replaces: kdelibs-data-kde3 (<< 4:14.0.0~), kdelibs-data-trinity (<< 4:14.0.0~)
 Breaks: kdelibs-data-kde3 (<< 4:14.0.0~), kdelibs-data-trinity (<< 4:14.0.0~)
-Conflicts: tdelibs-data, kdebase-kio-plugins-kde3 (<= 4:3.5.13.2), kdebase-kio-plugins-trinity (<= 4:3.5.13.2)
+Conflicts: tdelibs-data, kdebase-kio-plugins-kde3 (<= 4:14.0.0~), kdebase-kio-plugins-trinity (<= 4:14.0.0~)
 Depends: hicolor-icon-theme
 Provides: tdelibs-data
 Description: core shared data for all TDE applications

Fix cirucular dependency in tdepim on Debian and Ubuntu
This resolves Bug 2251

Signed-off-by: Slávek Banko <slavek.banko@...>

diff --git a/debian/lenny/tdepim/debian/control b/debian/lenny/tdepim/debian/control
index c6bd10d..491be13 100644
--- a/debian/lenny/tdepim/debian/control
+++ b/debian/lenny/tdepim/debian/control
@@ -501,7 +501,7 @@
 Replaces: libkdepim1-trinity-dev (<< 4:14.0.0~), libkcal2-trinity-dev
 Breaks: libkdepim1-trinity-dev (<< 4:14.0.0~)
 Conflicts: libkcal2-trinity-dev
-Depends: libtdepim1a-trinity (= ${Source-Version}), libktnef1-trinity-dev (= ${Source-Version}), tdelibs14-trinity-dev
+Depends: libtdepim1a-trinity (= ${Source-Version}), tdelibs14-trinity-dev
 Description: Trinity PIM library [development]
  This is the development package which contains the headers for the libtdepim-trinity
  library and libkcal-trinity library.
diff --git a/debian/squeeze/tdepim/debian/control b/debian/squeeze/tdepim/debian/control
index c6bd10d..491be13 100644
--- a/debian/squeeze/tdepim/debian/control
+++ b/debian/squeeze/tdepim/debian/control
@@ -501,7 +501,7 @@
 Replaces: libkdepim1-trinity-dev (<< 4:14.0.0~), libkcal2-trinity-dev
 Breaks: libkdepim1-trinity-dev (<< 4:14.0.0~)
 Conflicts: libkcal2-trinity-dev
-Depends: libtdepim1a-trinity (= ${Source-Version}), libktnef1-trinity-dev (= ${Source-Version}), tdelibs14-trinity-dev
+Depends: libtdepim1a-trinity (= ${Source-Version}), tdelibs14-trinity-dev
 Description: Trinity PIM library [development]
  This is the development package which contains the headers for the libtdepim-trinity
  library and libkcal-trinity library.
diff --git a/ubuntu/maverick/tdepim/debian/control b/ubuntu/maverick/tdepim/debian/control
index 1cd17ad..5d6a915 100644
--- a/ubuntu/maverick/tdepim/debian/control
+++ b/ubuntu/maverick/tdepim/debian/control
@@ -500,7 +500,7 @@
 Replaces: libkdepim1-kde3-dev (<< 4:14.0.0~), libkdepim1-trinity-dev (<< 4:14.0.0~), libkcal2-kde3-dev, libkcal2-trinity-dev
 Breaks: libkdepim1-kde3-dev (<< 4:14.0.0~), libkdepim1-trinity-dev (<< 4:14.0.0~)
 Conflicts: libkcal2-kde3-dev, libkcal2-trinity-dev
-Depends: libtdepim1a-trinity (= ${Source-Version}), libktnef1-trinity-dev (= ${Source-Version}), tdelibs14-trinity-dev
+Depends: libtdepim1a-trinity (= ${Source-Version}), tdelibs14-trinity-dev
 Description: Trinity PIM library [development]
  This is the development package which contains the headers for the libtdepim-trinity
  library and libkcal-trinity library.

Add Ubuntu Vivid symlink

Signed-off-by: Slávek Banko <slavek.banko@...>

diff --git a/ubuntu/vivid b/ubuntu/vivid
new file mode 120000
index 0000000..5cb6e60
--- /dev/null
+++ b/ubuntu/vivid
@@ -0,0 +1 @@
+maverick
\ No newline at end of file

Add Raspbian Wheezy symlink

Signed-off-by: Slávek Banko <slavek.banko@...>

diff --git a/raspbian/raspbian-wheezy b/raspbian/raspbian-wheezy
new file mode 120000
index 0000000..2d806c6
--- /dev/null
+++ b/raspbian/raspbian-wheezy
@@ -0,0 +1 @@
+../debian/wheezy
\ No newline at end of file