[SCM] "Network Management" Plasma widget Debian packaging branch, master, updated. debian/0.9-git20120122.edc9568-1-10-g98292d0

Michael Biebl biebl at alioth.debian.org
Tue Feb 28 01:54:25 UTC 2012


The following commit has been merged in the master branch:
commit 5e347e965f5cf276291e99e1a4ef31fbd375fab5
Author: Michael Biebl <biebl at debian.org>
Date:   Tue Feb 28 02:22:37 2012 +0100

    Simplify the way we compute the version number for the network-manager-kde dummy package (which needs an epoch).
---
 debian/changelog |    4 +++-
 debian/rules     |    4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f42e6b2..0a462cc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,10 @@ networkmanagement (0.9.0-1) UNRELEASED; urgency=low
   * New upstream release.
   * Add watch file and track unstable releases for now.
   * Install gettext translations.
+  * Simplify the way we compute the version number for the network-manager-kde
+    dummy package (which needs an epoch).
 
- -- Michael Biebl <biebl at debian.org>  Tue, 28 Feb 2012 01:15:01 +0100
+ -- Michael Biebl <biebl at debian.org>  Tue, 28 Feb 2012 02:20:05 +0100
 
 networkmanagement (0.9~git20120122.edc9568-1) unstable; urgency=low
 
diff --git a/debian/rules b/debian/rules
index 533a760..e4b931b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,8 +2,8 @@
 
 # DEB_KDE_LINK_WITH_AS_NEEDED ?= yes
 
-DEB_BINARY_VERSION := $(shell dpkg-parsechangelog | grep '^Version: ' | sed 's/^Version: //')
-DEB_KNETWORKMANAGER_VERSION := $(shell echo '$(DEB_BINARY_VERSION)' | sed 's/^[[:digit:].]\+~/1:0.9+/')
+DEB_BINARY_VERSION := $(shell dpkg-parsechangelog | sed -n 's/^Version: //p')
+DEB_KNETWORKMANAGER_VERSION := '1:$(DEB_BINARY_VERSION)'
 
 override_dh_auto_configure:
 	dh_auto_configure -Skde -- -DCMAKE_USE_RELATIVE_PATHS=ON

-- 
"Network Management" Plasma widget Debian packaging



More information about the pkg-kde-commits mailing list