From 6e70fa33ca99b1020f68a09481317b854e31de66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= <slavek.banko@axis.cz>
Date: Sun, 21 Apr 2013 19:42:09 +0200
Subject: Cutting off the fourth number, or preliminary version number in
 counting versions for dependencies on Debian and Ubuntu

---
 debian/wheezy/applications/abakus/debian/cdbs/versions.pl               | 2 +-
 debian/wheezy/applications/adept/debian/cdbs/versions.pl                | 2 +-
 debian/wheezy/applications/amarok.cmake/debian/cdbs/versions.pl         | 2 +-
 debian/wheezy/applications/amarok/debian/cdbs/versions.pl               | 2 +-
 debian/wheezy/applications/bibletime/debian/cdbs/versions.pl            | 2 +-
 .../applications/compizconfig-backend-tdeconfig/debian/cdbs/versions.pl | 2 +-
 debian/wheezy/applications/digikam/debian/cdbs/versions.pl              | 2 +-
 debian/wheezy/applications/dolphin/debian/cdbs/versions.pl              | 2 +-
 debian/wheezy/applications/filelight-l10n/debian/cdbs/versions.pl       | 2 +-
 debian/wheezy/applications/filelight/debian/cdbs/versions.pl            | 2 +-
 debian/wheezy/applications/gtk-qt-engine/debian/cdbs/versions.pl        | 2 +-
 debian/wheezy/applications/gwenview-i18n/debian/cdbs/versions.pl        | 2 +-
 debian/wheezy/applications/gwenview/debian/cdbs/versions.pl             | 2 +-
 debian/wheezy/applications/k3b/debian/cdbs/versions.pl                  | 2 +-
 debian/wheezy/applications/k9copy/debian/cdbs/versions.pl               | 2 +-
 debian/wheezy/applications/kaffeine/debian/cdbs/versions.pl             | 2 +-
 debian/wheezy/applications/katapult/debian/cdbs/versions.pl             | 2 +-
 debian/wheezy/applications/kbarcode/debian/cdbs/versions.pl             | 2 +-
 debian/wheezy/applications/kbookreader/debian/cdbs/versions.pl          | 2 +-
 debian/wheezy/applications/kcpuload/debian/cdbs/versions.pl             | 2 +-
 debian/wheezy/applications/kdbusnotification/debian/cdbs/versions.pl    | 2 +-
 debian/wheezy/applications/kdiff3/debian/cdbs/versions.pl               | 2 +-
 debian/wheezy/applications/kdirstat/debian/cdbs/versions.pl             | 2 +-
 debian/wheezy/applications/keep/debian/cdbs/versions.pl                 | 2 +-
 debian/wheezy/applications/kerry/debian/cdbs/versions.pl                | 2 +-
 debian/wheezy/applications/kgtk-qt3/debian/cdbs/versions.pl             | 2 +-
 debian/wheezy/applications/kile/debian/cdbs/versions.pl                 | 2 +-
 debian/wheezy/applications/kiosktool/debian/cdbs/versions.pl            | 2 +-
 debian/wheezy/applications/kmplayer/debian/cdbs/versions.pl             | 2 +-
 debian/wheezy/applications/kmymoney/debian/cdbs/versions.pl             | 2 +-
 debian/wheezy/applications/knemo/debian/cdbs/versions.pl                | 2 +-
 debian/wheezy/applications/knetstats/debian/cdbs/versions.pl            | 2 +-
 .../wheezy/applications/knetworkmanager.cmake/debian/cdbs/versions.pl   | 2 +-
 debian/wheezy/applications/knetworkmanager8/debian/cdbs/versions.pl     | 2 +-
 debian/wheezy/applications/knetworkmanager9/debian/cdbs/versions.pl     | 2 +-
 debian/wheezy/applications/koffice/debian/cdbs/versions.pl              | 2 +-
 debian/wheezy/applications/konversation/debian/cdbs/versions.pl         | 2 +-
 debian/wheezy/applications/kopete-otr/debian/cdbs/versions.pl           | 2 +-
 debian/wheezy/applications/kpilot/debian/cdbs/versions.pl               | 2 +-
 debian/wheezy/applications/kpowersave-nohal/debian/cdbs/versions.pl     | 2 +-
 debian/wheezy/applications/kpowersave.cmake/debian/cdbs/versions.pl     | 2 +-
 debian/wheezy/applications/kpowersave/debian/cdbs/versions.pl           | 2 +-
 debian/wheezy/applications/krename/debian/cdbs/versions.pl              | 2 +-
 debian/wheezy/applications/krusader/debian/cdbs/versions.pl             | 2 +-
 debian/wheezy/applications/ksystemlog/debian/cdbs/versions.pl           | 2 +-
 debian/wheezy/applications/ktorrent/debian/cdbs/versions.pl             | 2 +-
 debian/wheezy/applications/kuickshow/debian/cdbs/versions.pl            | 2 +-
 debian/wheezy/applications/kvkbd/debian/cdbs/versions.pl                | 2 +-
 debian/wheezy/applications/rosegarden/debian/cdbs/versions.pl           | 2 +-
 debian/wheezy/applications/smb4k/debian/cdbs/versions.pl                | 2 +-
 debian/wheezy/applications/soundkonverter/debian/cdbs/versions.pl       | 2 +-
 debian/wheezy/applications/tde-style-qtcurve/debian/cdbs/versions.pl    | 2 +-
 debian/wheezy/applications/tde-systemsettings/debian/cdbs/versions.pl   | 2 +-
 debian/wheezy/applications/tdeio-apt/debian/cdbs/versions.pl            | 2 +-
 debian/wheezy/applications/tdeio-locate/debian/cdbs/versions.pl         | 2 +-
 debian/wheezy/applications/tdeio-umountwrapper/debian/cdbs/versions.pl  | 2 +-
 debian/wheezy/applications/tdesudo/debian/cdbs/versions.pl              | 2 +-
 debian/wheezy/applications/tdesvn/debian/cdbs/versions.pl               | 2 +-
 debian/wheezy/applications/tdmtheme/debian/cdbs/versions.pl             | 2 +-
 debian/wheezy/applications/twin-style-crystal/debian/cdbs/versions.pl   | 2 +-
 debian/wheezy/applications/wlassistant/debian/cdbs/versions.pl          | 2 +-
 debian/wheezy/applications/yakuake/debian/cdbs/versions.pl              | 2 +-
 62 files changed, 62 insertions(+), 62 deletions(-)

(limited to 'debian/wheezy/applications')

diff --git a/debian/wheezy/applications/abakus/debian/cdbs/versions.pl b/debian/wheezy/applications/abakus/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/wheezy/applications/abakus/debian/cdbs/versions.pl
+++ b/debian/wheezy/applications/abakus/debian/cdbs/versions.pl
@@ -7,7 +7,7 @@ my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
 my ($version3, $version3_next);
 my ($version2, $version2_next);
 
-($version3 = $version)  =~ s/-[^-]+$//;
+($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
 ($version2 = $version3) =~ s/\.[^.]+$//;
 
 ($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
diff --git a/debian/wheezy/applications/adept/debian/cdbs/versions.pl b/debian/wheezy/applications/adept/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/wheezy/applications/adept/debian/cdbs/versions.pl
+++ b/debian/wheezy/applications/adept/debian/cdbs/versions.pl
@@ -7,7 +7,7 @@ my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
 my ($version3, $version3_next);
 my ($version2, $version2_next);
 
-($version3 = $version)  =~ s/-[^-]+$//;
+($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
 ($version2 = $version3) =~ s/\.[^.]+$//;
 
 ($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
diff --git a/debian/wheezy/applications/amarok.cmake/debian/cdbs/versions.pl b/debian/wheezy/applications/amarok.cmake/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/wheezy/applications/amarok.cmake/debian/cdbs/versions.pl
+++ b/debian/wheezy/applications/amarok.cmake/debian/cdbs/versions.pl
@@ -7,7 +7,7 @@ my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
 my ($version3, $version3_next);
 my ($version2, $version2_next);
 
-($version3 = $version)  =~ s/-[^-]+$//;
+($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
 ($version2 = $version3) =~ s/\.[^.]+$//;
 
 ($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
diff --git a/debian/wheezy/applications/amarok/debian/cdbs/versions.pl b/debian/wheezy/applications/amarok/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/wheezy/applications/amarok/debian/cdbs/versions.pl
+++ b/debian/wheezy/applications/amarok/debian/cdbs/versions.pl
@@ -7,7 +7,7 @@ my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
 my ($version3, $version3_next);
 my ($version2, $version2_next);
 
-($version3 = $version)  =~ s/-[^-]+$//;
+($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
 ($version2 = $version3) =~ s/\.[^.]+$//;
 
 ($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
diff --git a/debian/wheezy/applications/bibletime/debian/cdbs/versions.pl b/debian/wheezy/applications/bibletime/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/wheezy/applications/bibletime/debian/cdbs/versions.pl
+++ b/debian/wheezy/applications/bibletime/debian/cdbs/versions.pl
@@ -7,7 +7,7 @@ my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
 my ($version3, $version3_next);
 my ($version2, $version2_next);
 
-($version3 = $version)  =~ s/-[^-]+$//;
+($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
 ($version2 = $version3) =~ s/\.[^.]+$//;
 
 ($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
diff --git a/debian/wheezy/applications/compizconfig-backend-tdeconfig/debian/cdbs/versions.pl b/debian/wheezy/applications/compizconfig-backend-tdeconfig/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/wheezy/applications/compizconfig-backend-tdeconfig/debian/cdbs/versions.pl
+++ b/debian/wheezy/applications/compizconfig-backend-tdeconfig/debian/cdbs/versions.pl
@@ -7,7 +7,7 @@ my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
 my ($version3, $version3_next);
 my ($version2, $version2_next);
 
-($version3 = $version)  =~ s/-[^-]+$//;
+($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
 ($version2 = $version3) =~ s/\.[^.]+$//;
 
 ($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
diff --git a/debian/wheezy/applications/digikam/debian/cdbs/versions.pl b/debian/wheezy/applications/digikam/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/wheezy/applications/digikam/debian/cdbs/versions.pl
+++ b/debian/wheezy/applications/digikam/debian/cdbs/versions.pl
@@ -7,7 +7,7 @@ my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
 my ($version3, $version3_next);
 my ($version2, $version2_next);
 
-($version3 = $version)  =~ s/-[^-]+$//;
+($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
 ($version2 = $version3) =~ s/\.[^.]+$//;
 
 ($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
diff --git a/debian/wheezy/applications/dolphin/debian/cdbs/versions.pl b/debian/wheezy/applications/dolphin/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/wheezy/applications/dolphin/debian/cdbs/versions.pl
+++ b/debian/wheezy/applications/dolphin/debian/cdbs/versions.pl
@@ -7,7 +7,7 @@ my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
 my ($version3, $version3_next);
 my ($version2, $version2_next);
 
-($version3 = $version)  =~ s/-[^-]+$//;
+($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
 ($version2 = $version3) =~ s/\.[^.]+$//;
 
 ($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
diff --git a/debian/wheezy/applications/filelight-l10n/debian/cdbs/versions.pl b/debian/wheezy/applications/filelight-l10n/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/wheezy/applications/filelight-l10n/debian/cdbs/versions.pl
+++ b/debian/wheezy/applications/filelight-l10n/debian/cdbs/versions.pl
@@ -7,7 +7,7 @@ my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
 my ($version3, $version3_next);
 my ($version2, $version2_next);
 
-($version3 = $version)  =~ s/-[^-]+$//;
+($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
 ($version2 = $version3) =~ s/\.[^.]+$//;
 
 ($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
diff --git a/debian/wheezy/applications/filelight/debian/cdbs/versions.pl b/debian/wheezy/applications/filelight/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/wheezy/applications/filelight/debian/cdbs/versions.pl
+++ b/debian/wheezy/applications/filelight/debian/cdbs/versions.pl
@@ -7,7 +7,7 @@ my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
 my ($version3, $version3_next);
 my ($version2, $version2_next);
 
-($version3 = $version)  =~ s/-[^-]+$//;
+($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
 ($version2 = $version3) =~ s/\.[^.]+$//;
 
 ($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
diff --git a/debian/wheezy/applications/gtk-qt-engine/debian/cdbs/versions.pl b/debian/wheezy/applications/gtk-qt-engine/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/wheezy/applications/gtk-qt-engine/debian/cdbs/versions.pl
+++ b/debian/wheezy/applications/gtk-qt-engine/debian/cdbs/versions.pl
@@ -7,7 +7,7 @@ my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
 my ($version3, $version3_next);
 my ($version2, $version2_next);
 
-($version3 = $version)  =~ s/-[^-]+$//;
+($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
 ($version2 = $version3) =~ s/\.[^.]+$//;
 
 ($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
diff --git a/debian/wheezy/applications/gwenview-i18n/debian/cdbs/versions.pl b/debian/wheezy/applications/gwenview-i18n/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/wheezy/applications/gwenview-i18n/debian/cdbs/versions.pl
+++ b/debian/wheezy/applications/gwenview-i18n/debian/cdbs/versions.pl
@@ -7,7 +7,7 @@ my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
 my ($version3, $version3_next);
 my ($version2, $version2_next);
 
-($version3 = $version)  =~ s/-[^-]+$//;
+($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
 ($version2 = $version3) =~ s/\.[^.]+$//;
 
 ($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
diff --git a/debian/wheezy/applications/gwenview/debian/cdbs/versions.pl b/debian/wheezy/applications/gwenview/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/wheezy/applications/gwenview/debian/cdbs/versions.pl
+++ b/debian/wheezy/applications/gwenview/debian/cdbs/versions.pl
@@ -7,7 +7,7 @@ my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
 my ($version3, $version3_next);
 my ($version2, $version2_next);
 
-($version3 = $version)  =~ s/-[^-]+$//;
+($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
 ($version2 = $version3) =~ s/\.[^.]+$//;
 
 ($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
diff --git a/debian/wheezy/applications/k3b/debian/cdbs/versions.pl b/debian/wheezy/applications/k3b/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/wheezy/applications/k3b/debian/cdbs/versions.pl
+++ b/debian/wheezy/applications/k3b/debian/cdbs/versions.pl
@@ -7,7 +7,7 @@ my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
 my ($version3, $version3_next);
 my ($version2, $version2_next);
 
-($version3 = $version)  =~ s/-[^-]+$//;
+($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
 ($version2 = $version3) =~ s/\.[^.]+$//;
 
 ($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
diff --git a/debian/wheezy/applications/k9copy/debian/cdbs/versions.pl b/debian/wheezy/applications/k9copy/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/wheezy/applications/k9copy/debian/cdbs/versions.pl
+++ b/debian/wheezy/applications/k9copy/debian/cdbs/versions.pl
@@ -7,7 +7,7 @@ my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
 my ($version3, $version3_next);
 my ($version2, $version2_next);
 
-($version3 = $version)  =~ s/-[^-]+$//;
+($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
 ($version2 = $version3) =~ s/\.[^.]+$//;
 
 ($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
diff --git a/debian/wheezy/applications/kaffeine/debian/cdbs/versions.pl b/debian/wheezy/applications/kaffeine/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/wheezy/applications/kaffeine/debian/cdbs/versions.pl
+++ b/debian/wheezy/applications/kaffeine/debian/cdbs/versions.pl
@@ -7,7 +7,7 @@ my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
 my ($version3, $version3_next);
 my ($version2, $version2_next);
 
-($version3 = $version)  =~ s/-[^-]+$//;
+($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
 ($version2 = $version3) =~ s/\.[^.]+$//;
 
 ($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
diff --git a/debian/wheezy/applications/katapult/debian/cdbs/versions.pl b/debian/wheezy/applications/katapult/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/wheezy/applications/katapult/debian/cdbs/versions.pl
+++ b/debian/wheezy/applications/katapult/debian/cdbs/versions.pl
@@ -7,7 +7,7 @@ my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
 my ($version3, $version3_next);
 my ($version2, $version2_next);
 
-($version3 = $version)  =~ s/-[^-]+$//;
+($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
 ($version2 = $version3) =~ s/\.[^.]+$//;
 
 ($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
diff --git a/debian/wheezy/applications/kbarcode/debian/cdbs/versions.pl b/debian/wheezy/applications/kbarcode/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/wheezy/applications/kbarcode/debian/cdbs/versions.pl
+++ b/debian/wheezy/applications/kbarcode/debian/cdbs/versions.pl
@@ -7,7 +7,7 @@ my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
 my ($version3, $version3_next);
 my ($version2, $version2_next);
 
-($version3 = $version)  =~ s/-[^-]+$//;
+($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
 ($version2 = $version3) =~ s/\.[^.]+$//;
 
 ($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
diff --git a/debian/wheezy/applications/kbookreader/debian/cdbs/versions.pl b/debian/wheezy/applications/kbookreader/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/wheezy/applications/kbookreader/debian/cdbs/versions.pl
+++ b/debian/wheezy/applications/kbookreader/debian/cdbs/versions.pl
@@ -7,7 +7,7 @@ my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
 my ($version3, $version3_next);
 my ($version2, $version2_next);
 
-($version3 = $version)  =~ s/-[^-]+$//;
+($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
 ($version2 = $version3) =~ s/\.[^.]+$//;
 
 ($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
diff --git a/debian/wheezy/applications/kcpuload/debian/cdbs/versions.pl b/debian/wheezy/applications/kcpuload/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/wheezy/applications/kcpuload/debian/cdbs/versions.pl
+++ b/debian/wheezy/applications/kcpuload/debian/cdbs/versions.pl
@@ -7,7 +7,7 @@ my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
 my ($version3, $version3_next);
 my ($version2, $version2_next);
 
-($version3 = $version)  =~ s/-[^-]+$//;
+($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
 ($version2 = $version3) =~ s/\.[^.]+$//;
 
 ($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
diff --git a/debian/wheezy/applications/kdbusnotification/debian/cdbs/versions.pl b/debian/wheezy/applications/kdbusnotification/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/wheezy/applications/kdbusnotification/debian/cdbs/versions.pl
+++ b/debian/wheezy/applications/kdbusnotification/debian/cdbs/versions.pl
@@ -7,7 +7,7 @@ my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
 my ($version3, $version3_next);
 my ($version2, $version2_next);
 
-($version3 = $version)  =~ s/-[^-]+$//;
+($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
 ($version2 = $version3) =~ s/\.[^.]+$//;
 
 ($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
diff --git a/debian/wheezy/applications/kdiff3/debian/cdbs/versions.pl b/debian/wheezy/applications/kdiff3/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/wheezy/applications/kdiff3/debian/cdbs/versions.pl
+++ b/debian/wheezy/applications/kdiff3/debian/cdbs/versions.pl
@@ -7,7 +7,7 @@ my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
 my ($version3, $version3_next);
 my ($version2, $version2_next);
 
-($version3 = $version)  =~ s/-[^-]+$//;
+($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
 ($version2 = $version3) =~ s/\.[^.]+$//;
 
 ($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
diff --git a/debian/wheezy/applications/kdirstat/debian/cdbs/versions.pl b/debian/wheezy/applications/kdirstat/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/wheezy/applications/kdirstat/debian/cdbs/versions.pl
+++ b/debian/wheezy/applications/kdirstat/debian/cdbs/versions.pl
@@ -7,7 +7,7 @@ my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
 my ($version3, $version3_next);
 my ($version2, $version2_next);
 
-($version3 = $version)  =~ s/-[^-]+$//;
+($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
 ($version2 = $version3) =~ s/\.[^.]+$//;
 
 ($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
diff --git a/debian/wheezy/applications/keep/debian/cdbs/versions.pl b/debian/wheezy/applications/keep/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/wheezy/applications/keep/debian/cdbs/versions.pl
+++ b/debian/wheezy/applications/keep/debian/cdbs/versions.pl
@@ -7,7 +7,7 @@ my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
 my ($version3, $version3_next);
 my ($version2, $version2_next);
 
-($version3 = $version)  =~ s/-[^-]+$//;
+($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
 ($version2 = $version3) =~ s/\.[^.]+$//;
 
 ($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
diff --git a/debian/wheezy/applications/kerry/debian/cdbs/versions.pl b/debian/wheezy/applications/kerry/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/wheezy/applications/kerry/debian/cdbs/versions.pl
+++ b/debian/wheezy/applications/kerry/debian/cdbs/versions.pl
@@ -7,7 +7,7 @@ my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
 my ($version3, $version3_next);
 my ($version2, $version2_next);
 
-($version3 = $version)  =~ s/-[^-]+$//;
+($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
 ($version2 = $version3) =~ s/\.[^.]+$//;
 
 ($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
diff --git a/debian/wheezy/applications/kgtk-qt3/debian/cdbs/versions.pl b/debian/wheezy/applications/kgtk-qt3/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/wheezy/applications/kgtk-qt3/debian/cdbs/versions.pl
+++ b/debian/wheezy/applications/kgtk-qt3/debian/cdbs/versions.pl
@@ -7,7 +7,7 @@ my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
 my ($version3, $version3_next);
 my ($version2, $version2_next);
 
-($version3 = $version)  =~ s/-[^-]+$//;
+($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
 ($version2 = $version3) =~ s/\.[^.]+$//;
 
 ($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
diff --git a/debian/wheezy/applications/kile/debian/cdbs/versions.pl b/debian/wheezy/applications/kile/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/wheezy/applications/kile/debian/cdbs/versions.pl
+++ b/debian/wheezy/applications/kile/debian/cdbs/versions.pl
@@ -7,7 +7,7 @@ my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
 my ($version3, $version3_next);
 my ($version2, $version2_next);
 
-($version3 = $version)  =~ s/-[^-]+$//;
+($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
 ($version2 = $version3) =~ s/\.[^.]+$//;
 
 ($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
diff --git a/debian/wheezy/applications/kiosktool/debian/cdbs/versions.pl b/debian/wheezy/applications/kiosktool/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/wheezy/applications/kiosktool/debian/cdbs/versions.pl
+++ b/debian/wheezy/applications/kiosktool/debian/cdbs/versions.pl
@@ -7,7 +7,7 @@ my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
 my ($version3, $version3_next);
 my ($version2, $version2_next);
 
-($version3 = $version)  =~ s/-[^-]+$//;
+($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
 ($version2 = $version3) =~ s/\.[^.]+$//;
 
 ($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
diff --git a/debian/wheezy/applications/kmplayer/debian/cdbs/versions.pl b/debian/wheezy/applications/kmplayer/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/wheezy/applications/kmplayer/debian/cdbs/versions.pl
+++ b/debian/wheezy/applications/kmplayer/debian/cdbs/versions.pl
@@ -7,7 +7,7 @@ my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
 my ($version3, $version3_next);
 my ($version2, $version2_next);
 
-($version3 = $version)  =~ s/-[^-]+$//;
+($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
 ($version2 = $version3) =~ s/\.[^.]+$//;
 
 ($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
diff --git a/debian/wheezy/applications/kmymoney/debian/cdbs/versions.pl b/debian/wheezy/applications/kmymoney/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/wheezy/applications/kmymoney/debian/cdbs/versions.pl
+++ b/debian/wheezy/applications/kmymoney/debian/cdbs/versions.pl
@@ -7,7 +7,7 @@ my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
 my ($version3, $version3_next);
 my ($version2, $version2_next);
 
-($version3 = $version)  =~ s/-[^-]+$//;
+($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
 ($version2 = $version3) =~ s/\.[^.]+$//;
 
 ($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
diff --git a/debian/wheezy/applications/knemo/debian/cdbs/versions.pl b/debian/wheezy/applications/knemo/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/wheezy/applications/knemo/debian/cdbs/versions.pl
+++ b/debian/wheezy/applications/knemo/debian/cdbs/versions.pl
@@ -7,7 +7,7 @@ my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
 my ($version3, $version3_next);
 my ($version2, $version2_next);
 
-($version3 = $version)  =~ s/-[^-]+$//;
+($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
 ($version2 = $version3) =~ s/\.[^.]+$//;
 
 ($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
diff --git a/debian/wheezy/applications/knetstats/debian/cdbs/versions.pl b/debian/wheezy/applications/knetstats/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/wheezy/applications/knetstats/debian/cdbs/versions.pl
+++ b/debian/wheezy/applications/knetstats/debian/cdbs/versions.pl
@@ -7,7 +7,7 @@ my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
 my ($version3, $version3_next);
 my ($version2, $version2_next);
 
-($version3 = $version)  =~ s/-[^-]+$//;
+($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
 ($version2 = $version3) =~ s/\.[^.]+$//;
 
 ($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
diff --git a/debian/wheezy/applications/knetworkmanager.cmake/debian/cdbs/versions.pl b/debian/wheezy/applications/knetworkmanager.cmake/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/wheezy/applications/knetworkmanager.cmake/debian/cdbs/versions.pl
+++ b/debian/wheezy/applications/knetworkmanager.cmake/debian/cdbs/versions.pl
@@ -7,7 +7,7 @@ my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
 my ($version3, $version3_next);
 my ($version2, $version2_next);
 
-($version3 = $version)  =~ s/-[^-]+$//;
+($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
 ($version2 = $version3) =~ s/\.[^.]+$//;
 
 ($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
diff --git a/debian/wheezy/applications/knetworkmanager8/debian/cdbs/versions.pl b/debian/wheezy/applications/knetworkmanager8/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/wheezy/applications/knetworkmanager8/debian/cdbs/versions.pl
+++ b/debian/wheezy/applications/knetworkmanager8/debian/cdbs/versions.pl
@@ -7,7 +7,7 @@ my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
 my ($version3, $version3_next);
 my ($version2, $version2_next);
 
-($version3 = $version)  =~ s/-[^-]+$//;
+($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
 ($version2 = $version3) =~ s/\.[^.]+$//;
 
 ($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
diff --git a/debian/wheezy/applications/knetworkmanager9/debian/cdbs/versions.pl b/debian/wheezy/applications/knetworkmanager9/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/wheezy/applications/knetworkmanager9/debian/cdbs/versions.pl
+++ b/debian/wheezy/applications/knetworkmanager9/debian/cdbs/versions.pl
@@ -7,7 +7,7 @@ my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
 my ($version3, $version3_next);
 my ($version2, $version2_next);
 
-($version3 = $version)  =~ s/-[^-]+$//;
+($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
 ($version2 = $version3) =~ s/\.[^.]+$//;
 
 ($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
diff --git a/debian/wheezy/applications/koffice/debian/cdbs/versions.pl b/debian/wheezy/applications/koffice/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/wheezy/applications/koffice/debian/cdbs/versions.pl
+++ b/debian/wheezy/applications/koffice/debian/cdbs/versions.pl
@@ -7,7 +7,7 @@ my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
 my ($version3, $version3_next);
 my ($version2, $version2_next);
 
-($version3 = $version)  =~ s/-[^-]+$//;
+($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
 ($version2 = $version3) =~ s/\.[^.]+$//;
 
 ($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
diff --git a/debian/wheezy/applications/konversation/debian/cdbs/versions.pl b/debian/wheezy/applications/konversation/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/wheezy/applications/konversation/debian/cdbs/versions.pl
+++ b/debian/wheezy/applications/konversation/debian/cdbs/versions.pl
@@ -7,7 +7,7 @@ my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
 my ($version3, $version3_next);
 my ($version2, $version2_next);
 
-($version3 = $version)  =~ s/-[^-]+$//;
+($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
 ($version2 = $version3) =~ s/\.[^.]+$//;
 
 ($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
diff --git a/debian/wheezy/applications/kopete-otr/debian/cdbs/versions.pl b/debian/wheezy/applications/kopete-otr/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/wheezy/applications/kopete-otr/debian/cdbs/versions.pl
+++ b/debian/wheezy/applications/kopete-otr/debian/cdbs/versions.pl
@@ -7,7 +7,7 @@ my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
 my ($version3, $version3_next);
 my ($version2, $version2_next);
 
-($version3 = $version)  =~ s/-[^-]+$//;
+($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
 ($version2 = $version3) =~ s/\.[^.]+$//;
 
 ($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
diff --git a/debian/wheezy/applications/kpilot/debian/cdbs/versions.pl b/debian/wheezy/applications/kpilot/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/wheezy/applications/kpilot/debian/cdbs/versions.pl
+++ b/debian/wheezy/applications/kpilot/debian/cdbs/versions.pl
@@ -7,7 +7,7 @@ my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
 my ($version3, $version3_next);
 my ($version2, $version2_next);
 
-($version3 = $version)  =~ s/-[^-]+$//;
+($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
 ($version2 = $version3) =~ s/\.[^.]+$//;
 
 ($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
diff --git a/debian/wheezy/applications/kpowersave-nohal/debian/cdbs/versions.pl b/debian/wheezy/applications/kpowersave-nohal/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/wheezy/applications/kpowersave-nohal/debian/cdbs/versions.pl
+++ b/debian/wheezy/applications/kpowersave-nohal/debian/cdbs/versions.pl
@@ -7,7 +7,7 @@ my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
 my ($version3, $version3_next);
 my ($version2, $version2_next);
 
-($version3 = $version)  =~ s/-[^-]+$//;
+($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
 ($version2 = $version3) =~ s/\.[^.]+$//;
 
 ($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
diff --git a/debian/wheezy/applications/kpowersave.cmake/debian/cdbs/versions.pl b/debian/wheezy/applications/kpowersave.cmake/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/wheezy/applications/kpowersave.cmake/debian/cdbs/versions.pl
+++ b/debian/wheezy/applications/kpowersave.cmake/debian/cdbs/versions.pl
@@ -7,7 +7,7 @@ my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
 my ($version3, $version3_next);
 my ($version2, $version2_next);
 
-($version3 = $version)  =~ s/-[^-]+$//;
+($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
 ($version2 = $version3) =~ s/\.[^.]+$//;
 
 ($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
diff --git a/debian/wheezy/applications/kpowersave/debian/cdbs/versions.pl b/debian/wheezy/applications/kpowersave/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/wheezy/applications/kpowersave/debian/cdbs/versions.pl
+++ b/debian/wheezy/applications/kpowersave/debian/cdbs/versions.pl
@@ -7,7 +7,7 @@ my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
 my ($version3, $version3_next);
 my ($version2, $version2_next);
 
-($version3 = $version)  =~ s/-[^-]+$//;
+($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
 ($version2 = $version3) =~ s/\.[^.]+$//;
 
 ($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
diff --git a/debian/wheezy/applications/krename/debian/cdbs/versions.pl b/debian/wheezy/applications/krename/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/wheezy/applications/krename/debian/cdbs/versions.pl
+++ b/debian/wheezy/applications/krename/debian/cdbs/versions.pl
@@ -7,7 +7,7 @@ my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
 my ($version3, $version3_next);
 my ($version2, $version2_next);
 
-($version3 = $version)  =~ s/-[^-]+$//;
+($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
 ($version2 = $version3) =~ s/\.[^.]+$//;
 
 ($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
diff --git a/debian/wheezy/applications/krusader/debian/cdbs/versions.pl b/debian/wheezy/applications/krusader/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/wheezy/applications/krusader/debian/cdbs/versions.pl
+++ b/debian/wheezy/applications/krusader/debian/cdbs/versions.pl
@@ -7,7 +7,7 @@ my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
 my ($version3, $version3_next);
 my ($version2, $version2_next);
 
-($version3 = $version)  =~ s/-[^-]+$//;
+($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
 ($version2 = $version3) =~ s/\.[^.]+$//;
 
 ($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
diff --git a/debian/wheezy/applications/ksystemlog/debian/cdbs/versions.pl b/debian/wheezy/applications/ksystemlog/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/wheezy/applications/ksystemlog/debian/cdbs/versions.pl
+++ b/debian/wheezy/applications/ksystemlog/debian/cdbs/versions.pl
@@ -7,7 +7,7 @@ my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
 my ($version3, $version3_next);
 my ($version2, $version2_next);
 
-($version3 = $version)  =~ s/-[^-]+$//;
+($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
 ($version2 = $version3) =~ s/\.[^.]+$//;
 
 ($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
diff --git a/debian/wheezy/applications/ktorrent/debian/cdbs/versions.pl b/debian/wheezy/applications/ktorrent/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/wheezy/applications/ktorrent/debian/cdbs/versions.pl
+++ b/debian/wheezy/applications/ktorrent/debian/cdbs/versions.pl
@@ -7,7 +7,7 @@ my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
 my ($version3, $version3_next);
 my ($version2, $version2_next);
 
-($version3 = $version)  =~ s/-[^-]+$//;
+($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
 ($version2 = $version3) =~ s/\.[^.]+$//;
 
 ($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
diff --git a/debian/wheezy/applications/kuickshow/debian/cdbs/versions.pl b/debian/wheezy/applications/kuickshow/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/wheezy/applications/kuickshow/debian/cdbs/versions.pl
+++ b/debian/wheezy/applications/kuickshow/debian/cdbs/versions.pl
@@ -7,7 +7,7 @@ my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
 my ($version3, $version3_next);
 my ($version2, $version2_next);
 
-($version3 = $version)  =~ s/-[^-]+$//;
+($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
 ($version2 = $version3) =~ s/\.[^.]+$//;
 
 ($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
diff --git a/debian/wheezy/applications/kvkbd/debian/cdbs/versions.pl b/debian/wheezy/applications/kvkbd/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/wheezy/applications/kvkbd/debian/cdbs/versions.pl
+++ b/debian/wheezy/applications/kvkbd/debian/cdbs/versions.pl
@@ -7,7 +7,7 @@ my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
 my ($version3, $version3_next);
 my ($version2, $version2_next);
 
-($version3 = $version)  =~ s/-[^-]+$//;
+($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
 ($version2 = $version3) =~ s/\.[^.]+$//;
 
 ($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
diff --git a/debian/wheezy/applications/rosegarden/debian/cdbs/versions.pl b/debian/wheezy/applications/rosegarden/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/wheezy/applications/rosegarden/debian/cdbs/versions.pl
+++ b/debian/wheezy/applications/rosegarden/debian/cdbs/versions.pl
@@ -7,7 +7,7 @@ my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
 my ($version3, $version3_next);
 my ($version2, $version2_next);
 
-($version3 = $version)  =~ s/-[^-]+$//;
+($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
 ($version2 = $version3) =~ s/\.[^.]+$//;
 
 ($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
diff --git a/debian/wheezy/applications/smb4k/debian/cdbs/versions.pl b/debian/wheezy/applications/smb4k/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/wheezy/applications/smb4k/debian/cdbs/versions.pl
+++ b/debian/wheezy/applications/smb4k/debian/cdbs/versions.pl
@@ -7,7 +7,7 @@ my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
 my ($version3, $version3_next);
 my ($version2, $version2_next);
 
-($version3 = $version)  =~ s/-[^-]+$//;
+($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
 ($version2 = $version3) =~ s/\.[^.]+$//;
 
 ($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
diff --git a/debian/wheezy/applications/soundkonverter/debian/cdbs/versions.pl b/debian/wheezy/applications/soundkonverter/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/wheezy/applications/soundkonverter/debian/cdbs/versions.pl
+++ b/debian/wheezy/applications/soundkonverter/debian/cdbs/versions.pl
@@ -7,7 +7,7 @@ my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
 my ($version3, $version3_next);
 my ($version2, $version2_next);
 
-($version3 = $version)  =~ s/-[^-]+$//;
+($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
 ($version2 = $version3) =~ s/\.[^.]+$//;
 
 ($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
diff --git a/debian/wheezy/applications/tde-style-qtcurve/debian/cdbs/versions.pl b/debian/wheezy/applications/tde-style-qtcurve/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/wheezy/applications/tde-style-qtcurve/debian/cdbs/versions.pl
+++ b/debian/wheezy/applications/tde-style-qtcurve/debian/cdbs/versions.pl
@@ -7,7 +7,7 @@ my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
 my ($version3, $version3_next);
 my ($version2, $version2_next);
 
-($version3 = $version)  =~ s/-[^-]+$//;
+($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
 ($version2 = $version3) =~ s/\.[^.]+$//;
 
 ($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
diff --git a/debian/wheezy/applications/tde-systemsettings/debian/cdbs/versions.pl b/debian/wheezy/applications/tde-systemsettings/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/wheezy/applications/tde-systemsettings/debian/cdbs/versions.pl
+++ b/debian/wheezy/applications/tde-systemsettings/debian/cdbs/versions.pl
@@ -7,7 +7,7 @@ my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
 my ($version3, $version3_next);
 my ($version2, $version2_next);
 
-($version3 = $version)  =~ s/-[^-]+$//;
+($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
 ($version2 = $version3) =~ s/\.[^.]+$//;
 
 ($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
diff --git a/debian/wheezy/applications/tdeio-apt/debian/cdbs/versions.pl b/debian/wheezy/applications/tdeio-apt/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/wheezy/applications/tdeio-apt/debian/cdbs/versions.pl
+++ b/debian/wheezy/applications/tdeio-apt/debian/cdbs/versions.pl
@@ -7,7 +7,7 @@ my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
 my ($version3, $version3_next);
 my ($version2, $version2_next);
 
-($version3 = $version)  =~ s/-[^-]+$//;
+($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
 ($version2 = $version3) =~ s/\.[^.]+$//;
 
 ($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
diff --git a/debian/wheezy/applications/tdeio-locate/debian/cdbs/versions.pl b/debian/wheezy/applications/tdeio-locate/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/wheezy/applications/tdeio-locate/debian/cdbs/versions.pl
+++ b/debian/wheezy/applications/tdeio-locate/debian/cdbs/versions.pl
@@ -7,7 +7,7 @@ my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
 my ($version3, $version3_next);
 my ($version2, $version2_next);
 
-($version3 = $version)  =~ s/-[^-]+$//;
+($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
 ($version2 = $version3) =~ s/\.[^.]+$//;
 
 ($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
diff --git a/debian/wheezy/applications/tdeio-umountwrapper/debian/cdbs/versions.pl b/debian/wheezy/applications/tdeio-umountwrapper/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/wheezy/applications/tdeio-umountwrapper/debian/cdbs/versions.pl
+++ b/debian/wheezy/applications/tdeio-umountwrapper/debian/cdbs/versions.pl
@@ -7,7 +7,7 @@ my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
 my ($version3, $version3_next);
 my ($version2, $version2_next);
 
-($version3 = $version)  =~ s/-[^-]+$//;
+($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
 ($version2 = $version3) =~ s/\.[^.]+$//;
 
 ($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
diff --git a/debian/wheezy/applications/tdesudo/debian/cdbs/versions.pl b/debian/wheezy/applications/tdesudo/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/wheezy/applications/tdesudo/debian/cdbs/versions.pl
+++ b/debian/wheezy/applications/tdesudo/debian/cdbs/versions.pl
@@ -7,7 +7,7 @@ my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
 my ($version3, $version3_next);
 my ($version2, $version2_next);
 
-($version3 = $version)  =~ s/-[^-]+$//;
+($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
 ($version2 = $version3) =~ s/\.[^.]+$//;
 
 ($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
diff --git a/debian/wheezy/applications/tdesvn/debian/cdbs/versions.pl b/debian/wheezy/applications/tdesvn/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/wheezy/applications/tdesvn/debian/cdbs/versions.pl
+++ b/debian/wheezy/applications/tdesvn/debian/cdbs/versions.pl
@@ -7,7 +7,7 @@ my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
 my ($version3, $version3_next);
 my ($version2, $version2_next);
 
-($version3 = $version)  =~ s/-[^-]+$//;
+($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
 ($version2 = $version3) =~ s/\.[^.]+$//;
 
 ($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
diff --git a/debian/wheezy/applications/tdmtheme/debian/cdbs/versions.pl b/debian/wheezy/applications/tdmtheme/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/wheezy/applications/tdmtheme/debian/cdbs/versions.pl
+++ b/debian/wheezy/applications/tdmtheme/debian/cdbs/versions.pl
@@ -7,7 +7,7 @@ my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
 my ($version3, $version3_next);
 my ($version2, $version2_next);
 
-($version3 = $version)  =~ s/-[^-]+$//;
+($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
 ($version2 = $version3) =~ s/\.[^.]+$//;
 
 ($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
diff --git a/debian/wheezy/applications/twin-style-crystal/debian/cdbs/versions.pl b/debian/wheezy/applications/twin-style-crystal/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/wheezy/applications/twin-style-crystal/debian/cdbs/versions.pl
+++ b/debian/wheezy/applications/twin-style-crystal/debian/cdbs/versions.pl
@@ -7,7 +7,7 @@ my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
 my ($version3, $version3_next);
 my ($version2, $version2_next);
 
-($version3 = $version)  =~ s/-[^-]+$//;
+($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
 ($version2 = $version3) =~ s/\.[^.]+$//;
 
 ($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
diff --git a/debian/wheezy/applications/wlassistant/debian/cdbs/versions.pl b/debian/wheezy/applications/wlassistant/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/wheezy/applications/wlassistant/debian/cdbs/versions.pl
+++ b/debian/wheezy/applications/wlassistant/debian/cdbs/versions.pl
@@ -7,7 +7,7 @@ my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
 my ($version3, $version3_next);
 my ($version2, $version2_next);
 
-($version3 = $version)  =~ s/-[^-]+$//;
+($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
 ($version2 = $version3) =~ s/\.[^.]+$//;
 
 ($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
diff --git a/debian/wheezy/applications/yakuake/debian/cdbs/versions.pl b/debian/wheezy/applications/yakuake/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/wheezy/applications/yakuake/debian/cdbs/versions.pl
+++ b/debian/wheezy/applications/yakuake/debian/cdbs/versions.pl
@@ -7,7 +7,7 @@ my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
 my ($version3, $version3_next);
 my ($version2, $version2_next);
 
-($version3 = $version)  =~ s/-[^-]+$//;
+($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
 ($version2 = $version3) =~ s/\.[^.]+$//;
 
 ($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-- 
cgit v1.2.1