r32990 - in /trunk/jifty: Makefile.PL debian/changelog debian/rules

[yvesago-guest at users.alioth.debian.org]

Author: yvesago-guest
Date: Fri Apr 10 09:43:05 2009
New Revision: 32990

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=32990
Log:
 TODO: 
 - upgrade App::CLI to 0.08
 - lot of clean up with removed plugins
 - bump dep in control
 - skip one test in t/TestApp/t/20-error-pages.t, 
    fails with string in halo showing code
 * Makefile.PL debian/rules, temporary changes for testing purpose

Modified:
    trunk/jifty/Makefile.PL
    trunk/jifty/debian/changelog
    trunk/jifty/debian/rules

Modified: trunk/jifty/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/jifty/Makefile.PL?rev=32990&op=diff
==============================================================================
--- trunk/jifty/Makefile.PL (original)
+++ trunk/jifty/Makefile.PL Fri Apr 10 09:43:05 2009
@@ -2,7 +2,8 @@
 name('Jifty');
 license('Perl');
 perl_version '5.8.3';
-requires('App::CLI' => 0.08 ); # App::CLI::Command::Help App::CLI::Command
+#requires('App::CLI' => 0.08 ); # App::CLI::Command::Help App::CLI::Command
+requires('App::CLI' => 0.07 ); # App::CLI::Command::Help App::CLI::Command
 requires('Cache::Cache'); #Cache::FileCache
 requires('Calendar::Simple');
 requires('Class::Accessor'); # Class::Accessor::Fast

Modified: trunk/jifty/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/jifty/debian/changelog?rev=32990&op=diff
==============================================================================
--- trunk/jifty/debian/changelog (original)
+++ trunk/jifty/debian/changelog Fri Apr 10 09:43:05 2009
@@ -1,4 +1,11 @@
 jifty (0.90409-1) UNRELEASED; urgency=low
+
+ TODO: 
+ - upgrade App::CLI to 0.08
+ - lot of clean up with removed plugins
+ - bump dep in control
+ - skip one test in t/TestApp/t/20-error-pages.t, 
+    fails with string in halo showing code
 
   [ AGOSTINI Yves ]
   * new release

Modified: trunk/jifty/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/jifty/debian/rules?rev=32990&op=diff
==============================================================================
--- trunk/jifty/debian/rules (original)
+++ trunk/jifty/debian/rules Fri Apr 10 09:43:05 2009
@@ -11,33 +11,35 @@
 # always return the default without waiting for user input.
 export PERL_MM_USE_DEFAULT=1
 export DH_ALWAYS_EXCLUDE=.svn
+#export JIFTY_PLUGINS="Authentication-CAS Multipage TabView"
 
 PERL   ?= /usr/bin/perl
 PACKAGE = jifty
 TMP     = $(CURDIR)/debian/tmp
 
-include /usr/share/quilt/quilt.make
+#include /usr/share/quilt/quilt.make
 
 build: build-stamp
-build-stamp: $(QUILT_STAMPFN)
+build-stamp: 
 	dh_testdir
-	$(PERL) Makefile.PL --skipdeps INSTALLDIRS=vendor
+	JIFTY_PLUGINS="Authentication-CAS Comment Authentication-Ldap Multipage TabView ViewDeclarePage" \
+	INSTALLDIRS=vendor $(PERL) Makefile.PL --skipdeps INSTALLDIRS=vendor
 	$(MAKE)
 	# install some old but usefull plugins, will be in cpan on the next release
 	# WikiToolbar and AuthzLDAP have to use the same Module::Install than jifty
 	# since Module::Install 0.76 share destination path changed
-	ln -s $(CURDIR)/inc $(CURDIR)/plugins/WikiToolbar;
-	ln -s $(CURDIR)/inc $(CURDIR)/plugins/AuthzLDAP;
-	( cd $(CURDIR)/plugins/EditInPlace; \
-	$(PERL) Makefile.PL --skipdeps INSTALLDIRS=vendor; $(MAKE) )
-	( cd $(CURDIR)/plugins/WikiToolbar; \
-	$(PERL) Makefile.PL --skipdeps INSTALLDIRS=vendor; $(MAKE) )
-	( cd $(CURDIR)/plugins/AuthzLDAP; \
-	$(PERL) Makefile.PL --skipdeps INSTALLDIRS=vendor; $(MAKE) )
+#	ln -s $(CURDIR)/inc $(CURDIR)/plugins/WikiToolbar;
+#	ln -s $(CURDIR)/inc $(CURDIR)/plugins/AuthzLDAP;
+#	( cd $(CURDIR)/plugins/EditInPlace; \
+#	$(PERL) Makefile.PL --skipdeps INSTALLDIRS=vendor; $(MAKE) )
+#	( cd $(CURDIR)/plugins/WikiToolbar; \
+#	$(PERL) Makefile.PL --skipdeps INSTALLDIRS=vendor; $(MAKE) )
+#	( cd $(CURDIR)/plugins/AuthzLDAP; \
+#	$(PERL) Makefile.PL --skipdeps INSTALLDIRS=vendor; $(MAKE) )
 	LANG=C $(MAKE) test
 	touch $@
 
-clean: unpatch
+clean: 
 	dh_testdir
 	dh_testroot
 	dh_clean build-stamp install-stamp
@@ -61,12 +63,12 @@
 	dh_clean -k 
 	$(MAKE) install DESTDIR=$(TMP) PREFIX=/usr
 	# this old plugins will be in cpan on next release
-	( cd $(CURDIR)/plugins/EditInPlace; \
-	$(MAKE) install DESTDIR=$(TMP) PREFIX=/usr )
-	( cd $(CURDIR)/plugins/WikiToolbar; \
-	$(MAKE) install DESTDIR=$(TMP) PREFIX=/usr )
-	( cd $(CURDIR)/plugins/AuthzLDAP; \
-	$(MAKE) install DESTDIR=$(TMP) PREFIX=/usr )
+#	( cd $(CURDIR)/plugins/EditInPlace; \
+#	$(MAKE) install DESTDIR=$(TMP) PREFIX=/usr )
+#	( cd $(CURDIR)/plugins/WikiToolbar; \
+#	$(MAKE) install DESTDIR=$(TMP) PREFIX=/usr )
+#	( cd $(CURDIR)/plugins/AuthzLDAP; \
+#	$(MAKE) install DESTDIR=$(TMP) PREFIX=/usr )
 	[ ! -d $(TMP)/usr/lib/perl5 ] || \
 		rmdir --ignore-fail-on-non-empty --parents --verbose \
 		$(TMP)/usr/lib/perl5
@@ -74,6 +76,8 @@
 
 binary-arch:
 # We have nothing to do here for an architecture-independent package
+
+# -XAuthentication/CAS -XAuthentication::CAS \
 
 binary-indep: build install
 	dh_testdir
@@ -89,7 +93,6 @@
 		-XFacebook \
 		-XOpenID \
 		-XGoogleMap \
-		-XAuthentication/CAS -XAuthentication::CAS \
 		-XAuthentication/Ldap -XAuthentication::Ldap \
 		-XPlugin/Chart -XPlugin::Chart \
 		-XPlugin/Comment -XPlugin::Comment \