Cutting off the fourth number, or preliminary version number

in counting versions for dependencies on Debian and Ubuntu
author: Slávek Banko <slavek.banko@axis.cz> 2013-04-21 19:42:09 +0200
committer: Slávek Banko <slavek.banko@axis.cz> 2013-04-21 19:54:57 +0200
commit: 6e70fa33ca99b1020f68a09481317b854e31de66 (patch)
tree: 13810e0cd96c7ea9dbbc14e43fefb1500e272728
parent: 731c5feadab8d86e307b00e3b408b5d5b80b4422 (diff)
download: tde-packaging-6e70fa33ca99b1020f68a09481317b854e31de66.tar.gz
tde-packaging-6e70fa33ca99b1020f68a09481317b854e31de66.zip
516 files changed, 516 insertions, 516 deletions
diff --git a/debian/lenny/applications/abakus/debian/cdbs/versions.pl b/debian/lenny/applications/abakus/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/lenny/applications/abakus/debian/cdbs/versions.pl
+++ b/debian/lenny/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/lenny/applications/adept/debian/cdbs/versions.pl b/debian/lenny/applications/adept/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/lenny/applications/adept/debian/cdbs/versions.pl
+++ b/debian/lenny/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/lenny/applications/amarok.cmake/debian/cdbs/versions.pl b/debian/lenny/applications/amarok.cmake/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/lenny/applications/amarok.cmake/debian/cdbs/versions.pl
+++ b/debian/lenny/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/lenny/applications/amarok/debian/cdbs/versions.pl b/debian/lenny/applications/amarok/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/lenny/applications/amarok/debian/cdbs/versions.pl
+++ b/debian/lenny/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/lenny/applications/bibletime/debian/cdbs/versions.pl b/debian/lenny/applications/bibletime/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/lenny/applications/bibletime/debian/cdbs/versions.pl
+++ b/debian/lenny/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/lenny/applications/compizconfig-backend-tdeconfig/debian/cdbs/versions.pl b/debian/lenny/applications/compizconfig-backend-tdeconfig/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/lenny/applications/compizconfig-backend-tdeconfig/debian/cdbs/versions.pl
+++ b/debian/lenny/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/lenny/applications/digikam/debian/cdbs/versions.pl b/debian/lenny/applications/digikam/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/lenny/applications/digikam/debian/cdbs/versions.pl
+++ b/debian/lenny/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/lenny/applications/dolphin/debian/cdbs/versions.pl b/debian/lenny/applications/dolphin/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/lenny/applications/dolphin/debian/cdbs/versions.pl
+++ b/debian/lenny/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/lenny/applications/filelight-l10n/debian/cdbs/versions.pl b/debian/lenny/applications/filelight-l10n/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/lenny/applications/filelight-l10n/debian/cdbs/versions.pl
+++ b/debian/lenny/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/lenny/applications/filelight/debian/cdbs/versions.pl b/debian/lenny/applications/filelight/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/lenny/applications/filelight/debian/cdbs/versions.pl
+++ b/debian/lenny/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/lenny/applications/gtk-qt-engine/debian/cdbs/versions.pl b/debian/lenny/applications/gtk-qt-engine/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/lenny/applications/gtk-qt-engine/debian/cdbs/versions.pl
+++ b/debian/lenny/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/lenny/applications/gwenview-i18n/debian/cdbs/versions.pl b/debian/lenny/applications/gwenview-i18n/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/lenny/applications/gwenview-i18n/debian/cdbs/versions.pl
+++ b/debian/lenny/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/lenny/applications/gwenview/debian/cdbs/versions.pl b/debian/lenny/applications/gwenview/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/lenny/applications/gwenview/debian/cdbs/versions.pl
+++ b/debian/lenny/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/lenny/applications/k3b/debian/cdbs/versions.pl b/debian/lenny/applications/k3b/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/lenny/applications/k3b/debian/cdbs/versions.pl
+++ b/debian/lenny/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/lenny/applications/k9copy/debian/cdbs/versions.pl b/debian/lenny/applications/k9copy/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/lenny/applications/k9copy/debian/cdbs/versions.pl
+++ b/debian/lenny/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/lenny/applications/kaffeine/debian/cdbs/versions.pl b/debian/lenny/applications/kaffeine/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/lenny/applications/kaffeine/debian/cdbs/versions.pl
+++ b/debian/lenny/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/lenny/applications/katapult/debian/cdbs/versions.pl b/debian/lenny/applications/katapult/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/lenny/applications/katapult/debian/cdbs/versions.pl
+++ b/debian/lenny/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/lenny/applications/kbarcode/debian/cdbs/versions.pl b/debian/lenny/applications/kbarcode/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/lenny/applications/kbarcode/debian/cdbs/versions.pl
+++ b/debian/lenny/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/lenny/applications/kbookreader/debian/cdbs/versions.pl b/debian/lenny/applications/kbookreader/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/lenny/applications/kbookreader/debian/cdbs/versions.pl
+++ b/debian/lenny/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/lenny/applications/kcpuload/debian/cdbs/versions.pl b/debian/lenny/applications/kcpuload/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/lenny/applications/kcpuload/debian/cdbs/versions.pl
+++ b/debian/lenny/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/lenny/applications/kdbusnotification/debian/cdbs/versions.pl b/debian/lenny/applications/kdbusnotification/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/lenny/applications/kdbusnotification/debian/cdbs/versions.pl
+++ b/debian/lenny/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/lenny/applications/kdiff3/debian/cdbs/versions.pl b/debian/lenny/applications/kdiff3/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/lenny/applications/kdiff3/debian/cdbs/versions.pl
+++ b/debian/lenny/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/lenny/applications/kdirstat/debian/cdbs/versions.pl b/debian/lenny/applications/kdirstat/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/lenny/applications/kdirstat/debian/cdbs/versions.pl
+++ b/debian/lenny/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/lenny/applications/keep/debian/cdbs/versions.pl b/debian/lenny/applications/keep/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/lenny/applications/keep/debian/cdbs/versions.pl
+++ b/debian/lenny/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/lenny/applications/kerry/debian/cdbs/versions.pl b/debian/lenny/applications/kerry/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/lenny/applications/kerry/debian/cdbs/versions.pl
+++ b/debian/lenny/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/lenny/applications/kgtk-qt3/debian/cdbs/versions.pl b/debian/lenny/applications/kgtk-qt3/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/lenny/applications/kgtk-qt3/debian/cdbs/versions.pl
+++ b/debian/lenny/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/lenny/applications/kile/debian/cdbs/versions.pl b/debian/lenny/applications/kile/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/lenny/applications/kile/debian/cdbs/versions.pl
+++ b/debian/lenny/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/lenny/applications/kiosktool/debian/cdbs/versions.pl b/debian/lenny/applications/kiosktool/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/lenny/applications/kiosktool/debian/cdbs/versions.pl
+++ b/debian/lenny/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/lenny/applications/kmplayer/debian/cdbs/versions.pl b/debian/lenny/applications/kmplayer/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/lenny/applications/kmplayer/debian/cdbs/versions.pl
+++ b/debian/lenny/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/lenny/applications/kmymoney/debian/cdbs/versions.pl b/debian/lenny/applications/kmymoney/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/lenny/applications/kmymoney/debian/cdbs/versions.pl
+++ b/debian/lenny/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/lenny/applications/knemo/debian/cdbs/versions.pl b/debian/lenny/applications/knemo/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/lenny/applications/knemo/debian/cdbs/versions.pl
+++ b/debian/lenny/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/lenny/applications/knetstats/debian/cdbs/versions.pl b/debian/lenny/applications/knetstats/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/lenny/applications/knetstats/debian/cdbs/versions.pl
+++ b/debian/lenny/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/lenny/applications/knetworkmanager.cmake/debian/cdbs/versions.pl b/debian/lenny/applications/knetworkmanager.cmake/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/lenny/applications/knetworkmanager.cmake/debian/cdbs/versions.pl
+++ b/debian/lenny/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/lenny/applications/knetworkmanager8/debian/cdbs/versions.pl b/debian/lenny/applications/knetworkmanager8/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/lenny/applications/knetworkmanager8/debian/cdbs/versions.pl
+++ b/debian/lenny/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/lenny/applications/knetworkmanager9/debian/cdbs/versions.pl b/debian/lenny/applications/knetworkmanager9/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/lenny/applications/knetworkmanager9/debian/cdbs/versions.pl
+++ b/debian/lenny/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/lenny/applications/koffice/debian/cdbs/versions.pl b/debian/lenny/applications/koffice/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/lenny/applications/koffice/debian/cdbs/versions.pl
+++ b/debian/lenny/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/lenny/applications/konversation/debian/cdbs/versions.pl b/debian/lenny/applications/konversation/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/lenny/applications/konversation/debian/cdbs/versions.pl
+++ b/debian/lenny/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/lenny/applications/kopete-otr/debian/cdbs/versions.pl b/debian/lenny/applications/kopete-otr/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/lenny/applications/kopete-otr/debian/cdbs/versions.pl
+++ b/debian/lenny/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/lenny/applications/kpilot/debian/cdbs/versions.pl b/debian/lenny/applications/kpilot/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/lenny/applications/kpilot/debian/cdbs/versions.pl
+++ b/debian/lenny/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/lenny/applications/kpowersave-nohal/debian/cdbs/versions.pl b/debian/lenny/applications/kpowersave-nohal/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/lenny/applications/kpowersave-nohal/debian/cdbs/versions.pl
+++ b/debian/lenny/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/lenny/applications/kpowersave.cmake/debian/cdbs/versions.pl b/debian/lenny/applications/kpowersave.cmake/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/lenny/applications/kpowersave.cmake/debian/cdbs/versions.pl
+++ b/debian/lenny/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/lenny/applications/kpowersave/debian/cdbs/versions.pl b/debian/lenny/applications/kpowersave/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/lenny/applications/kpowersave/debian/cdbs/versions.pl
+++ b/debian/lenny/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/lenny/applications/krename/debian/cdbs/versions.pl b/debian/lenny/applications/krename/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/lenny/applications/krename/debian/cdbs/versions.pl
+++ b/debian/lenny/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/lenny/applications/krusader/debian/cdbs/versions.pl b/debian/lenny/applications/krusader/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/lenny/applications/krusader/debian/cdbs/versions.pl
+++ b/debian/lenny/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/lenny/applications/ksystemlog/debian/cdbs/versions.pl b/debian/lenny/applications/ksystemlog/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/lenny/applications/ksystemlog/debian/cdbs/versions.pl
+++ b/debian/lenny/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/lenny/applications/ktorrent/debian/cdbs/versions.pl b/debian/lenny/applications/ktorrent/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/lenny/applications/ktorrent/debian/cdbs/versions.pl
+++ b/debian/lenny/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/lenny/applications/kuickshow/debian/cdbs/versions.pl b/debian/lenny/applications/kuickshow/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/lenny/applications/kuickshow/debian/cdbs/versions.pl
+++ b/debian/lenny/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/lenny/applications/kvkbd/debian/cdbs/versions.pl b/debian/lenny/applications/kvkbd/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/lenny/applications/kvkbd/debian/cdbs/versions.pl
+++ b/debian/lenny/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/lenny/applications/rosegarden/debian/cdbs/versions.pl b/debian/lenny/applications/rosegarden/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/lenny/applications/rosegarden/debian/cdbs/versions.pl
+++ b/debian/lenny/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/lenny/applications/smb4k/debian/cdbs/versions.pl b/debian/lenny/applications/smb4k/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/lenny/applications/smb4k/debian/cdbs/versions.pl
+++ b/debian/lenny/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/lenny/applications/soundkonverter/debian/cdbs/versions.pl b/debian/lenny/applications/soundkonverter/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/lenny/applications/soundkonverter/debian/cdbs/versions.pl
+++ b/debian/lenny/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/lenny/applications/tde-style-qtcurve/debian/cdbs/versions.pl b/debian/lenny/applications/tde-style-qtcurve/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/lenny/applications/tde-style-qtcurve/debian/cdbs/versions.pl
+++ b/debian/lenny/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/lenny/applications/tde-systemsettings/debian/cdbs/versions.pl b/debian/lenny/applications/tde-systemsettings/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/lenny/applications/tde-systemsettings/debian/cdbs/versions.pl
+++ b/debian/lenny/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/lenny/applications/tdeio-apt/debian/cdbs/versions.pl b/debian/lenny/applications/tdeio-apt/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/lenny/applications/tdeio-apt/debian/cdbs/versions.pl
+++ b/debian/lenny/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/lenny/applications/tdeio-locate/debian/cdbs/versions.pl b/debian/lenny/applications/tdeio-locate/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/lenny/applications/tdeio-locate/debian/cdbs/versions.pl
+++ b/debian/lenny/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/lenny/applications/tdeio-umountwrapper/debian/cdbs/versions.pl b/debian/lenny/applications/tdeio-umountwrapper/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/lenny/applications/tdeio-umountwrapper/debian/cdbs/versions.pl
+++ b/debian/lenny/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/lenny/applications/tdesudo/debian/cdbs/versions.pl b/debian/lenny/applications/tdesudo/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/lenny/applications/tdesudo/debian/cdbs/versions.pl
+++ b/debian/lenny/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/lenny/applications/tdesvn/debian/cdbs/versions.pl b/debian/lenny/applications/tdesvn/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/lenny/applications/tdesvn/debian/cdbs/versions.pl
+++ b/debian/lenny/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/lenny/applications/tdmtheme/debian/cdbs/versions.pl b/debian/lenny/applications/tdmtheme/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/lenny/applications/tdmtheme/debian/cdbs/versions.pl
+++ b/debian/lenny/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/lenny/applications/twin-style-crystal/debian/cdbs/versions.pl b/debian/lenny/applications/twin-style-crystal/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/lenny/applications/twin-style-crystal/debian/cdbs/versions.pl
+++ b/debian/lenny/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/lenny/applications/wlassistant/debian/cdbs/versions.pl b/debian/lenny/applications/wlassistant/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/lenny/applications/wlassistant/debian/cdbs/versions.pl
+++ b/debian/lenny/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/lenny/applications/yakuake/debian/cdbs/versions.pl b/debian/lenny/applications/yakuake/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/lenny/applications/yakuake/debian/cdbs/versions.pl
+++ b/debian/lenny/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;
diff --git a/debian/lenny/dependencies/arts/debian/cdbs/versions.pl b/debian/lenny/dependencies/arts/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/lenny/dependencies/arts/debian/cdbs/versions.pl
+++ b/debian/lenny/dependencies/arts/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/lenny/libraries/kipi-plugins/debian/cdbs/versions.pl b/debian/lenny/libraries/kipi-plugins/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/lenny/libraries/kipi-plugins/debian/cdbs/versions.pl
+++ b/debian/lenny/libraries/kipi-plugins/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/lenny/libraries/libkdcraw/debian/cdbs/versions.pl b/debian/lenny/libraries/libkdcraw/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/lenny/libraries/libkdcraw/debian/cdbs/versions.pl
+++ b/debian/lenny/libraries/libkdcraw/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/lenny/libraries/libkexiv2/debian/cdbs/versions.pl b/debian/lenny/libraries/libkexiv2/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/lenny/libraries/libkexiv2/debian/cdbs/versions.pl
+++ b/debian/lenny/libraries/libkexiv2/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/lenny/libraries/libkipi/debian/cdbs/versions.pl b/debian/lenny/libraries/libkipi/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/lenny/libraries/libkipi/debian/cdbs/versions.pl
+++ b/debian/lenny/libraries/libkipi/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/lenny/tdeaccessibility/debian/cdbs/versions.pl b/debian/lenny/tdeaccessibility/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/lenny/tdeaccessibility/debian/cdbs/versions.pl
+++ b/debian/lenny/tdeaccessibility/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/lenny/tdeaddons/debian/cdbs/versions.pl b/debian/lenny/tdeaddons/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/lenny/tdeaddons/debian/cdbs/versions.pl
+++ b/debian/lenny/tdeaddons/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/lenny/tdeadmin/debian/cdbs/versions.pl b/debian/lenny/tdeadmin/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/lenny/tdeadmin/debian/cdbs/versions.pl
+++ b/debian/lenny/tdeadmin/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/lenny/tdeartwork/debian/cdbs/versions.pl b/debian/lenny/tdeartwork/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/lenny/tdeartwork/debian/cdbs/versions.pl
+++ b/debian/lenny/tdeartwork/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/lenny/tdebase/debian/cdbs/versions.pl b/debian/lenny/tdebase/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/lenny/tdebase/debian/cdbs/versions.pl
+++ b/debian/lenny/tdebase/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/lenny/tdebindings/debian/cdbs/versions.pl b/debian/lenny/tdebindings/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/lenny/tdebindings/debian/cdbs/versions.pl
+++ b/debian/lenny/tdebindings/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/lenny/tdeedu/debian/cdbs/versions.pl b/debian/lenny/tdeedu/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/lenny/tdeedu/debian/cdbs/versions.pl
+++ b/debian/lenny/tdeedu/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/lenny/tdegames/debian/cdbs/versions.pl b/debian/lenny/tdegames/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/lenny/tdegames/debian/cdbs/versions.pl
+++ b/debian/lenny/tdegames/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/lenny/tdegraphics/debian/cdbs/versions.pl b/debian/lenny/tdegraphics/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/lenny/tdegraphics/debian/cdbs/versions.pl
+++ b/debian/lenny/tdegraphics/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/lenny/tdelibs/debian/cdbs/versions.pl b/debian/lenny/tdelibs/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/lenny/tdelibs/debian/cdbs/versions.pl
+++ b/debian/lenny/tdelibs/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/lenny/tdemultimedia/debian/cdbs/versions.pl b/debian/lenny/tdemultimedia/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/lenny/tdemultimedia/debian/cdbs/versions.pl
+++ b/debian/lenny/tdemultimedia/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/lenny/tdenetwork/debian/cdbs/versions.pl b/debian/lenny/tdenetwork/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/lenny/tdenetwork/debian/cdbs/versions.pl
+++ b/debian/lenny/tdenetwork/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/lenny/tdepim/debian/cdbs/versions.pl b/debian/lenny/tdepim/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/lenny/tdepim/debian/cdbs/versions.pl
+++ b/debian/lenny/tdepim/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/lenny/tdesdk/debian/cdbs/versions.pl b/debian/lenny/tdesdk/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/lenny/tdesdk/debian/cdbs/versions.pl
+++ b/debian/lenny/tdesdk/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/lenny/tdetoys/debian/cdbs/versions.pl b/debian/lenny/tdetoys/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/lenny/tdetoys/debian/cdbs/versions.pl
+++ b/debian/lenny/tdetoys/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/lenny/tdeutils/debian/cdbs/versions.pl b/debian/lenny/tdeutils/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/lenny/tdeutils/debian/cdbs/versions.pl
+++ b/debian/lenny/tdeutils/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/lenny/tdevelop/debian/cdbs/versions.pl b/debian/lenny/tdevelop/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/lenny/tdevelop/debian/cdbs/versions.pl
+++ b/debian/lenny/tdevelop/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/lenny/tdewebdev/debian/cdbs/versions.pl b/debian/lenny/tdewebdev/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/lenny/tdewebdev/debian/cdbs/versions.pl
+++ b/debian/lenny/tdewebdev/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/squeeze/applications/abakus/debian/cdbs/versions.pl b/debian/squeeze/applications/abakus/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/squeeze/applications/abakus/debian/cdbs/versions.pl
+++ b/debian/squeeze/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/squeeze/applications/adept/debian/cdbs/versions.pl b/debian/squeeze/applications/adept/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/squeeze/applications/adept/debian/cdbs/versions.pl
+++ b/debian/squeeze/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/squeeze/applications/amarok.cmake/debian/cdbs/versions.pl b/debian/squeeze/applications/amarok.cmake/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/squeeze/applications/amarok.cmake/debian/cdbs/versions.pl
+++ b/debian/squeeze/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/squeeze/applications/amarok/debian/cdbs/versions.pl b/debian/squeeze/applications/amarok/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/squeeze/applications/amarok/debian/cdbs/versions.pl
+++ b/debian/squeeze/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/squeeze/applications/bibletime/debian/cdbs/versions.pl b/debian/squeeze/applications/bibletime/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/squeeze/applications/bibletime/debian/cdbs/versions.pl
+++ b/debian/squeeze/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/squeeze/applications/compizconfig-backend-tdeconfig/debian/cdbs/versions.pl b/debian/squeeze/applications/compizconfig-backend-tdeconfig/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/squeeze/applications/compizconfig-backend-tdeconfig/debian/cdbs/versions.pl
+++ b/debian/squeeze/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/squeeze/applications/digikam/debian/cdbs/versions.pl b/debian/squeeze/applications/digikam/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/squeeze/applications/digikam/debian/cdbs/versions.pl
+++ b/debian/squeeze/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/squeeze/applications/dolphin/debian/cdbs/versions.pl b/debian/squeeze/applications/dolphin/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/squeeze/applications/dolphin/debian/cdbs/versions.pl
+++ b/debian/squeeze/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/squeeze/applications/filelight-l10n/debian/cdbs/versions.pl b/debian/squeeze/applications/filelight-l10n/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/squeeze/applications/filelight-l10n/debian/cdbs/versions.pl
+++ b/debian/squeeze/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/squeeze/applications/filelight/debian/cdbs/versions.pl b/debian/squeeze/applications/filelight/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/squeeze/applications/filelight/debian/cdbs/versions.pl
+++ b/debian/squeeze/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/squeeze/applications/gtk-qt-engine/debian/cdbs/versions.pl b/debian/squeeze/applications/gtk-qt-engine/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/squeeze/applications/gtk-qt-engine/debian/cdbs/versions.pl
+++ b/debian/squeeze/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/squeeze/applications/gwenview-i18n/debian/cdbs/versions.pl b/debian/squeeze/applications/gwenview-i18n/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/squeeze/applications/gwenview-i18n/debian/cdbs/versions.pl
+++ b/debian/squeeze/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/squeeze/applications/gwenview/debian/cdbs/versions.pl b/debian/squeeze/applications/gwenview/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/squeeze/applications/gwenview/debian/cdbs/versions.pl
+++ b/debian/squeeze/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/squeeze/applications/k3b/debian/cdbs/versions.pl b/debian/squeeze/applications/k3b/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/squeeze/applications/k3b/debian/cdbs/versions.pl
+++ b/debian/squeeze/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/squeeze/applications/k9copy/debian/cdbs/versions.pl b/debian/squeeze/applications/k9copy/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/squeeze/applications/k9copy/debian/cdbs/versions.pl
+++ b/debian/squeeze/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/squeeze/applications/kaffeine/debian/cdbs/versions.pl b/debian/squeeze/applications/kaffeine/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/squeeze/applications/kaffeine/debian/cdbs/versions.pl
+++ b/debian/squeeze/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/squeeze/applications/katapult/debian/cdbs/versions.pl b/debian/squeeze/applications/katapult/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/squeeze/applications/katapult/debian/cdbs/versions.pl
+++ b/debian/squeeze/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/squeeze/applications/kbarcode/debian/cdbs/versions.pl b/debian/squeeze/applications/kbarcode/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/squeeze/applications/kbarcode/debian/cdbs/versions.pl
+++ b/debian/squeeze/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/squeeze/applications/kbookreader/debian/cdbs/versions.pl b/debian/squeeze/applications/kbookreader/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/squeeze/applications/kbookreader/debian/cdbs/versions.pl
+++ b/debian/squeeze/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/squeeze/applications/kcpuload/debian/cdbs/versions.pl b/debian/squeeze/applications/kcpuload/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/squeeze/applications/kcpuload/debian/cdbs/versions.pl
+++ b/debian/squeeze/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/squeeze/applications/kdbusnotification/debian/cdbs/versions.pl b/debian/squeeze/applications/kdbusnotification/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/squeeze/applications/kdbusnotification/debian/cdbs/versions.pl
+++ b/debian/squeeze/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/squeeze/applications/kdiff3/debian/cdbs/versions.pl b/debian/squeeze/applications/kdiff3/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/squeeze/applications/kdiff3/debian/cdbs/versions.pl
+++ b/debian/squeeze/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/squeeze/applications/kdirstat/debian/cdbs/versions.pl b/debian/squeeze/applications/kdirstat/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/squeeze/applications/kdirstat/debian/cdbs/versions.pl
+++ b/debian/squeeze/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/squeeze/applications/keep/debian/cdbs/versions.pl b/debian/squeeze/applications/keep/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/squeeze/applications/keep/debian/cdbs/versions.pl
+++ b/debian/squeeze/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/squeeze/applications/kerry/debian/cdbs/versions.pl b/debian/squeeze/applications/kerry/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/squeeze/applications/kerry/debian/cdbs/versions.pl
+++ b/debian/squeeze/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/squeeze/applications/kgtk-qt3/debian/cdbs/versions.pl b/debian/squeeze/applications/kgtk-qt3/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/squeeze/applications/kgtk-qt3/debian/cdbs/versions.pl
+++ b/debian/squeeze/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/squeeze/applications/kile/debian/cdbs/versions.pl b/debian/squeeze/applications/kile/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/squeeze/applications/kile/debian/cdbs/versions.pl
+++ b/debian/squeeze/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/squeeze/applications/kiosktool/debian/cdbs/versions.pl b/debian/squeeze/applications/kiosktool/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/squeeze/applications/kiosktool/debian/cdbs/versions.pl
+++ b/debian/squeeze/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/squeeze/applications/kmplayer/debian/cdbs/versions.pl b/debian/squeeze/applications/kmplayer/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/squeeze/applications/kmplayer/debian/cdbs/versions.pl
+++ b/debian/squeeze/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/squeeze/applications/kmymoney/debian/cdbs/versions.pl b/debian/squeeze/applications/kmymoney/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/squeeze/applications/kmymoney/debian/cdbs/versions.pl
+++ b/debian/squeeze/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/squeeze/applications/knemo/debian/cdbs/versions.pl b/debian/squeeze/applications/knemo/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/squeeze/applications/knemo/debian/cdbs/versions.pl
+++ b/debian/squeeze/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/squeeze/applications/knetstats/debian/cdbs/versions.pl b/debian/squeeze/applications/knetstats/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/squeeze/applications/knetstats/debian/cdbs/versions.pl
+++ b/debian/squeeze/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/squeeze/applications/knetworkmanager.cmake/debian/cdbs/versions.pl b/debian/squeeze/applications/knetworkmanager.cmake/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/squeeze/applications/knetworkmanager.cmake/debian/cdbs/versions.pl
+++ b/debian/squeeze/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/squeeze/applications/knetworkmanager8/debian/cdbs/versions.pl b/debian/squeeze/applications/knetworkmanager8/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/squeeze/applications/knetworkmanager8/debian/cdbs/versions.pl
+++ b/debian/squeeze/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/squeeze/applications/knetworkmanager9/debian/cdbs/versions.pl b/debian/squeeze/applications/knetworkmanager9/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/squeeze/applications/knetworkmanager9/debian/cdbs/versions.pl
+++ b/debian/squeeze/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/squeeze/applications/koffice/debian/cdbs/versions.pl b/debian/squeeze/applications/koffice/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/squeeze/applications/koffice/debian/cdbs/versions.pl
+++ b/debian/squeeze/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/squeeze/applications/konversation/debian/cdbs/versions.pl b/debian/squeeze/applications/konversation/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/squeeze/applications/konversation/debian/cdbs/versions.pl
+++ b/debian/squeeze/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/squeeze/applications/kopete-otr/debian/cdbs/versions.pl b/debian/squeeze/applications/kopete-otr/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/squeeze/applications/kopete-otr/debian/cdbs/versions.pl
+++ b/debian/squeeze/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/squeeze/applications/kpilot/debian/cdbs/versions.pl b/debian/squeeze/applications/kpilot/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/squeeze/applications/kpilot/debian/cdbs/versions.pl
+++ b/debian/squeeze/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/squeeze/applications/kpowersave-nohal/debian/cdbs/versions.pl b/debian/squeeze/applications/kpowersave-nohal/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/squeeze/applications/kpowersave-nohal/debian/cdbs/versions.pl
+++ b/debian/squeeze/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/squeeze/applications/kpowersave.cmake/debian/cdbs/versions.pl b/debian/squeeze/applications/kpowersave.cmake/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/squeeze/applications/kpowersave.cmake/debian/cdbs/versions.pl
+++ b/debian/squeeze/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/squeeze/applications/kpowersave/debian/cdbs/versions.pl b/debian/squeeze/applications/kpowersave/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/squeeze/applications/kpowersave/debian/cdbs/versions.pl
+++ b/debian/squeeze/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/squeeze/applications/krename/debian/cdbs/versions.pl b/debian/squeeze/applications/krename/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/squeeze/applications/krename/debian/cdbs/versions.pl
+++ b/debian/squeeze/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/squeeze/applications/krusader/debian/cdbs/versions.pl b/debian/squeeze/applications/krusader/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/squeeze/applications/krusader/debian/cdbs/versions.pl
+++ b/debian/squeeze/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/squeeze/applications/ksystemlog/debian/cdbs/versions.pl b/debian/squeeze/applications/ksystemlog/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/squeeze/applications/ksystemlog/debian/cdbs/versions.pl
+++ b/debian/squeeze/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/squeeze/applications/ktorrent/debian/cdbs/versions.pl b/debian/squeeze/applications/ktorrent/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/squeeze/applications/ktorrent/debian/cdbs/versions.pl
+++ b/debian/squeeze/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/squeeze/applications/kuickshow/debian/cdbs/versions.pl b/debian/squeeze/applications/kuickshow/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/squeeze/applications/kuickshow/debian/cdbs/versions.pl
+++ b/debian/squeeze/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/squeeze/applications/kvkbd/debian/cdbs/versions.pl b/debian/squeeze/applications/kvkbd/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/squeeze/applications/kvkbd/debian/cdbs/versions.pl
+++ b/debian/squeeze/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/squeeze/applications/rosegarden/debian/cdbs/versions.pl b/debian/squeeze/applications/rosegarden/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/squeeze/applications/rosegarden/debian/cdbs/versions.pl
+++ b/debian/squeeze/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/squeeze/applications/smb4k/debian/cdbs/versions.pl b/debian/squeeze/applications/smb4k/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/squeeze/applications/smb4k/debian/cdbs/versions.pl
+++ b/debian/squeeze/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/squeeze/applications/soundkonverter/debian/cdbs/versions.pl b/debian/squeeze/applications/soundkonverter/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/squeeze/applications/soundkonverter/debian/cdbs/versions.pl
+++ b/debian/squeeze/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/squeeze/applications/tde-style-qtcurve/debian/cdbs/versions.pl b/debian/squeeze/applications/tde-style-qtcurve/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/squeeze/applications/tde-style-qtcurve/debian/cdbs/versions.pl
+++ b/debian/squeeze/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/squeeze/applications/tde-systemsettings/debian/cdbs/versions.pl b/debian/squeeze/applications/tde-systemsettings/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/squeeze/applications/tde-systemsettings/debian/cdbs/versions.pl
+++ b/debian/squeeze/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/squeeze/applications/tdeio-apt/debian/cdbs/versions.pl b/debian/squeeze/applications/tdeio-apt/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/squeeze/applications/tdeio-apt/debian/cdbs/versions.pl
+++ b/debian/squeeze/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/squeeze/applications/tdeio-locate/debian/cdbs/versions.pl b/debian/squeeze/applications/tdeio-locate/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/squeeze/applications/tdeio-locate/debian/cdbs/versions.pl
+++ b/debian/squeeze/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/squeeze/applications/tdeio-umountwrapper/debian/cdbs/versions.pl b/debian/squeeze/applications/tdeio-umountwrapper/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/squeeze/applications/tdeio-umountwrapper/debian/cdbs/versions.pl
+++ b/debian/squeeze/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/squeeze/applications/tdesudo/debian/cdbs/versions.pl b/debian/squeeze/applications/tdesudo/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/squeeze/applications/tdesudo/debian/cdbs/versions.pl
+++ b/debian/squeeze/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/squeeze/applications/tdesvn/debian/cdbs/versions.pl b/debian/squeeze/applications/tdesvn/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/squeeze/applications/tdesvn/debian/cdbs/versions.pl
+++ b/debian/squeeze/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/squeeze/applications/tdmtheme/debian/cdbs/versions.pl b/debian/squeeze/applications/tdmtheme/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/squeeze/applications/tdmtheme/debian/cdbs/versions.pl
+++ b/debian/squeeze/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/squeeze/applications/twin-style-crystal/debian/cdbs/versions.pl b/debian/squeeze/applications/twin-style-crystal/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/squeeze/applications/twin-style-crystal/debian/cdbs/versions.pl
+++ b/debian/squeeze/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/squeeze/applications/wlassistant/debian/cdbs/versions.pl b/debian/squeeze/applications/wlassistant/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/squeeze/applications/wlassistant/debian/cdbs/versions.pl
+++ b/debian/squeeze/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/squeeze/applications/yakuake/debian/cdbs/versions.pl b/debian/squeeze/applications/yakuake/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/squeeze/applications/yakuake/debian/cdbs/versions.pl
+++ b/debian/squeeze/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;
diff --git a/debian/squeeze/dependencies/arts/debian/cdbs/versions.pl b/debian/squeeze/dependencies/arts/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/squeeze/dependencies/arts/debian/cdbs/versions.pl
+++ b/debian/squeeze/dependencies/arts/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/squeeze/libraries/kipi-plugins/debian/cdbs/versions.pl b/debian/squeeze/libraries/kipi-plugins/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/squeeze/libraries/kipi-plugins/debian/cdbs/versions.pl
+++ b/debian/squeeze/libraries/kipi-plugins/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/squeeze/libraries/libkdcraw/debian/cdbs/versions.pl b/debian/squeeze/libraries/libkdcraw/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/squeeze/libraries/libkdcraw/debian/cdbs/versions.pl
+++ b/debian/squeeze/libraries/libkdcraw/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/squeeze/libraries/libkexiv2/debian/cdbs/versions.pl b/debian/squeeze/libraries/libkexiv2/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/squeeze/libraries/libkexiv2/debian/cdbs/versions.pl
+++ b/debian/squeeze/libraries/libkexiv2/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/squeeze/libraries/libkipi/debian/cdbs/versions.pl b/debian/squeeze/libraries/libkipi/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/squeeze/libraries/libkipi/debian/cdbs/versions.pl
+++ b/debian/squeeze/libraries/libkipi/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/squeeze/tdeaccessibility/debian/cdbs/versions.pl b/debian/squeeze/tdeaccessibility/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/squeeze/tdeaccessibility/debian/cdbs/versions.pl
+++ b/debian/squeeze/tdeaccessibility/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/squeeze/tdeaddons/debian/cdbs/versions.pl b/debian/squeeze/tdeaddons/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/squeeze/tdeaddons/debian/cdbs/versions.pl
+++ b/debian/squeeze/tdeaddons/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/squeeze/tdeadmin/debian/cdbs/versions.pl b/debian/squeeze/tdeadmin/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/squeeze/tdeadmin/debian/cdbs/versions.pl
+++ b/debian/squeeze/tdeadmin/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/squeeze/tdeartwork/debian/cdbs/versions.pl b/debian/squeeze/tdeartwork/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/squeeze/tdeartwork/debian/cdbs/versions.pl
+++ b/debian/squeeze/tdeartwork/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/squeeze/tdebase/debian/cdbs/versions.pl b/debian/squeeze/tdebase/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/squeeze/tdebase/debian/cdbs/versions.pl
+++ b/debian/squeeze/tdebase/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/squeeze/tdebindings/debian/cdbs/versions.pl b/debian/squeeze/tdebindings/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/squeeze/tdebindings/debian/cdbs/versions.pl
+++ b/debian/squeeze/tdebindings/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/squeeze/tdeedu/debian/cdbs/versions.pl b/debian/squeeze/tdeedu/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/squeeze/tdeedu/debian/cdbs/versions.pl
+++ b/debian/squeeze/tdeedu/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/squeeze/tdegames/debian/cdbs/versions.pl b/debian/squeeze/tdegames/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/squeeze/tdegames/debian/cdbs/versions.pl
+++ b/debian/squeeze/tdegames/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/squeeze/tdegraphics/debian/cdbs/versions.pl b/debian/squeeze/tdegraphics/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/squeeze/tdegraphics/debian/cdbs/versions.pl
+++ b/debian/squeeze/tdegraphics/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/squeeze/tdelibs/debian/cdbs/versions.pl b/debian/squeeze/tdelibs/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/squeeze/tdelibs/debian/cdbs/versions.pl
+++ b/debian/squeeze/tdelibs/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/squeeze/tdemultimedia/debian/cdbs/versions.pl b/debian/squeeze/tdemultimedia/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/squeeze/tdemultimedia/debian/cdbs/versions.pl
+++ b/debian/squeeze/tdemultimedia/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/squeeze/tdenetwork/debian/cdbs/versions.pl b/debian/squeeze/tdenetwork/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/squeeze/tdenetwork/debian/cdbs/versions.pl
+++ b/debian/squeeze/tdenetwork/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/squeeze/tdepim/debian/cdbs/versions.pl b/debian/squeeze/tdepim/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/squeeze/tdepim/debian/cdbs/versions.pl
+++ b/debian/squeeze/tdepim/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/squeeze/tdesdk/debian/cdbs/versions.pl b/debian/squeeze/tdesdk/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/squeeze/tdesdk/debian/cdbs/versions.pl
+++ b/debian/squeeze/tdesdk/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/squeeze/tdetoys/debian/cdbs/versions.pl b/debian/squeeze/tdetoys/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/squeeze/tdetoys/debian/cdbs/versions.pl
+++ b/debian/squeeze/tdetoys/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/squeeze/tdeutils/debian/cdbs/versions.pl b/debian/squeeze/tdeutils/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/squeeze/tdeutils/debian/cdbs/versions.pl
+++ b/debian/squeeze/tdeutils/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/squeeze/tdevelop/debian/cdbs/versions.pl b/debian/squeeze/tdevelop/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/squeeze/tdevelop/debian/cdbs/versions.pl
+++ b/debian/squeeze/tdevelop/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/squeeze/tdewebdev/debian/cdbs/versions.pl b/debian/squeeze/tdewebdev/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/squeeze/tdewebdev/debian/cdbs/versions.pl
+++ b/debian/squeeze/tdewebdev/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/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;
diff --git a/debian/wheezy/dependencies/arts/debian/cdbs/versions.pl b/debian/wheezy/dependencies/arts/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/wheezy/dependencies/arts/debian/cdbs/versions.pl
+++ b/debian/wheezy/dependencies/arts/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/libraries/kipi-plugins/debian/cdbs/versions.pl b/debian/wheezy/libraries/kipi-plugins/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/wheezy/libraries/kipi-plugins/debian/cdbs/versions.pl
+++ b/debian/wheezy/libraries/kipi-plugins/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/libraries/libkdcraw/debian/cdbs/versions.pl b/debian/wheezy/libraries/libkdcraw/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/wheezy/libraries/libkdcraw/debian/cdbs/versions.pl
+++ b/debian/wheezy/libraries/libkdcraw/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/libraries/libkexiv2/debian/cdbs/versions.pl b/debian/wheezy/libraries/libkexiv2/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/wheezy/libraries/libkexiv2/debian/cdbs/versions.pl
+++ b/debian/wheezy/libraries/libkexiv2/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/libraries/libkipi/debian/cdbs/versions.pl b/debian/wheezy/libraries/libkipi/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/wheezy/libraries/libkipi/debian/cdbs/versions.pl
+++ b/debian/wheezy/libraries/libkipi/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/tdeaccessibility/debian/cdbs/versions.pl b/debian/wheezy/tdeaccessibility/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/wheezy/tdeaccessibility/debian/cdbs/versions.pl
+++ b/debian/wheezy/tdeaccessibility/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/tdeaddons/debian/cdbs/versions.pl b/debian/wheezy/tdeaddons/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/wheezy/tdeaddons/debian/cdbs/versions.pl
+++ b/debian/wheezy/tdeaddons/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/tdeadmin/debian/cdbs/versions.pl b/debian/wheezy/tdeadmin/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/wheezy/tdeadmin/debian/cdbs/versions.pl
+++ b/debian/wheezy/tdeadmin/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/tdeartwork/debian/cdbs/versions.pl b/debian/wheezy/tdeartwork/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/wheezy/tdeartwork/debian/cdbs/versions.pl
+++ b/debian/wheezy/tdeartwork/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/tdebase/debian/cdbs/versions.pl b/debian/wheezy/tdebase/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/wheezy/tdebase/debian/cdbs/versions.pl
+++ b/debian/wheezy/tdebase/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/tdebindings/debian/cdbs/versions.pl b/debian/wheezy/tdebindings/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/wheezy/tdebindings/debian/cdbs/versions.pl
+++ b/debian/wheezy/tdebindings/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/tdeedu/debian/cdbs/versions.pl b/debian/wheezy/tdeedu/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/wheezy/tdeedu/debian/cdbs/versions.pl
+++ b/debian/wheezy/tdeedu/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/tdegames/debian/cdbs/versions.pl b/debian/wheezy/tdegames/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/wheezy/tdegames/debian/cdbs/versions.pl
+++ b/debian/wheezy/tdegames/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/tdegraphics/debian/cdbs/versions.pl b/debian/wheezy/tdegraphics/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/wheezy/tdegraphics/debian/cdbs/versions.pl
+++ b/debian/wheezy/tdegraphics/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/tdelibs/debian/cdbs/versions.pl b/debian/wheezy/tdelibs/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/wheezy/tdelibs/debian/cdbs/versions.pl
+++ b/debian/wheezy/tdelibs/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/tdemultimedia/debian/cdbs/versions.pl b/debian/wheezy/tdemultimedia/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/wheezy/tdemultimedia/debian/cdbs/versions.pl
+++ b/debian/wheezy/tdemultimedia/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/tdenetwork/debian/cdbs/versions.pl b/debian/wheezy/tdenetwork/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/wheezy/tdenetwork/debian/cdbs/versions.pl
+++ b/debian/wheezy/tdenetwork/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/tdepim/debian/cdbs/versions.pl b/debian/wheezy/tdepim/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/wheezy/tdepim/debian/cdbs/versions.pl
+++ b/debian/wheezy/tdepim/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/tdesdk/debian/cdbs/versions.pl b/debian/wheezy/tdesdk/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/wheezy/tdesdk/debian/cdbs/versions.pl
+++ b/debian/wheezy/tdesdk/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/tdetoys/debian/cdbs/versions.pl b/debian/wheezy/tdetoys/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/wheezy/tdetoys/debian/cdbs/versions.pl
+++ b/debian/wheezy/tdetoys/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/tdeutils/debian/cdbs/versions.pl b/debian/wheezy/tdeutils/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/wheezy/tdeutils/debian/cdbs/versions.pl
+++ b/debian/wheezy/tdeutils/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/tdevelop/debian/cdbs/versions.pl b/debian/wheezy/tdevelop/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/wheezy/tdevelop/debian/cdbs/versions.pl
+++ b/debian/wheezy/tdevelop/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/tdewebdev/debian/cdbs/versions.pl b/debian/wheezy/tdewebdev/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/wheezy/tdewebdev/debian/cdbs/versions.pl
+++ b/debian/wheezy/tdewebdev/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/ubuntu/maverick/applications/abakus/debian/cdbs/versions.pl b/ubuntu/maverick/applications/abakus/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/maverick/applications/abakus/debian/cdbs/versions.pl
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/adept/debian/cdbs/versions.pl b/ubuntu/maverick/applications/adept/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/maverick/applications/adept/debian/cdbs/versions.pl
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/amarok.cmake/debian/cdbs/versions.pl b/ubuntu/maverick/applications/amarok.cmake/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/maverick/applications/amarok.cmake/debian/cdbs/versions.pl
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/amarok/debian/cdbs/versions.pl b/ubuntu/maverick/applications/amarok/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/maverick/applications/amarok/debian/cdbs/versions.pl
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/bibletime/debian/cdbs/versions.pl b/ubuntu/maverick/applications/bibletime/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/maverick/applications/bibletime/debian/cdbs/versions.pl
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/compizconfig-backend-tdeconfig/debian/cdbs/versions.pl b/ubuntu/maverick/applications/compizconfig-backend-tdeconfig/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/maverick/applications/compizconfig-backend-tdeconfig/debian/cdbs/versions.pl
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/digikam/debian/cdbs/versions.pl b/ubuntu/maverick/applications/digikam/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/maverick/applications/digikam/debian/cdbs/versions.pl
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/dolphin/debian/cdbs/versions.pl b/ubuntu/maverick/applications/dolphin/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/maverick/applications/dolphin/debian/cdbs/versions.pl
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/filelight-l10n/debian/cdbs/versions.pl b/ubuntu/maverick/applications/filelight-l10n/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/maverick/applications/filelight-l10n/debian/cdbs/versions.pl
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/filelight/debian/cdbs/versions.pl b/ubuntu/maverick/applications/filelight/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/maverick/applications/filelight/debian/cdbs/versions.pl
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/gtk-qt-engine/debian/cdbs/versions.pl b/ubuntu/maverick/applications/gtk-qt-engine/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/maverick/applications/gtk-qt-engine/debian/cdbs/versions.pl
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/gwenview-i18n/debian/cdbs/versions.pl b/ubuntu/maverick/applications/gwenview-i18n/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/maverick/applications/gwenview-i18n/debian/cdbs/versions.pl
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/gwenview/debian/cdbs/versions.pl b/ubuntu/maverick/applications/gwenview/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/maverick/applications/gwenview/debian/cdbs/versions.pl
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/k3b/debian/cdbs/versions.pl b/ubuntu/maverick/applications/k3b/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/maverick/applications/k3b/debian/cdbs/versions.pl
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/k9copy/debian/cdbs/versions.pl b/ubuntu/maverick/applications/k9copy/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/maverick/applications/k9copy/debian/cdbs/versions.pl
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/kaffeine/debian/cdbs/versions.pl b/ubuntu/maverick/applications/kaffeine/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/maverick/applications/kaffeine/debian/cdbs/versions.pl
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/katapult/debian/cdbs/versions.pl b/ubuntu/maverick/applications/katapult/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/maverick/applications/katapult/debian/cdbs/versions.pl
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/kbarcode/debian/cdbs/versions.pl b/ubuntu/maverick/applications/kbarcode/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/maverick/applications/kbarcode/debian/cdbs/versions.pl
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/kbookreader/debian/cdbs/versions.pl b/ubuntu/maverick/applications/kbookreader/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/maverick/applications/kbookreader/debian/cdbs/versions.pl
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/kcpuload/debian/cdbs/versions.pl b/ubuntu/maverick/applications/kcpuload/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/maverick/applications/kcpuload/debian/cdbs/versions.pl
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/kdbusnotification/debian/cdbs/versions.pl b/ubuntu/maverick/applications/kdbusnotification/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/maverick/applications/kdbusnotification/debian/cdbs/versions.pl
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/kdiff3/debian/cdbs/versions.pl b/ubuntu/maverick/applications/kdiff3/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/maverick/applications/kdiff3/debian/cdbs/versions.pl
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/kdirstat/debian/cdbs/versions.pl b/ubuntu/maverick/applications/kdirstat/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/maverick/applications/kdirstat/debian/cdbs/versions.pl
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/keep/debian/cdbs/versions.pl b/ubuntu/maverick/applications/keep/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/maverick/applications/keep/debian/cdbs/versions.pl
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/kerry/debian/cdbs/versions.pl b/ubuntu/maverick/applications/kerry/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/maverick/applications/kerry/debian/cdbs/versions.pl
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/kgtk-qt3/debian/cdbs/versions.pl b/ubuntu/maverick/applications/kgtk-qt3/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/maverick/applications/kgtk-qt3/debian/cdbs/versions.pl
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/kile/debian/cdbs/versions.pl b/ubuntu/maverick/applications/kile/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/maverick/applications/kile/debian/cdbs/versions.pl
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/kiosktool/debian/cdbs/versions.pl b/ubuntu/maverick/applications/kiosktool/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/maverick/applications/kiosktool/debian/cdbs/versions.pl
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/kmplayer/debian/cdbs/versions.pl b/ubuntu/maverick/applications/kmplayer/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/maverick/applications/kmplayer/debian/cdbs/versions.pl
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/kmymoney/debian/cdbs/versions.pl b/ubuntu/maverick/applications/kmymoney/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/maverick/applications/kmymoney/debian/cdbs/versions.pl
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/knemo/debian/cdbs/versions.pl b/ubuntu/maverick/applications/knemo/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/maverick/applications/knemo/debian/cdbs/versions.pl
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/knetstats/debian/cdbs/versions.pl b/ubuntu/maverick/applications/knetstats/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/maverick/applications/knetstats/debian/cdbs/versions.pl
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/knetworkmanager.cmake/debian/cdbs/versions.pl b/ubuntu/maverick/applications/knetworkmanager.cmake/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/maverick/applications/knetworkmanager.cmake/debian/cdbs/versions.pl
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/knetworkmanager8/debian/cdbs/versions.pl b/ubuntu/maverick/applications/knetworkmanager8/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/maverick/applications/knetworkmanager8/debian/cdbs/versions.pl
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/knetworkmanager9/debian/cdbs/versions.pl b/ubuntu/maverick/applications/knetworkmanager9/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/maverick/applications/knetworkmanager9/debian/cdbs/versions.pl
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/koffice/debian/cdbs/versions.pl b/ubuntu/maverick/applications/koffice/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/maverick/applications/koffice/debian/cdbs/versions.pl
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/konversation/debian/cdbs/versions.pl b/ubuntu/maverick/applications/konversation/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/maverick/applications/konversation/debian/cdbs/versions.pl
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/kopete-otr/debian/cdbs/versions.pl b/ubuntu/maverick/applications/kopete-otr/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/maverick/applications/kopete-otr/debian/cdbs/versions.pl
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/kpilot/debian/cdbs/versions.pl b/ubuntu/maverick/applications/kpilot/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/maverick/applications/kpilot/debian/cdbs/versions.pl
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/kpowersave-nohal/debian/cdbs/versions.pl b/ubuntu/maverick/applications/kpowersave-nohal/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/maverick/applications/kpowersave-nohal/debian/cdbs/versions.pl
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/kpowersave.cmake/debian/cdbs/versions.pl b/ubuntu/maverick/applications/kpowersave.cmake/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/maverick/applications/kpowersave.cmake/debian/cdbs/versions.pl
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/kpowersave/debian/cdbs/versions.pl b/ubuntu/maverick/applications/kpowersave/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/maverick/applications/kpowersave/debian/cdbs/versions.pl
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/krename/debian/cdbs/versions.pl b/ubuntu/maverick/applications/krename/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/maverick/applications/krename/debian/cdbs/versions.pl
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/krusader/debian/cdbs/versions.pl b/ubuntu/maverick/applications/krusader/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/maverick/applications/krusader/debian/cdbs/versions.pl
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/ksystemlog/debian/cdbs/versions.pl b/ubuntu/maverick/applications/ksystemlog/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/maverick/applications/ksystemlog/debian/cdbs/versions.pl
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/ktorrent/debian/cdbs/versions.pl b/ubuntu/maverick/applications/ktorrent/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/maverick/applications/ktorrent/debian/cdbs/versions.pl
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/kuickshow/debian/cdbs/versions.pl b/ubuntu/maverick/applications/kuickshow/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/maverick/applications/kuickshow/debian/cdbs/versions.pl
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/kvkbd/debian/cdbs/versions.pl b/ubuntu/maverick/applications/kvkbd/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/maverick/applications/kvkbd/debian/cdbs/versions.pl
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/rosegarden/debian/cdbs/versions.pl b/ubuntu/maverick/applications/rosegarden/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/maverick/applications/rosegarden/debian/cdbs/versions.pl
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/smb4k/debian/cdbs/versions.pl b/ubuntu/maverick/applications/smb4k/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/maverick/applications/smb4k/debian/cdbs/versions.pl
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/soundkonverter/debian/cdbs/versions.pl b/ubuntu/maverick/applications/soundkonverter/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/maverick/applications/soundkonverter/debian/cdbs/versions.pl
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/tde-style-qtcurve/debian/cdbs/versions.pl b/ubuntu/maverick/applications/tde-style-qtcurve/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/maverick/applications/tde-style-qtcurve/debian/cdbs/versions.pl
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/tde-systemsettings/debian/cdbs/versions.pl b/ubuntu/maverick/applications/tde-systemsettings/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/maverick/applications/tde-systemsettings/debian/cdbs/versions.pl
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/tdeio-apt/debian/cdbs/versions.pl b/ubuntu/maverick/applications/tdeio-apt/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/maverick/applications/tdeio-apt/debian/cdbs/versions.pl
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/tdeio-locate/debian/cdbs/versions.pl b/ubuntu/maverick/applications/tdeio-locate/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/maverick/applications/tdeio-locate/debian/cdbs/versions.pl
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/tdeio-umountwrapper/debian/cdbs/versions.pl b/ubuntu/maverick/applications/tdeio-umountwrapper/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/maverick/applications/tdeio-umountwrapper/debian/cdbs/versions.pl
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/tdesudo/debian/cdbs/versions.pl b/ubuntu/maverick/applications/tdesudo/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/maverick/applications/tdesudo/debian/cdbs/versions.pl
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/tdesvn/debian/cdbs/versions.pl b/ubuntu/maverick/applications/tdesvn/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/maverick/applications/tdesvn/debian/cdbs/versions.pl
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/tdmtheme/debian/cdbs/versions.pl b/ubuntu/maverick/applications/tdmtheme/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/maverick/applications/tdmtheme/debian/cdbs/versions.pl
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/twin-style-crystal/debian/cdbs/versions.pl b/ubuntu/maverick/applications/twin-style-crystal/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/maverick/applications/twin-style-crystal/debian/cdbs/versions.pl
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/wlassistant/debian/cdbs/versions.pl b/ubuntu/maverick/applications/wlassistant/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/maverick/applications/wlassistant/debian/cdbs/versions.pl
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/yakuake/debian/cdbs/versions.pl b/ubuntu/maverick/applications/yakuake/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/maverick/applications/yakuake/debian/cdbs/versions.pl
+++ b/ubuntu/maverick/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;
diff --git a/ubuntu/maverick/dependencies/arts/debian/cdbs/versions.pl b/ubuntu/maverick/dependencies/arts/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/maverick/dependencies/arts/debian/cdbs/versions.pl
+++ b/ubuntu/maverick/dependencies/arts/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/ubuntu/maverick/kdegraphics.automake/debian/cdbs/versions.pl b/ubuntu/maverick/kdegraphics.automake/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/cdbs/versions.pl
+++ b/ubuntu/maverick/kdegraphics.automake/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/ubuntu/maverick/kdevelop.cmake/debian/cdbs/versions.pl b/ubuntu/maverick/kdevelop.cmake/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/maverick/kdevelop.cmake/debian/cdbs/versions.pl
+++ b/ubuntu/maverick/kdevelop.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/ubuntu/maverick/libraries/kipi-plugins/debian/cdbs/versions.pl b/ubuntu/maverick/libraries/kipi-plugins/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/maverick/libraries/kipi-plugins/debian/cdbs/versions.pl
+++ b/ubuntu/maverick/libraries/kipi-plugins/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/ubuntu/maverick/libraries/libkdcraw/debian/cdbs/versions.pl b/ubuntu/maverick/libraries/libkdcraw/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/maverick/libraries/libkdcraw/debian/cdbs/versions.pl
+++ b/ubuntu/maverick/libraries/libkdcraw/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/ubuntu/maverick/libraries/libkexiv2/debian/cdbs/versions.pl b/ubuntu/maverick/libraries/libkexiv2/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/maverick/libraries/libkexiv2/debian/cdbs/versions.pl
+++ b/ubuntu/maverick/libraries/libkexiv2/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/ubuntu/maverick/libraries/libkipi/debian/cdbs/versions.pl b/ubuntu/maverick/libraries/libkipi/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/maverick/libraries/libkipi/debian/cdbs/versions.pl
+++ b/ubuntu/maverick/libraries/libkipi/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/ubuntu/maverick/tdeaccessibility/debian/cdbs/versions.pl b/ubuntu/maverick/tdeaccessibility/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/maverick/tdeaccessibility/debian/cdbs/versions.pl
+++ b/ubuntu/maverick/tdeaccessibility/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/ubuntu/maverick/tdeaddons/debian/cdbs/versions.pl b/ubuntu/maverick/tdeaddons/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/maverick/tdeaddons/debian/cdbs/versions.pl
+++ b/ubuntu/maverick/tdeaddons/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/ubuntu/maverick/tdeadmin/debian/cdbs/versions.pl b/ubuntu/maverick/tdeadmin/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/maverick/tdeadmin/debian/cdbs/versions.pl
+++ b/ubuntu/maverick/tdeadmin/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/ubuntu/maverick/tdeartwork/debian/cdbs/versions.pl b/ubuntu/maverick/tdeartwork/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/maverick/tdeartwork/debian/cdbs/versions.pl
+++ b/ubuntu/maverick/tdeartwork/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/ubuntu/maverick/tdebase/debian/cdbs/versions.pl b/ubuntu/maverick/tdebase/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/maverick/tdebase/debian/cdbs/versions.pl
+++ b/ubuntu/maverick/tdebase/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/ubuntu/maverick/tdebindings/debian/cdbs/versions.pl b/ubuntu/maverick/tdebindings/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/maverick/tdebindings/debian/cdbs/versions.pl
+++ b/ubuntu/maverick/tdebindings/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/ubuntu/maverick/tdeedu/debian/cdbs/versions.pl b/ubuntu/maverick/tdeedu/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/maverick/tdeedu/debian/cdbs/versions.pl
+++ b/ubuntu/maverick/tdeedu/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/ubuntu/maverick/tdegames/debian/cdbs/versions.pl b/ubuntu/maverick/tdegames/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/maverick/tdegames/debian/cdbs/versions.pl
+++ b/ubuntu/maverick/tdegames/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/ubuntu/maverick/tdegraphics/debian/cdbs/versions.pl b/ubuntu/maverick/tdegraphics/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/maverick/tdegraphics/debian/cdbs/versions.pl
+++ b/ubuntu/maverick/tdegraphics/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/ubuntu/maverick/tdelibs/debian/cdbs/versions.pl b/ubuntu/maverick/tdelibs/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/maverick/tdelibs/debian/cdbs/versions.pl
+++ b/ubuntu/maverick/tdelibs/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/ubuntu/maverick/tdemultimedia/debian/cdbs/versions.pl b/ubuntu/maverick/tdemultimedia/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/maverick/tdemultimedia/debian/cdbs/versions.pl
+++ b/ubuntu/maverick/tdemultimedia/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/ubuntu/maverick/tdenetwork/debian/cdbs/versions.pl b/ubuntu/maverick/tdenetwork/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/maverick/tdenetwork/debian/cdbs/versions.pl
+++ b/ubuntu/maverick/tdenetwork/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/ubuntu/maverick/tdepim/debian/cdbs/versions.pl b/ubuntu/maverick/tdepim/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/maverick/tdepim/debian/cdbs/versions.pl
+++ b/ubuntu/maverick/tdepim/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/ubuntu/maverick/tdesdk/debian/cdbs/versions.pl b/ubuntu/maverick/tdesdk/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/maverick/tdesdk/debian/cdbs/versions.pl
+++ b/ubuntu/maverick/tdesdk/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/ubuntu/maverick/tdetoys/debian/cdbs/versions.pl b/ubuntu/maverick/tdetoys/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/maverick/tdetoys/debian/cdbs/versions.pl
+++ b/ubuntu/maverick/tdetoys/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/ubuntu/maverick/tdeutils/debian/cdbs/versions.pl b/ubuntu/maverick/tdeutils/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/maverick/tdeutils/debian/cdbs/versions.pl
+++ b/ubuntu/maverick/tdeutils/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/ubuntu/maverick/tdevelop/debian/cdbs/versions.pl b/ubuntu/maverick/tdevelop/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/maverick/tdevelop/debian/cdbs/versions.pl
+++ b/ubuntu/maverick/tdevelop/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/ubuntu/maverick/tdewebdev/debian/cdbs/versions.pl b/ubuntu/maverick/tdewebdev/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/maverick/tdewebdev/debian/cdbs/versions.pl
+++ b/ubuntu/maverick/tdewebdev/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/ubuntu/precise/applications/abakus/debian/cdbs/versions.pl b/ubuntu/precise/applications/abakus/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/precise/applications/abakus/debian/cdbs/versions.pl
+++ b/ubuntu/precise/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/ubuntu/precise/applications/adept/debian/cdbs/versions.pl b/ubuntu/precise/applications/adept/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/precise/applications/adept/debian/cdbs/versions.pl
+++ b/ubuntu/precise/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/ubuntu/precise/applications/amarok.cmake/debian/cdbs/versions.pl b/ubuntu/precise/applications/amarok.cmake/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/precise/applications/amarok.cmake/debian/cdbs/versions.pl
+++ b/ubuntu/precise/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/ubuntu/precise/applications/amarok/debian/cdbs/versions.pl b/ubuntu/precise/applications/amarok/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/precise/applications/amarok/debian/cdbs/versions.pl
+++ b/ubuntu/precise/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/ubuntu/precise/applications/bibletime/debian/cdbs/versions.pl b/ubuntu/precise/applications/bibletime/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/precise/applications/bibletime/debian/cdbs/versions.pl
+++ b/ubuntu/precise/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/ubuntu/precise/applications/compizconfig-backend-tdeconfig/debian/cdbs/versions.pl b/ubuntu/precise/applications/compizconfig-backend-tdeconfig/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/precise/applications/compizconfig-backend-tdeconfig/debian/cdbs/versions.pl
+++ b/ubuntu/precise/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/ubuntu/precise/applications/digikam/debian/cdbs/versions.pl b/ubuntu/precise/applications/digikam/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/precise/applications/digikam/debian/cdbs/versions.pl
+++ b/ubuntu/precise/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/ubuntu/precise/applications/dolphin/debian/cdbs/versions.pl b/ubuntu/precise/applications/dolphin/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/precise/applications/dolphin/debian/cdbs/versions.pl
+++ b/ubuntu/precise/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/ubuntu/precise/applications/filelight-l10n/debian/cdbs/versions.pl b/ubuntu/precise/applications/filelight-l10n/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/precise/applications/filelight-l10n/debian/cdbs/versions.pl
+++ b/ubuntu/precise/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/ubuntu/precise/applications/filelight/debian/cdbs/versions.pl b/ubuntu/precise/applications/filelight/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/precise/applications/filelight/debian/cdbs/versions.pl
+++ b/ubuntu/precise/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/ubuntu/precise/applications/gtk-qt-engine/debian/cdbs/versions.pl b/ubuntu/precise/applications/gtk-qt-engine/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/precise/applications/gtk-qt-engine/debian/cdbs/versions.pl
+++ b/ubuntu/precise/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/ubuntu/precise/applications/gwenview-i18n/debian/cdbs/versions.pl b/ubuntu/precise/applications/gwenview-i18n/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/precise/applications/gwenview-i18n/debian/cdbs/versions.pl
+++ b/ubuntu/precise/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/ubuntu/precise/applications/gwenview/debian/cdbs/versions.pl b/ubuntu/precise/applications/gwenview/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/precise/applications/gwenview/debian/cdbs/versions.pl
+++ b/ubuntu/precise/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/ubuntu/precise/applications/k3b/debian/cdbs/versions.pl b/ubuntu/precise/applications/k3b/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/precise/applications/k3b/debian/cdbs/versions.pl
+++ b/ubuntu/precise/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/ubuntu/precise/applications/k9copy/debian/cdbs/versions.pl b/ubuntu/precise/applications/k9copy/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/precise/applications/k9copy/debian/cdbs/versions.pl
+++ b/ubuntu/precise/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/ubuntu/precise/applications/kaffeine/debian/cdbs/versions.pl b/ubuntu/precise/applications/kaffeine/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/precise/applications/kaffeine/debian/cdbs/versions.pl
+++ b/ubuntu/precise/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/ubuntu/precise/applications/katapult/debian/cdbs/versions.pl b/ubuntu/precise/applications/katapult/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/precise/applications/katapult/debian/cdbs/versions.pl
+++ b/ubuntu/precise/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/ubuntu/precise/applications/kbarcode/debian/cdbs/versions.pl b/ubuntu/precise/applications/kbarcode/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/precise/applications/kbarcode/debian/cdbs/versions.pl
+++ b/ubuntu/precise/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/ubuntu/precise/applications/kbookreader/debian/cdbs/versions.pl b/ubuntu/precise/applications/kbookreader/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/precise/applications/kbookreader/debian/cdbs/versions.pl
+++ b/ubuntu/precise/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/ubuntu/precise/applications/kcpuload/debian/cdbs/versions.pl b/ubuntu/precise/applications/kcpuload/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/precise/applications/kcpuload/debian/cdbs/versions.pl
+++ b/ubuntu/precise/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/ubuntu/precise/applications/kdbusnotification/debian/cdbs/versions.pl b/ubuntu/precise/applications/kdbusnotification/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/precise/applications/kdbusnotification/debian/cdbs/versions.pl
+++ b/ubuntu/precise/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/ubuntu/precise/applications/kdiff3/debian/cdbs/versions.pl b/ubuntu/precise/applications/kdiff3/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/precise/applications/kdiff3/debian/cdbs/versions.pl
+++ b/ubuntu/precise/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/ubuntu/precise/applications/kdirstat/debian/cdbs/versions.pl b/ubuntu/precise/applications/kdirstat/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/precise/applications/kdirstat/debian/cdbs/versions.pl
+++ b/ubuntu/precise/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/ubuntu/precise/applications/keep/debian/cdbs/versions.pl b/ubuntu/precise/applications/keep/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/precise/applications/keep/debian/cdbs/versions.pl
+++ b/ubuntu/precise/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/ubuntu/precise/applications/kerry/debian/cdbs/versions.pl b/ubuntu/precise/applications/kerry/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/precise/applications/kerry/debian/cdbs/versions.pl
+++ b/ubuntu/precise/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/ubuntu/precise/applications/kgtk-qt3/debian/cdbs/versions.pl b/ubuntu/precise/applications/kgtk-qt3/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/precise/applications/kgtk-qt3/debian/cdbs/versions.pl
+++ b/ubuntu/precise/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/ubuntu/precise/applications/kile/debian/cdbs/versions.pl b/ubuntu/precise/applications/kile/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/precise/applications/kile/debian/cdbs/versions.pl
+++ b/ubuntu/precise/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/ubuntu/precise/applications/kiosktool/debian/cdbs/versions.pl b/ubuntu/precise/applications/kiosktool/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/precise/applications/kiosktool/debian/cdbs/versions.pl
+++ b/ubuntu/precise/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/ubuntu/precise/applications/kmplayer/debian/cdbs/versions.pl b/ubuntu/precise/applications/kmplayer/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/precise/applications/kmplayer/debian/cdbs/versions.pl
+++ b/ubuntu/precise/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/ubuntu/precise/applications/kmymoney/debian/cdbs/versions.pl b/ubuntu/precise/applications/kmymoney/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/precise/applications/kmymoney/debian/cdbs/versions.pl
+++ b/ubuntu/precise/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/ubuntu/precise/applications/knemo/debian/cdbs/versions.pl b/ubuntu/precise/applications/knemo/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/precise/applications/knemo/debian/cdbs/versions.pl
+++ b/ubuntu/precise/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/ubuntu/precise/applications/knetstats/debian/cdbs/versions.pl b/ubuntu/precise/applications/knetstats/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/precise/applications/knetstats/debian/cdbs/versions.pl
+++ b/ubuntu/precise/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/ubuntu/precise/applications/knetworkmanager.cmake/debian/cdbs/versions.pl b/ubuntu/precise/applications/knetworkmanager.cmake/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/precise/applications/knetworkmanager.cmake/debian/cdbs/versions.pl
+++ b/ubuntu/precise/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/ubuntu/precise/applications/knetworkmanager8/debian/cdbs/versions.pl b/ubuntu/precise/applications/knetworkmanager8/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/precise/applications/knetworkmanager8/debian/cdbs/versions.pl
+++ b/ubuntu/precise/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/ubuntu/precise/applications/knetworkmanager9/debian/cdbs/versions.pl b/ubuntu/precise/applications/knetworkmanager9/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/precise/applications/knetworkmanager9/debian/cdbs/versions.pl
+++ b/ubuntu/precise/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/ubuntu/precise/applications/koffice/debian/cdbs/versions.pl b/ubuntu/precise/applications/koffice/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/precise/applications/koffice/debian/cdbs/versions.pl
+++ b/ubuntu/precise/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/ubuntu/precise/applications/konversation/debian/cdbs/versions.pl b/ubuntu/precise/applications/konversation/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/precise/applications/konversation/debian/cdbs/versions.pl
+++ b/ubuntu/precise/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/ubuntu/precise/applications/kopete-otr/debian/cdbs/versions.pl b/ubuntu/precise/applications/kopete-otr/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/precise/applications/kopete-otr/debian/cdbs/versions.pl
+++ b/ubuntu/precise/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/ubuntu/precise/applications/kpilot/debian/cdbs/versions.pl b/ubuntu/precise/applications/kpilot/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/precise/applications/kpilot/debian/cdbs/versions.pl
+++ b/ubuntu/precise/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/ubuntu/precise/applications/kpowersave-nohal/debian/cdbs/versions.pl b/ubuntu/precise/applications/kpowersave-nohal/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/precise/applications/kpowersave-nohal/debian/cdbs/versions.pl
+++ b/ubuntu/precise/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/ubuntu/precise/applications/kpowersave.cmake/debian/cdbs/versions.pl b/ubuntu/precise/applications/kpowersave.cmake/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/precise/applications/kpowersave.cmake/debian/cdbs/versions.pl
+++ b/ubuntu/precise/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/ubuntu/precise/applications/kpowersave/debian/cdbs/versions.pl b/ubuntu/precise/applications/kpowersave/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/precise/applications/kpowersave/debian/cdbs/versions.pl
+++ b/ubuntu/precise/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/ubuntu/precise/applications/krename/debian/cdbs/versions.pl b/ubuntu/precise/applications/krename/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/precise/applications/krename/debian/cdbs/versions.pl
+++ b/ubuntu/precise/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/ubuntu/precise/applications/krusader/debian/cdbs/versions.pl b/ubuntu/precise/applications/krusader/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/precise/applications/krusader/debian/cdbs/versions.pl
+++ b/ubuntu/precise/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/ubuntu/precise/applications/ksystemlog/debian/cdbs/versions.pl b/ubuntu/precise/applications/ksystemlog/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/precise/applications/ksystemlog/debian/cdbs/versions.pl
+++ b/ubuntu/precise/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/ubuntu/precise/applications/ktorrent/debian/cdbs/versions.pl b/ubuntu/precise/applications/ktorrent/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/precise/applications/ktorrent/debian/cdbs/versions.pl
+++ b/ubuntu/precise/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/ubuntu/precise/applications/kuickshow/debian/cdbs/versions.pl b/ubuntu/precise/applications/kuickshow/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/precise/applications/kuickshow/debian/cdbs/versions.pl
+++ b/ubuntu/precise/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/ubuntu/precise/applications/kvkbd/debian/cdbs/versions.pl b/ubuntu/precise/applications/kvkbd/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/precise/applications/kvkbd/debian/cdbs/versions.pl
+++ b/ubuntu/precise/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/ubuntu/precise/applications/rosegarden/debian/cdbs/versions.pl b/ubuntu/precise/applications/rosegarden/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/precise/applications/rosegarden/debian/cdbs/versions.pl
+++ b/ubuntu/precise/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/ubuntu/precise/applications/smb4k/debian/cdbs/versions.pl b/ubuntu/precise/applications/smb4k/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/precise/applications/smb4k/debian/cdbs/versions.pl
+++ b/ubuntu/precise/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/ubuntu/precise/applications/soundkonverter/debian/cdbs/versions.pl b/ubuntu/precise/applications/soundkonverter/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/precise/applications/soundkonverter/debian/cdbs/versions.pl
+++ b/ubuntu/precise/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/ubuntu/precise/applications/tde-style-qtcurve/debian/cdbs/versions.pl b/ubuntu/precise/applications/tde-style-qtcurve/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/precise/applications/tde-style-qtcurve/debian/cdbs/versions.pl
+++ b/ubuntu/precise/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/ubuntu/precise/applications/tde-systemsettings/debian/cdbs/versions.pl b/ubuntu/precise/applications/tde-systemsettings/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/precise/applications/tde-systemsettings/debian/cdbs/versions.pl
+++ b/ubuntu/precise/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/ubuntu/precise/applications/tdeio-apt/debian/cdbs/versions.pl b/ubuntu/precise/applications/tdeio-apt/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/precise/applications/tdeio-apt/debian/cdbs/versions.pl
+++ b/ubuntu/precise/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/ubuntu/precise/applications/tdeio-locate/debian/cdbs/versions.pl b/ubuntu/precise/applications/tdeio-locate/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/precise/applications/tdeio-locate/debian/cdbs/versions.pl
+++ b/ubuntu/precise/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/ubuntu/precise/applications/tdeio-umountwrapper/debian/cdbs/versions.pl b/ubuntu/precise/applications/tdeio-umountwrapper/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/precise/applications/tdeio-umountwrapper/debian/cdbs/versions.pl
+++ b/ubuntu/precise/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/ubuntu/precise/applications/tdesudo/debian/cdbs/versions.pl b/ubuntu/precise/applications/tdesudo/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/precise/applications/tdesudo/debian/cdbs/versions.pl
+++ b/ubuntu/precise/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/ubuntu/precise/applications/tdesvn/debian/cdbs/versions.pl b/ubuntu/precise/applications/tdesvn/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/precise/applications/tdesvn/debian/cdbs/versions.pl
+++ b/ubuntu/precise/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/ubuntu/precise/applications/tdmtheme/debian/cdbs/versions.pl b/ubuntu/precise/applications/tdmtheme/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/precise/applications/tdmtheme/debian/cdbs/versions.pl
+++ b/ubuntu/precise/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/ubuntu/precise/applications/twin-style-crystal/debian/cdbs/versions.pl b/ubuntu/precise/applications/twin-style-crystal/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/precise/applications/twin-style-crystal/debian/cdbs/versions.pl
+++ b/ubuntu/precise/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/ubuntu/precise/applications/wlassistant/debian/cdbs/versions.pl b/ubuntu/precise/applications/wlassistant/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/precise/applications/wlassistant/debian/cdbs/versions.pl
+++ b/ubuntu/precise/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/ubuntu/precise/applications/yakuake/debian/cdbs/versions.pl b/ubuntu/precise/applications/yakuake/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/precise/applications/yakuake/debian/cdbs/versions.pl
+++ b/ubuntu/precise/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;
diff --git a/ubuntu/precise/dependencies/arts/debian/cdbs/versions.pl b/ubuntu/precise/dependencies/arts/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/precise/dependencies/arts/debian/cdbs/versions.pl
+++ b/ubuntu/precise/dependencies/arts/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/ubuntu/precise/kdegraphics.automake/debian/cdbs/versions.pl b/ubuntu/precise/kdegraphics.automake/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/precise/kdegraphics.automake/debian/cdbs/versions.pl
+++ b/ubuntu/precise/kdegraphics.automake/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/ubuntu/precise/kdevelop.cmake/debian/cdbs/versions.pl b/ubuntu/precise/kdevelop.cmake/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/precise/kdevelop.cmake/debian/cdbs/versions.pl
+++ b/ubuntu/precise/kdevelop.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/ubuntu/precise/libraries/kipi-plugins/debian/cdbs/versions.pl b/ubuntu/precise/libraries/kipi-plugins/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/precise/libraries/kipi-plugins/debian/cdbs/versions.pl
+++ b/ubuntu/precise/libraries/kipi-plugins/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/ubuntu/precise/libraries/libkdcraw/debian/cdbs/versions.pl b/ubuntu/precise/libraries/libkdcraw/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/precise/libraries/libkdcraw/debian/cdbs/versions.pl
+++ b/ubuntu/precise/libraries/libkdcraw/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/ubuntu/precise/libraries/libkexiv2/debian/cdbs/versions.pl b/ubuntu/precise/libraries/libkexiv2/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/precise/libraries/libkexiv2/debian/cdbs/versions.pl
+++ b/ubuntu/precise/libraries/libkexiv2/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/ubuntu/precise/libraries/libkipi/debian/cdbs/versions.pl b/ubuntu/precise/libraries/libkipi/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/precise/libraries/libkipi/debian/cdbs/versions.pl
+++ b/ubuntu/precise/libraries/libkipi/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/ubuntu/precise/tdeaccessibility/debian/cdbs/versions.pl b/ubuntu/precise/tdeaccessibility/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/precise/tdeaccessibility/debian/cdbs/versions.pl
+++ b/ubuntu/precise/tdeaccessibility/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/ubuntu/precise/tdeaddons/debian/cdbs/versions.pl b/ubuntu/precise/tdeaddons/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/precise/tdeaddons/debian/cdbs/versions.pl
+++ b/ubuntu/precise/tdeaddons/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/ubuntu/precise/tdeadmin/debian/cdbs/versions.pl b/ubuntu/precise/tdeadmin/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/precise/tdeadmin/debian/cdbs/versions.pl
+++ b/ubuntu/precise/tdeadmin/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/ubuntu/precise/tdeartwork/debian/cdbs/versions.pl b/ubuntu/precise/tdeartwork/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/precise/tdeartwork/debian/cdbs/versions.pl
+++ b/ubuntu/precise/tdeartwork/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/ubuntu/precise/tdebase/debian/cdbs/versions.pl b/ubuntu/precise/tdebase/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/precise/tdebase/debian/cdbs/versions.pl
+++ b/ubuntu/precise/tdebase/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/ubuntu/precise/tdebindings/debian/cdbs/versions.pl b/ubuntu/precise/tdebindings/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/precise/tdebindings/debian/cdbs/versions.pl
+++ b/ubuntu/precise/tdebindings/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/ubuntu/precise/tdeedu/debian/cdbs/versions.pl b/ubuntu/precise/tdeedu/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/precise/tdeedu/debian/cdbs/versions.pl
+++ b/ubuntu/precise/tdeedu/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/ubuntu/precise/tdegames/debian/cdbs/versions.pl b/ubuntu/precise/tdegames/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/precise/tdegames/debian/cdbs/versions.pl
+++ b/ubuntu/precise/tdegames/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/ubuntu/precise/tdegraphics/debian/cdbs/versions.pl b/ubuntu/precise/tdegraphics/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/precise/tdegraphics/debian/cdbs/versions.pl
+++ b/ubuntu/precise/tdegraphics/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/ubuntu/precise/tdelibs/debian/cdbs/versions.pl b/ubuntu/precise/tdelibs/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/precise/tdelibs/debian/cdbs/versions.pl
+++ b/ubuntu/precise/tdelibs/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/ubuntu/precise/tdemultimedia/debian/cdbs/versions.pl b/ubuntu/precise/tdemultimedia/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/precise/tdemultimedia/debian/cdbs/versions.pl
+++ b/ubuntu/precise/tdemultimedia/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/ubuntu/precise/tdenetwork/debian/cdbs/versions.pl b/ubuntu/precise/tdenetwork/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/precise/tdenetwork/debian/cdbs/versions.pl
+++ b/ubuntu/precise/tdenetwork/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/ubuntu/precise/tdepim/debian/cdbs/versions.pl b/ubuntu/precise/tdepim/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/precise/tdepim/debian/cdbs/versions.pl
+++ b/ubuntu/precise/tdepim/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/ubuntu/precise/tdesdk/debian/cdbs/versions.pl b/ubuntu/precise/tdesdk/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/precise/tdesdk/debian/cdbs/versions.pl
+++ b/ubuntu/precise/tdesdk/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/ubuntu/precise/tdetoys/debian/cdbs/versions.pl b/ubuntu/precise/tdetoys/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/precise/tdetoys/debian/cdbs/versions.pl
+++ b/ubuntu/precise/tdetoys/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/ubuntu/precise/tdeutils/debian/cdbs/versions.pl b/ubuntu/precise/tdeutils/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/precise/tdeutils/debian/cdbs/versions.pl
+++ b/ubuntu/precise/tdeutils/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/ubuntu/precise/tdevelop/debian/cdbs/versions.pl b/ubuntu/precise/tdevelop/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/precise/tdevelop/debian/cdbs/versions.pl
+++ b/ubuntu/precise/tdevelop/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/ubuntu/precise/tdewebdev/debian/cdbs/versions.pl b/ubuntu/precise/tdewebdev/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/precise/tdewebdev/debian/cdbs/versions.pl
+++ b/ubuntu/precise/tdewebdev/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/ubuntu/raring/applications/abakus/debian/cdbs/versions.pl b/ubuntu/raring/applications/abakus/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/raring/applications/abakus/debian/cdbs/versions.pl
+++ b/ubuntu/raring/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/ubuntu/raring/applications/adept/debian/cdbs/versions.pl b/ubuntu/raring/applications/adept/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/raring/applications/adept/debian/cdbs/versions.pl
+++ b/ubuntu/raring/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/ubuntu/raring/applications/amarok.cmake/debian/cdbs/versions.pl b/ubuntu/raring/applications/amarok.cmake/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/raring/applications/amarok.cmake/debian/cdbs/versions.pl
+++ b/ubuntu/raring/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/ubuntu/raring/applications/amarok/debian/cdbs/versions.pl b/ubuntu/raring/applications/amarok/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/raring/applications/amarok/debian/cdbs/versions.pl
+++ b/ubuntu/raring/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/ubuntu/raring/applications/bibletime/debian/cdbs/versions.pl b/ubuntu/raring/applications/bibletime/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/raring/applications/bibletime/debian/cdbs/versions.pl
+++ b/ubuntu/raring/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/ubuntu/raring/applications/compizconfig-backend-tdeconfig/debian/cdbs/versions.pl b/ubuntu/raring/applications/compizconfig-backend-tdeconfig/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/raring/applications/compizconfig-backend-tdeconfig/debian/cdbs/versions.pl
+++ b/ubuntu/raring/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/ubuntu/raring/applications/digikam/debian/cdbs/versions.pl b/ubuntu/raring/applications/digikam/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/raring/applications/digikam/debian/cdbs/versions.pl
+++ b/ubuntu/raring/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/ubuntu/raring/applications/dolphin/debian/cdbs/versions.pl b/ubuntu/raring/applications/dolphin/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/raring/applications/dolphin/debian/cdbs/versions.pl
+++ b/ubuntu/raring/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/ubuntu/raring/applications/filelight-l10n/debian/cdbs/versions.pl b/ubuntu/raring/applications/filelight-l10n/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/raring/applications/filelight-l10n/debian/cdbs/versions.pl
+++ b/ubuntu/raring/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/ubuntu/raring/applications/filelight/debian/cdbs/versions.pl b/ubuntu/raring/applications/filelight/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/raring/applications/filelight/debian/cdbs/versions.pl
+++ b/ubuntu/raring/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/ubuntu/raring/applications/gtk-qt-engine/debian/cdbs/versions.pl b/ubuntu/raring/applications/gtk-qt-engine/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/raring/applications/gtk-qt-engine/debian/cdbs/versions.pl
+++ b/ubuntu/raring/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/ubuntu/raring/applications/gwenview-i18n/debian/cdbs/versions.pl b/ubuntu/raring/applications/gwenview-i18n/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/raring/applications/gwenview-i18n/debian/cdbs/versions.pl
+++ b/ubuntu/raring/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/ubuntu/raring/applications/gwenview/debian/cdbs/versions.pl b/ubuntu/raring/applications/gwenview/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/raring/applications/gwenview/debian/cdbs/versions.pl
+++ b/ubuntu/raring/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/ubuntu/raring/applications/k3b/debian/cdbs/versions.pl b/ubuntu/raring/applications/k3b/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/raring/applications/k3b/debian/cdbs/versions.pl
+++ b/ubuntu/raring/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/ubuntu/raring/applications/k9copy/debian/cdbs/versions.pl b/ubuntu/raring/applications/k9copy/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/raring/applications/k9copy/debian/cdbs/versions.pl
+++ b/ubuntu/raring/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/ubuntu/raring/applications/kaffeine/debian/cdbs/versions.pl b/ubuntu/raring/applications/kaffeine/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/raring/applications/kaffeine/debian/cdbs/versions.pl
+++ b/ubuntu/raring/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/ubuntu/raring/applications/katapult/debian/cdbs/versions.pl b/ubuntu/raring/applications/katapult/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/raring/applications/katapult/debian/cdbs/versions.pl
+++ b/ubuntu/raring/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/ubuntu/raring/applications/kbarcode/debian/cdbs/versions.pl b/ubuntu/raring/applications/kbarcode/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/raring/applications/kbarcode/debian/cdbs/versions.pl
+++ b/ubuntu/raring/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/ubuntu/raring/applications/kbookreader/debian/cdbs/versions.pl b/ubuntu/raring/applications/kbookreader/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/raring/applications/kbookreader/debian/cdbs/versions.pl
+++ b/ubuntu/raring/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/ubuntu/raring/applications/kcpuload/debian/cdbs/versions.pl b/ubuntu/raring/applications/kcpuload/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/raring/applications/kcpuload/debian/cdbs/versions.pl
+++ b/ubuntu/raring/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/ubuntu/raring/applications/kdbusnotification/debian/cdbs/versions.pl b/ubuntu/raring/applications/kdbusnotification/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/raring/applications/kdbusnotification/debian/cdbs/versions.pl
+++ b/ubuntu/raring/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/ubuntu/raring/applications/kdiff3/debian/cdbs/versions.pl b/ubuntu/raring/applications/kdiff3/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/raring/applications/kdiff3/debian/cdbs/versions.pl
+++ b/ubuntu/raring/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/ubuntu/raring/applications/kdirstat/debian/cdbs/versions.pl b/ubuntu/raring/applications/kdirstat/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/raring/applications/kdirstat/debian/cdbs/versions.pl
+++ b/ubuntu/raring/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/ubuntu/raring/applications/keep/debian/cdbs/versions.pl b/ubuntu/raring/applications/keep/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/raring/applications/keep/debian/cdbs/versions.pl
+++ b/ubuntu/raring/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/ubuntu/raring/applications/kerry/debian/cdbs/versions.pl b/ubuntu/raring/applications/kerry/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/raring/applications/kerry/debian/cdbs/versions.pl
+++ b/ubuntu/raring/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/ubuntu/raring/applications/kgtk-qt3/debian/cdbs/versions.pl b/ubuntu/raring/applications/kgtk-qt3/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/raring/applications/kgtk-qt3/debian/cdbs/versions.pl
+++ b/ubuntu/raring/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/ubuntu/raring/applications/kile/debian/cdbs/versions.pl b/ubuntu/raring/applications/kile/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/raring/applications/kile/debian/cdbs/versions.pl
+++ b/ubuntu/raring/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/ubuntu/raring/applications/kiosktool/debian/cdbs/versions.pl b/ubuntu/raring/applications/kiosktool/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/raring/applications/kiosktool/debian/cdbs/versions.pl
+++ b/ubuntu/raring/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/ubuntu/raring/applications/kmplayer/debian/cdbs/versions.pl b/ubuntu/raring/applications/kmplayer/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/raring/applications/kmplayer/debian/cdbs/versions.pl
+++ b/ubuntu/raring/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/ubuntu/raring/applications/kmymoney/debian/cdbs/versions.pl b/ubuntu/raring/applications/kmymoney/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/raring/applications/kmymoney/debian/cdbs/versions.pl
+++ b/ubuntu/raring/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/ubuntu/raring/applications/knemo/debian/cdbs/versions.pl b/ubuntu/raring/applications/knemo/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/raring/applications/knemo/debian/cdbs/versions.pl
+++ b/ubuntu/raring/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/ubuntu/raring/applications/knetstats/debian/cdbs/versions.pl b/ubuntu/raring/applications/knetstats/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/raring/applications/knetstats/debian/cdbs/versions.pl
+++ b/ubuntu/raring/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/ubuntu/raring/applications/knetworkmanager.cmake/debian/cdbs/versions.pl b/ubuntu/raring/applications/knetworkmanager.cmake/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/raring/applications/knetworkmanager.cmake/debian/cdbs/versions.pl
+++ b/ubuntu/raring/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/ubuntu/raring/applications/knetworkmanager8/debian/cdbs/versions.pl b/ubuntu/raring/applications/knetworkmanager8/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/raring/applications/knetworkmanager8/debian/cdbs/versions.pl
+++ b/ubuntu/raring/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/ubuntu/raring/applications/knetworkmanager9/debian/cdbs/versions.pl b/ubuntu/raring/applications/knetworkmanager9/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/raring/applications/knetworkmanager9/debian/cdbs/versions.pl
+++ b/ubuntu/raring/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/ubuntu/raring/applications/koffice/debian/cdbs/versions.pl b/ubuntu/raring/applications/koffice/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/raring/applications/koffice/debian/cdbs/versions.pl
+++ b/ubuntu/raring/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/ubuntu/raring/applications/konversation/debian/cdbs/versions.pl b/ubuntu/raring/applications/konversation/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/raring/applications/konversation/debian/cdbs/versions.pl
+++ b/ubuntu/raring/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/ubuntu/raring/applications/kopete-otr/debian/cdbs/versions.pl b/ubuntu/raring/applications/kopete-otr/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/raring/applications/kopete-otr/debian/cdbs/versions.pl
+++ b/ubuntu/raring/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/ubuntu/raring/applications/kpilot/debian/cdbs/versions.pl b/ubuntu/raring/applications/kpilot/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/raring/applications/kpilot/debian/cdbs/versions.pl
+++ b/ubuntu/raring/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/ubuntu/raring/applications/kpowersave-nohal/debian/cdbs/versions.pl b/ubuntu/raring/applications/kpowersave-nohal/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/raring/applications/kpowersave-nohal/debian/cdbs/versions.pl
+++ b/ubuntu/raring/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/ubuntu/raring/applications/kpowersave.cmake/debian/cdbs/versions.pl b/ubuntu/raring/applications/kpowersave.cmake/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/raring/applications/kpowersave.cmake/debian/cdbs/versions.pl
+++ b/ubuntu/raring/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/ubuntu/raring/applications/kpowersave/debian/cdbs/versions.pl b/ubuntu/raring/applications/kpowersave/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/raring/applications/kpowersave/debian/cdbs/versions.pl
+++ b/ubuntu/raring/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/ubuntu/raring/applications/krename/debian/cdbs/versions.pl b/ubuntu/raring/applications/krename/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/raring/applications/krename/debian/cdbs/versions.pl
+++ b/ubuntu/raring/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/ubuntu/raring/applications/krusader/debian/cdbs/versions.pl b/ubuntu/raring/applications/krusader/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/raring/applications/krusader/debian/cdbs/versions.pl
+++ b/ubuntu/raring/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/ubuntu/raring/applications/ksystemlog/debian/cdbs/versions.pl b/ubuntu/raring/applications/ksystemlog/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/raring/applications/ksystemlog/debian/cdbs/versions.pl
+++ b/ubuntu/raring/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/ubuntu/raring/applications/ktorrent/debian/cdbs/versions.pl b/ubuntu/raring/applications/ktorrent/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/raring/applications/ktorrent/debian/cdbs/versions.pl
+++ b/ubuntu/raring/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/ubuntu/raring/applications/kuickshow/debian/cdbs/versions.pl b/ubuntu/raring/applications/kuickshow/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/raring/applications/kuickshow/debian/cdbs/versions.pl
+++ b/ubuntu/raring/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/ubuntu/raring/applications/kvkbd/debian/cdbs/versions.pl b/ubuntu/raring/applications/kvkbd/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/raring/applications/kvkbd/debian/cdbs/versions.pl
+++ b/ubuntu/raring/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/ubuntu/raring/applications/rosegarden/debian/cdbs/versions.pl b/ubuntu/raring/applications/rosegarden/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/raring/applications/rosegarden/debian/cdbs/versions.pl
+++ b/ubuntu/raring/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/ubuntu/raring/applications/smb4k/debian/cdbs/versions.pl b/ubuntu/raring/applications/smb4k/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/raring/applications/smb4k/debian/cdbs/versions.pl
+++ b/ubuntu/raring/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/ubuntu/raring/applications/soundkonverter/debian/cdbs/versions.pl b/ubuntu/raring/applications/soundkonverter/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/raring/applications/soundkonverter/debian/cdbs/versions.pl
+++ b/ubuntu/raring/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/ubuntu/raring/applications/tde-style-qtcurve/debian/cdbs/versions.pl b/ubuntu/raring/applications/tde-style-qtcurve/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/raring/applications/tde-style-qtcurve/debian/cdbs/versions.pl
+++ b/ubuntu/raring/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/ubuntu/raring/applications/tde-systemsettings/debian/cdbs/versions.pl b/ubuntu/raring/applications/tde-systemsettings/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/raring/applications/tde-systemsettings/debian/cdbs/versions.pl
+++ b/ubuntu/raring/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/ubuntu/raring/applications/tdeio-apt/debian/cdbs/versions.pl b/ubuntu/raring/applications/tdeio-apt/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/raring/applications/tdeio-apt/debian/cdbs/versions.pl
+++ b/ubuntu/raring/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/ubuntu/raring/applications/tdeio-locate/debian/cdbs/versions.pl b/ubuntu/raring/applications/tdeio-locate/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/raring/applications/tdeio-locate/debian/cdbs/versions.pl
+++ b/ubuntu/raring/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/ubuntu/raring/applications/tdeio-umountwrapper/debian/cdbs/versions.pl b/ubuntu/raring/applications/tdeio-umountwrapper/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/raring/applications/tdeio-umountwrapper/debian/cdbs/versions.pl
+++ b/ubuntu/raring/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/ubuntu/raring/applications/tdesudo/debian/cdbs/versions.pl b/ubuntu/raring/applications/tdesudo/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/raring/applications/tdesudo/debian/cdbs/versions.pl
+++ b/ubuntu/raring/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/ubuntu/raring/applications/tdesvn/debian/cdbs/versions.pl b/ubuntu/raring/applications/tdesvn/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/raring/applications/tdesvn/debian/cdbs/versions.pl
+++ b/ubuntu/raring/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/ubuntu/raring/applications/tdmtheme/debian/cdbs/versions.pl b/ubuntu/raring/applications/tdmtheme/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/raring/applications/tdmtheme/debian/cdbs/versions.pl
+++ b/ubuntu/raring/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/ubuntu/raring/applications/twin-style-crystal/debian/cdbs/versions.pl b/ubuntu/raring/applications/twin-style-crystal/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/raring/applications/twin-style-crystal/debian/cdbs/versions.pl
+++ b/ubuntu/raring/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/ubuntu/raring/applications/wlassistant/debian/cdbs/versions.pl b/ubuntu/raring/applications/wlassistant/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/raring/applications/wlassistant/debian/cdbs/versions.pl
+++ b/ubuntu/raring/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/ubuntu/raring/applications/yakuake/debian/cdbs/versions.pl b/ubuntu/raring/applications/yakuake/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/raring/applications/yakuake/debian/cdbs/versions.pl
+++ b/ubuntu/raring/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;
diff --git a/ubuntu/raring/dependencies/arts/debian/cdbs/versions.pl b/ubuntu/raring/dependencies/arts/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/raring/dependencies/arts/debian/cdbs/versions.pl
+++ b/ubuntu/raring/dependencies/arts/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/ubuntu/raring/kdegraphics.automake/debian/cdbs/versions.pl b/ubuntu/raring/kdegraphics.automake/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/raring/kdegraphics.automake/debian/cdbs/versions.pl
+++ b/ubuntu/raring/kdegraphics.automake/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/ubuntu/raring/kdevelop.cmake/debian/cdbs/versions.pl b/ubuntu/raring/kdevelop.cmake/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/raring/kdevelop.cmake/debian/cdbs/versions.pl
+++ b/ubuntu/raring/kdevelop.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/ubuntu/raring/libraries/kipi-plugins/debian/cdbs/versions.pl b/ubuntu/raring/libraries/kipi-plugins/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/raring/libraries/kipi-plugins/debian/cdbs/versions.pl
+++ b/ubuntu/raring/libraries/kipi-plugins/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/ubuntu/raring/libraries/libkdcraw/debian/cdbs/versions.pl b/ubuntu/raring/libraries/libkdcraw/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/raring/libraries/libkdcraw/debian/cdbs/versions.pl
+++ b/ubuntu/raring/libraries/libkdcraw/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/ubuntu/raring/libraries/libkexiv2/debian/cdbs/versions.pl b/ubuntu/raring/libraries/libkexiv2/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/raring/libraries/libkexiv2/debian/cdbs/versions.pl
+++ b/ubuntu/raring/libraries/libkexiv2/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/ubuntu/raring/libraries/libkipi/debian/cdbs/versions.pl b/ubuntu/raring/libraries/libkipi/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/raring/libraries/libkipi/debian/cdbs/versions.pl
+++ b/ubuntu/raring/libraries/libkipi/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/ubuntu/raring/tdeaccessibility/debian/cdbs/versions.pl b/ubuntu/raring/tdeaccessibility/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/raring/tdeaccessibility/debian/cdbs/versions.pl
+++ b/ubuntu/raring/tdeaccessibility/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/ubuntu/raring/tdeaddons/debian/cdbs/versions.pl b/ubuntu/raring/tdeaddons/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/raring/tdeaddons/debian/cdbs/versions.pl
+++ b/ubuntu/raring/tdeaddons/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/ubuntu/raring/tdeadmin/debian/cdbs/versions.pl b/ubuntu/raring/tdeadmin/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/raring/tdeadmin/debian/cdbs/versions.pl
+++ b/ubuntu/raring/tdeadmin/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/ubuntu/raring/tdeartwork/debian/cdbs/versions.pl b/ubuntu/raring/tdeartwork/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/raring/tdeartwork/debian/cdbs/versions.pl
+++ b/ubuntu/raring/tdeartwork/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/ubuntu/raring/tdebase/debian/cdbs/versions.pl b/ubuntu/raring/tdebase/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/raring/tdebase/debian/cdbs/versions.pl
+++ b/ubuntu/raring/tdebase/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/ubuntu/raring/tdebindings/debian/cdbs/versions.pl b/ubuntu/raring/tdebindings/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/raring/tdebindings/debian/cdbs/versions.pl
+++ b/ubuntu/raring/tdebindings/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/ubuntu/raring/tdeedu/debian/cdbs/versions.pl b/ubuntu/raring/tdeedu/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/raring/tdeedu/debian/cdbs/versions.pl
+++ b/ubuntu/raring/tdeedu/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/ubuntu/raring/tdegames/debian/cdbs/versions.pl b/ubuntu/raring/tdegames/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/raring/tdegames/debian/cdbs/versions.pl
+++ b/ubuntu/raring/tdegames/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/ubuntu/raring/tdegraphics/debian/cdbs/versions.pl b/ubuntu/raring/tdegraphics/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/raring/tdegraphics/debian/cdbs/versions.pl
+++ b/ubuntu/raring/tdegraphics/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/ubuntu/raring/tdelibs/debian/cdbs/versions.pl b/ubuntu/raring/tdelibs/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/raring/tdelibs/debian/cdbs/versions.pl
+++ b/ubuntu/raring/tdelibs/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/ubuntu/raring/tdemultimedia/debian/cdbs/versions.pl b/ubuntu/raring/tdemultimedia/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/raring/tdemultimedia/debian/cdbs/versions.pl
+++ b/ubuntu/raring/tdemultimedia/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/ubuntu/raring/tdenetwork/debian/cdbs/versions.pl b/ubuntu/raring/tdenetwork/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/raring/tdenetwork/debian/cdbs/versions.pl
+++ b/ubuntu/raring/tdenetwork/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/ubuntu/raring/tdepim/debian/cdbs/versions.pl b/ubuntu/raring/tdepim/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/raring/tdepim/debian/cdbs/versions.pl
+++ b/ubuntu/raring/tdepim/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/ubuntu/raring/tdesdk/debian/cdbs/versions.pl b/ubuntu/raring/tdesdk/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/raring/tdesdk/debian/cdbs/versions.pl
+++ b/ubuntu/raring/tdesdk/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/ubuntu/raring/tdetoys/debian/cdbs/versions.pl b/ubuntu/raring/tdetoys/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/raring/tdetoys/debian/cdbs/versions.pl
+++ b/ubuntu/raring/tdetoys/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/ubuntu/raring/tdeutils/debian/cdbs/versions.pl b/ubuntu/raring/tdeutils/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/raring/tdeutils/debian/cdbs/versions.pl
+++ b/ubuntu/raring/tdeutils/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/ubuntu/raring/tdevelop/debian/cdbs/versions.pl b/ubuntu/raring/tdevelop/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/raring/tdevelop/debian/cdbs/versions.pl
+++ b/ubuntu/raring/tdevelop/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/ubuntu/raring/tdewebdev/debian/cdbs/versions.pl b/ubuntu/raring/tdewebdev/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/ubuntu/raring/tdewebdev/debian/cdbs/versions.pl
+++ b/ubuntu/raring/tdewebdev/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;
author	Slávek Banko <slavek.banko@axis.cz>	2013-04-21 19:42:09 +0200
committer	Slávek Banko <slavek.banko@axis.cz>	2013-04-21 19:54:57 +0200
commit	6e70fa33ca99b1020f68a09481317b854e31de66 (patch)
tree	13810e0cd96c7ea9dbbc14e43fefb1500e272728
parent	731c5feadab8d86e307b00e3b408b5d5b80b4422 (diff)
download	tde-packaging-6e70fa33ca99b1020f68a09481317b854e31de66.tar.gz tde-packaging-6e70fa33ca99b1020f68a09481317b854e31de66.zip