Cutting off the fourth number, or preliminary version number

in counting versions for dependencies on Debian and Ubuntu
(cherry picked from commit 6e70fa33ca99b1020f68a09481317b854e31de66)

58 files changed, 58 insertions, 58 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-kconfig/debian/cdbs/versions.pl b/debian/lenny/applications/compizconfig-backend-kconfig/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/lenny/applications/compizconfig-backend-kconfig/debian/cdbs/versions.pl
+++ b/debian/lenny/applications/compizconfig-backend-kconfig/debian/cdbs/versions.pl
@@ -7,7 +7,7 @@ my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
 my ($version3, $version3_next);
 my ($version2, $version2_next);
 
-($version3 = $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/kde-style-qtcurve/debian/cdbs/versions.pl b/debian/lenny/applications/kde-style-qtcurve/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/lenny/applications/kde-style-qtcurve/debian/cdbs/versions.pl
+++ b/debian/lenny/applications/kde-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/kde-systemsettings/debian/cdbs/versions.pl b/debian/lenny/applications/kde-systemsettings/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/lenny/applications/kde-systemsettings/debian/cdbs/versions.pl
+++ b/debian/lenny/applications/kde-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/kdesudo/debian/cdbs/versions.pl b/debian/lenny/applications/kdesudo/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/lenny/applications/kdesudo/debian/cdbs/versions.pl
+++ b/debian/lenny/applications/kdesudo/debian/cdbs/versions.pl
@@ -7,7 +7,7 @@ my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
 my ($version3, $version3_next);
 my ($version2, $version2_next);
 
-($version3 = $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/kdmtheme/debian/cdbs/versions.pl b/debian/lenny/applications/kdmtheme/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/lenny/applications/kdmtheme/debian/cdbs/versions.pl
+++ b/debian/lenny/applications/kdmtheme/debian/cdbs/versions.pl
@@ -7,7 +7,7 @@ my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
 my ($version3, $version3_next);
 my ($version2, $version2_next);
 
-($version3 = $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/kio-apt/debian/cdbs/versions.pl b/debian/lenny/applications/kio-apt/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/lenny/applications/kio-apt/debian/cdbs/versions.pl
+++ b/debian/lenny/applications/kio-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/kio-locate/debian/cdbs/versions.pl b/debian/lenny/applications/kio-locate/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/lenny/applications/kio-locate/debian/cdbs/versions.pl
+++ b/debian/lenny/applications/kio-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/kio-umountwrapper/debian/cdbs/versions.pl b/debian/lenny/applications/kio-umountwrapper/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/lenny/applications/kio-umountwrapper/debian/cdbs/versions.pl
+++ b/debian/lenny/applications/kio-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/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/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.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/kwin-style-crystal/debian/cdbs/versions.pl b/debian/lenny/applications/kwin-style-crystal/debian/cdbs/versions.pl
index 9ce11d8a3..75c9add4b 100644
--- a/debian/lenny/applications/kwin-style-crystal/debian/cdbs/versions.pl
+++ b/debian/lenny/applications/kwin-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/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/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;