sync with trunk @r10613

debian/changelog

@@ -1,3 +1,13 @@
+ngcp-www-admin (3.4.2) unstable; urgency=low
+
+  [ mprokop ]
+  * rules,admin.pm: Adjust VERSION string on the fly during package build
+
+  [ cveigl ]
+  * admin.pm: remove debug-switch
+
+ -- Andrew Pogrebennyk <apogrebennyk@sipwise.com>  Thu, 23 Aug 2012 21:21:53 +0200
+
 ngcp-www-admin (3.4.1) unstable; urgency=low
 
   [ dtiefnig ]

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:

lib/admin.pm

@@ -16,12 +16,12 @@ 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
                /;
 
-our $VERSION = '3.4';
+our $VERSION = 'UNRELEASED';
 
 # Configure the application. 
 #