From 545d1076eaa077a36a86aaa9b5db2a752f307afe Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Tue, 21 Aug 2012 23:29:42 +0000 Subject: [PATCH 1/4] Adjust VERSION string on the fly during package build Adjusting version strings manually is known to be error prone and annoying, so lets set the version string during package builds so the version matches exactly the Debian package version. Acked-by: Daniel Tiefnig From: Michael Prokop --- debian/rules | 4 ++++ lib/admin.pm | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index 4a973de..7fcdebb 100755 --- a/debian/rules +++ b/debian/rules @@ -10,11 +10,14 @@ # export DH_VERBOSE=1 b=$(CURDIR)/debian/build +VERSION:=$(shell dpkg-parsechangelog | awk '/Version: / { print $$2 }') build: build-stamp build-stamp: dh_testdir + egrep -q "VERSION = 'UNRELEASED'" lib/admin.pm || \ + (echo "Wrong version in lib/csc.pm" && exit 2) mkdir -p pro/etc/ngcp-www-admin pro/etc/apache2/sites-available mkdir -p ce/etc/ngcp-www-admin ce/etc/apache2/sites-available tpage --define PRO=true etc/admin.conf > pro/etc/ngcp-www-admin/admin.conf.tt2 @@ -44,6 +47,7 @@ ngcp-www-admin: dh_installdocs -p$@ -P$(b)/$@ dh_installchangelogs -p$@ -P$(b)/$@ dh_install -p$@ -P$(b)/$@ + sed -i -e "s/VERSION = 'UNRELEASED'/VERSION = '$(VERSION)'/" $(b)/$@/usr/share/ngcp-www-admin/lib/admin.pm dh_installexamples -p$@ -P$(b)/$@ dh_installman -p$@ -P$(b)/$@ # drop svn files: diff --git a/lib/admin.pm b/lib/admin.pm index e2fac7c..2f0814d 100644 --- a/lib/admin.pm +++ b/lib/admin.pm @@ -21,7 +21,7 @@ use Catalyst qw/-Debug ConfigLoader Static::Simple Unicode Session Session::Store::FastMmap Session::State::Cookie /; -our $VERSION = '3'; +our $VERSION = 'UNRELEASED'; # Configure the application. # From 07d0439654a8981617d2f0e82e0c8d674b2619c4 Mon Sep 17 00:00:00 2001 From: Christian Veigl Date: Thu, 23 Aug 2012 09:22:47 +0000 Subject: [PATCH 2/4] remove debug-switch --- lib/admin.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/admin.pm b/lib/admin.pm index 2f0814d..b634044 100644 --- a/lib/admin.pm +++ b/lib/admin.pm @@ -16,7 +16,7 @@ use XML::Simple; use Catalyst::Log::Log4perl; -use Catalyst qw/-Debug ConfigLoader Static::Simple Unicode +use Catalyst qw/ConfigLoader Static::Simple Unicode Authentication Authentication::Store::Minimal Authentication::Credential::Password Session Session::Store::FastMmap Session::State::Cookie /; From f2ac0df5ea291d2fa33194820a66970f53854838 Mon Sep 17 00:00:00 2001 From: Andrew Pogrebennyk Date: Thu, 23 Aug 2012 19:22:22 +0000 Subject: [PATCH 3/4] release version 3.4.2 --- debian/changelog | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/debian/changelog b/debian/changelog index a2aa819..7435a5d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,16 @@ +ngcp-www-admin (3.4.2) unstable; urgency=low + + [ mprokop ] + * rules,admin.pm: Adjust VERSION string on the fly during package build + + [ agranig ] + * domain_preferences.tt,peering_preferences.tt,subscriber_preferences.tt: Partly revert r10429. + + [ cveigl ] + * admin.pm: remove debug-switch + + -- Andrew Pogrebennyk Thu, 23 Aug 2012 21:21:53 +0200 + ngcp-www-admin (3.4.1) unstable; urgency=low [ dtiefnig ] From e0a6422c22166a77953e5a3274fbb95b6fbded0a Mon Sep 17 00:00:00 2001 From: Andrew Pogrebennyk Date: Thu, 23 Aug 2012 19:27:06 +0000 Subject: [PATCH 4/4] r10456 has been already merged and released. --- debian/changelog | 3 --- 1 file changed, 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7435a5d..18b28f6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,9 +3,6 @@ ngcp-www-admin (3.4.2) unstable; urgency=low [ mprokop ] * rules,admin.pm: Adjust VERSION string on the fly during package build - [ agranig ] - * domain_preferences.tt,peering_preferences.tt,subscriber_preferences.tt: Partly revert r10429. - [ cveigl ] * admin.pm: remove debug-switch