r39024 - in /trunk/jifty/debian: changelog compat control copyright jifty.examples libjifty-perl.docs libjifty-perl.lintian-overrides patches/ patches/manpage-has-bad-whatis-entry.patch patches/series rules

yvesago-guest at users.alioth.debian.org yvesago-guest at users.alioth.debian.org
Wed Jul 1 10:08:29 UTC 2009 

Author: yvesago-guest
Date: Wed Jul  1 10:08:16 2009
New Revision: 39024

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=39024
Log:
  * New upstream release
  * Update patches
  * refresh to dh 7
  * upate lintian override
  * add ${misc:Depends} for dh7
  * Update copyright format to proposal rev=196
s/UNRELEASED/unstable/

Added:
    trunk/jifty/debian/jifty.examples
    trunk/jifty/debian/libjifty-perl.docs
    trunk/jifty/debian/patches/
    trunk/jifty/debian/patches/manpage-has-bad-whatis-entry.patch
    trunk/jifty/debian/patches/series
Modified:
    trunk/jifty/debian/changelog
    trunk/jifty/debian/compat
    trunk/jifty/debian/control
    trunk/jifty/debian/copyright
    trunk/jifty/debian/libjifty-perl.lintian-overrides
    trunk/jifty/debian/rules

Modified: trunk/jifty/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/jifty/debian/changelog?rev=39024&op=diff
==============================================================================
--- trunk/jifty/debian/changelog (original)
+++ trunk/jifty/debian/changelog Wed Jul  1 10:08:16 2009
@@ -1,6 +1,11 @@
-jifty (0.90630-1) UNRELEASED; urgency=low
+jifty (0.90630-1) unstable; urgency=low
 
   * New upstream release
+  * Update patches
+  * refresh to dh 7
+  * upate lintian override
+  * add ${misc:Depends} for dh7
+  * Update copyright format to proposal rev=196
 
  -- AGOSTINI Yves <agostini at univ-metz.fr>  Wed, 01 Jul 2009 08:18:49 +0200
 

Modified: trunk/jifty/debian/compat
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/jifty/debian/compat?rev=39024&op=diff
==============================================================================
--- trunk/jifty/debian/compat (original)
+++ trunk/jifty/debian/compat Wed Jul  1 10:08:16 2009
@@ -1,1 +1,1 @@
-5
+7

Modified: trunk/jifty/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/jifty/debian/control?rev=39024&op=diff
==============================================================================
--- trunk/jifty/debian/control (original)
+++ trunk/jifty/debian/control Wed Jul  1 10:08:16 2009
@@ -1,7 +1,7 @@
 Source: jifty
 Section: perl
 Priority: optional
-Build-Depends: debhelper (>= 5), quilt (>= 0.40)
+Build-Depends: debhelper (>= 7.0.50), quilt
 Build-Depends-Indep: perl (>= 5.8.3), libyaml-perl (>= 0.35),
  libtest-www-selenium-perl, libtest-pod-perl,
  libemail-simple-perl (>= 2.003), libcgi-pm-perl (>= 3.30),
@@ -54,7 +54,7 @@
 
 Package: jifty
 Architecture: all
-Depends: ${perl:Depends}, libjifty-perl
+Depends: ${perl:Depends}, ${misc:Depends}, libjifty-perl
 Description: perl web MVC framework
  Perl based web framekwork.
  Jifty offers the following features:

Modified: trunk/jifty/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/jifty/debian/copyright?rev=39024&op=diff
==============================================================================
--- trunk/jifty/debian/copyright (original)
+++ trunk/jifty/debian/copyright Wed Jul  1 10:08:16 2009
@@ -1,8 +1,8 @@
-Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=102
-Debianized-By: AGOSTINI Yves <agostini at univ-metz.fr>
-Debianized-Date: Sun, 16 Jun 2008 17:41:06 +0200
-Original-Source-Location: http://search.cpan.org/dist/Jifty/
-Upstream-Author: Shawn M Moore <sartak at bestpractical.com>
+Format-Specification:
+    http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=196
+Upstream-Maintainer: Jesse Vincent, Alex Vandiver and David Glasser.
+Upstream-Source: http://search.cpan.org/dist/Jifty/
+Upstream-Name: Jifty
 
 Files: *
 Copyright: Copyright 2005-2009 Best Practical Solutions, LLC. 
@@ -171,14 +171,19 @@
  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 Files: debian/*
-Copyright: Copyright 2009 Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
-License: GPL-1+ | Artistic
- The Debian packaging is put under the same terms as the module itself.
+Copyright: 2008, 2009, AGOSTINI Yves <agostini at univ-metz.fr>
+License: Artistic | GPL-1+
 
-Perl is distributed under your choice of the GNU General Public License or
-the Artistic License.  On Debian GNU/Linux systems, the complete text of the
-GNU General Public License can be found in `/usr/share/common-licenses/GPL'
-and the Artistic Licence in `/usr/share/common-licenses/Artistic'. The Apache,
-version 2.0 license can be found in `/usr/share/common-licenses/Apache-2.0'.
-The BSD license can be found in `/usr/share/common-licenses/BSD'. The LGPL
-license can be found in `/usr/share/common-licenses/LGPL'.
+License: Artistic
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the Artistic License, which comes with Perl.
+    On Debian GNU/Linux systems, the complete text of the Artistic License
+    can be found in `/usr/share/common-licenses/Artistic'
+
+License: GPL-1+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 1, or (at your option)
+    any later version.
+    On Debian GNU/Linux systems, the complete text of the GNU General
+    Public License can be found in `/usr/share/common-licenses/GPL'

Added: trunk/jifty/debian/jifty.examples
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/jifty/debian/jifty.examples?rev=39024&op=file
==============================================================================
--- trunk/jifty/debian/jifty.examples (added)
+++ trunk/jifty/debian/jifty.examples Wed Jul  1 10:08:16 2009
@@ -1,0 +1,2 @@
+doc/examples/*
+examples/*

Added: trunk/jifty/debian/libjifty-perl.docs
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/jifty/debian/libjifty-perl.docs?rev=39024&op=file
==============================================================================
--- trunk/jifty/debian/libjifty-perl.docs (added)
+++ trunk/jifty/debian/libjifty-perl.docs Wed Jul  1 10:08:16 2009
@@ -1,0 +1,3 @@
+debian/NEWS
+debian/README.Debian
+debian/README.source

Modified: trunk/jifty/debian/libjifty-perl.lintian-overrides
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/jifty/debian/libjifty-perl.lintian-overrides?rev=39024&op=diff
==============================================================================
--- trunk/jifty/debian/libjifty-perl.lintian-overrides (original)
+++ trunk/jifty/debian/libjifty-perl.lintian-overrides Wed Jul  1 10:08:16 2009
@@ -14,4 +14,4 @@
 # license in rsh.js file in copyright
 libjifty-perl: extra-license-file usr/share/perl5/auto/share/dist/Jifty/plugins/Jifty/Plugin/SinglePage/web/static/js/singlepage/rsh/LICENSE.txt
 # one more chinese tutorial
-libjifty-perl: manpage-has-errors-from-man usr/share/man/man3/Jifty::Manual::Deploying_zhtw.3pm.gz 139: warning [p 1, 2.2i]: can't break line
+#libjifty-perl: manpage-has-errors-from-man usr/share/man/man3/Jifty::Manual::Deploying_zhtw.3pm.gz 139: warning [p 1, 2.2i]: can't break line

Added: trunk/jifty/debian/patches/manpage-has-bad-whatis-entry.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/jifty/debian/patches/manpage-has-bad-whatis-entry.patch?rev=39024&op=file
==============================================================================
--- trunk/jifty/debian/patches/manpage-has-bad-whatis-entry.patch (added)
+++ trunk/jifty/debian/patches/manpage-has-bad-whatis-entry.patch Wed Jul  1 10:08:16 2009
@@ -1,0 +1,14 @@
+Author: yvesago-guest (Yves Agostini)
+Upstream: commit revision 7285 
+===================================================================
+--- a/lib/Jifty/Plugin/SetupWizard/Action/TestDatabaseConnectivity.pm
++++ b/lib/Jifty/Plugin/SetupWizard/Action/TestDatabaseConnectivity.pm
+@@ -78,7 +78,7 @@
+ 
+ =head1 NAME
+ 
+-Jifty::Plugin::SetupWizard::Action::TestDatabaseConnectivity
++Jifty::Plugin::SetupWizard::Action::TestDatabaseConnectivity - Test database connectivity action
+ 
+ =head1 METHODS
+ 

Added: trunk/jifty/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/jifty/debian/patches/series?rev=39024&op=file
==============================================================================
--- trunk/jifty/debian/patches/series (added)
+++ trunk/jifty/debian/patches/series Wed Jul  1 10:08:16 2009
@@ -1,0 +1,1 @@
+manpage-has-bad-whatis-entry.patch

Modified: trunk/jifty/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/jifty/debian/rules?rev=39024&op=diff
==============================================================================
--- trunk/jifty/debian/rules (original)
+++ trunk/jifty/debian/rules Wed Jul  1 10:08:16 2009
@@ -1,92 +1,23 @@
 #!/usr/bin/make -f
-# This debian/rules file is provided as a template for normal perl
-# packages. It was created by Marc Brockschmidt <marc at dch-faq.de> for
-# the Debian Perl Group (http://pkg-perl.alioth.debian.org/) but may
-# be used freely wherever it is useful.
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+export DH_ALWAYS_EXCLUDE=.svn
 
-# If set to a true value then MakeMaker's prompt function will
-# 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"
+%:
+	dh --with quilt $@
 
-PERL   ?= /usr/bin/perl
-PACKAGE = jifty
-TMP     = $(CURDIR)/debian/tmp
+#override_dh_auto_test:
+	# skip test for buil test
 
-#include /usr/share/quilt/quilt.make
-#build-stamp: $(QUILT_STAMPFN)
-
-build: build-stamp
-build-stamp: 
-	dh_testdir
-	PERL5_CPANPLUS_IS_RUNNING=1 $(PERL) Makefile.PL --skipdeps INSTALLDIRS=vendor
-	$(MAKE)
-	# needed by tests
-	mkdir -p t/TestApp-RestartServer/var
-	LANG=C http_proxy= $(MAKE) test
-	touch $@
-
-#clean: unpatch
-clean: 
-	dh_testdir
-	dh_testroot
-	dh_clean build-stamp install-stamp
-	# remove mason cache files
-	rm -rf t/TestApp/mason*
-	# remove test sqlite database
-	rm -rf t/TestApp/testapp*
-	# remove test mailbox
-	rm -rf t/TestApp/mailbox*
-	# remove test file
-	rm -rf t/TestApp-RestartServer/var
-
-install: install-stamp
-install-stamp: build-stamp
-	dh_testdir
-	dh_testroot
-	dh_clean -k 
-	$(MAKE) install DESTDIR=$(TMP) PREFIX=/usr
-	[ ! -d $(TMP)/usr/lib/perl5 ] || \
-		rmdir --ignore-fail-on-non-empty --parents --verbose \
-		$(TMP)/usr/lib/perl5
-	touch $@
-
-binary-arch:
-# We have nothing to do here for an architecture-independent package
-
-# -XAuthentication/CAS -XAuthentication::CAS \
-
-binary-indep: build install
-	dh_testdir 
-	dh_testroot 
-	dh_installexamples  doc/examples/* examples/*
+override_dh_install:
 	dh_install 
 	dh_install -plibjifty-perl -XManual/Tutorial \
-		-Xprototypism/scriptaculous -Xjs/jquery-1.2.6.js \
-		-Xprototype.js \
-		debian/tmp/*
-	dh_installdocs 
-	dh_installchangelogs Changelog
-	dh_installdirs -plibjifty-perl usr/share/lintian/overrides
-	install -m 644 debian/libjifty-perl.lintian-overrides $(CURDIR)/debian/libjifty-perl/usr/share/lintian/overrides/libjifty-perl
-	dh_perl
-	dh_compress
+                -Xprototypism/scriptaculous -Xjs/jquery-1.2.6.js \
+                -Xprototype.js \
+                debian/tmp/*
+
+override_dh_fixperms:
 	dh_fixperms
 	# fix some mistake in right on web files
-	chmod 644 $(CURDIR)/debian/libjifty-perl/usr/share/perl5/auto/share/dist/Jifty/web/static/css/*.css
-	chmod 644 $(CURDIR)/debian/libjifty-perl/usr/share/perl5/auto/share/dist/Jifty/web/static/js/*.js
-	#chmod 644 $(CURDIR)/debian/libjifty-perl/usr/share/perl5/auto/Jifty/plugins/Jifty/Plugin/OnlineDocs/web/templates/__jifty/online_docs/autohandler
-	#chmod 644 $(CURDIR)/debian/libjifty-perl/usr/share/perl5/auto/Jifty/plugins/Jifty/Plugin/AdminUI/web/templates/__jifty/admin/_elements/nav
-	chmod 644 $(CURDIR)/debian/libjifty-perl/usr/share/perl5/auto/share/dist/Jifty/plugins/Jifty/Plugin/AdminUI/web/templates/__jifty/admin/_elements/nav
-	dh_link
-	dh_installdeb
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb 
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+	chmod 644 $(CURDIR)/debian/tmp/usr/share/perl5/auto/share/dist/Jifty/web/static/css/*.css
+	chmod 644 $(CURDIR)/debian/tmp/usr/share/perl5/auto/share/dist/Jifty/web/static/js/{i,jquery.}*.js
+	chmod 644 $(CURDIR)/debian/tmp/usr/share/perl5/auto/share/dist/Jifty/plugins/Jifty/Plugin/AdminUI/web/templates/__jifty/admin/_elements/nav

More information about the Pkg-perl-cvs-commits mailing list