--- perltidy-20120701.orig/lib/Perl/Tidy.pm +++ perltidy-20120701/lib/Perl/Tidy.pm @@ -6487,6 +6487,9 @@ if ( $rOpts->{'tee-pod'} ) { $tee_line = 1; } if ( !$skip_line && $line_type eq 'POD_START' + # If the previous line is a __DATA__ line (or data + # contents, it's not valid to change it at all, no + # matter what is in the data && !$saw_END_or_DATA_ ) { want_blank_line(); @@ -7358,7 +7361,7 @@ } } - # At present, tabs are not compatable with the line-up-parentheses style + # At present, tabs are not compatible with the line-up-parentheses style # (it would be possible to entab the total leading whitespace # just prior to writing the line, if desired). if ( $rOpts->{'line-up-parentheses'} && $rOpts->{'tabs'} ) { @@ -7368,7 +7371,7 @@ $rOpts->{'tabs'} = 0; } - # Likewise, tabs are not compatable with outdenting.. + # Likewise, tabs are not compatible with outdenting.. if ( $rOpts->{'outdent-keywords'} && $rOpts->{'tabs'} ) { warn <{_line_text} = $input_line; # update --- perltidy-20120701.orig/debian/watch +++ perltidy-20120701/debian/watch @@ -0,0 +1,4 @@ +# format version number, currently 2; this line is compulsory! +version=2 + +http://sf.net/perltidy/Perl-Tidy-(.*)\.tar\.gz \ No newline at end of file --- perltidy-20120701.orig/debian/control +++ perltidy-20120701/debian/control @@ -1,14 +1,19 @@ Source: perltidy -Section: interpreters +Section: devel Priority: optional -Maintainer: Steve Hancock -Build-Depends: debhelper (>= 3.0.5), perl (>= 5.6.1-7) -Standards-Version: 3.5.1 +Maintainer: Don Armstrong +Build-Depends: debhelper (>= 9) +Build-Depends-Indep: perl +Standards-Version: 3.9.3 +Homepage: http://perltidy.sourceforge.net/ +Vcs-Svn: svn://svn.donarmstrong.com/deb_pkgs/perltidy/trunk +Vcs-Browser: http://websvn.donarmstrong.com/deb_pkgs/perltidy/trunk + Package: perltidy Architecture: all -Depends: ${perl:Depends} -Description: A Perl script indenter and reformatter +Depends: ${perl:Depends}, ${misc:Depends} +Description: Perl script indenter and reformatter Perltidy is a Perl script which indents and reformats Perl scripts to make them easier to read. . @@ -16,5 +21,7 @@ The default parameter settings approximately follow the suggestions in the Perl Style Guide. . - If you write Perl scripts, or spend much time reading them, - you will probably find it useful. + Perltidy can also generate formatted HTML output from POD, and can + even generate colored output in HTML for scripts. See examples at + http://perltidy.sourceforge.net/ + . --- perltidy-20120701.orig/debian/copyright +++ perltidy-20120701/debian/copyright @@ -1,12 +1,14 @@ This is the debian package for the Perl::Tidy module. It was created by Aubin Paul using dh-make-perl. -This copyright info was automatically extracted from the perl module. -It may not be accurate, so you better check the module sources -if don't want to get into legal troubles. - The upstream author is: Steve Hancock -This program is free software; you can redistribute it and/or modify it under -the terms of the GNU General Public License Version 2, found on Debian systems -in the file /usr/share/common-licenses/GPL +Copyright (c) 2000-2009 by Steve Hancock +Distributed under the GPL license agreement; see file COPYING + +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 2 of the License, or +(at your option) any later version. + +License: GPL Available at /usr/share/common-licenses/GPL \ No newline at end of file --- perltidy-20120701.orig/debian/compat +++ perltidy-20120701/debian/compat @@ -0,0 +1 @@ +9 --- perltidy-20120701.orig/debian/changelog +++ perltidy-20120701/debian/changelog @@ -1,70 +1,76 @@ perltidy (20120701-1) unstable; urgency=low - * New upstream release + * New upstream release (closes: #681368) + + Don't munge contents of __DATA__ even when they + look like POD (closes: #614288) + * Switch to debhelper auto rules + * Document VCS location - -- Steve Hancock Sun, 01 Jul 2012 06:59:59 -0700 + -- Don Armstrong Fri, 13 Jul 2012 16:50:35 -0700 -perltidy (20120619-1) unstable; urgency=low +perltidy (20101217-1) unstable; urgency=low - * New upstream release + * New upstream release (closes: #613417) - -- Steve Hancock Tue, 19 Jun 2012 06:59:59 -0700 + -- Don Armstrong Mon, 14 Feb 2011 15:10:43 -0800 -perltidy (20101217-1) unstable; urgency=low +perltidy (20090616-1) unstable; urgency=low * New upstream release + * Update standards version; no changes + * Bump dh_compat to 5 + * Promote homepage + * Fix debian/copyright - -- Steve Hancock Fri, 17 Dec 2010 06:59:59 -0700 + -- Don Armstrong Tue, 23 Jun 2009 22:43:49 -0700 -perltidy (20090616-1) unstable; urgency=low +perltidy (20071205-2) unstable; urgency=low - * New upstream release + * Fix FTBFS on perl 5.10 - -- Steve Hancock Tue, 16 Jun 2009 06:59:59 -0700 + -- Don Armstrong Mon, 25 Feb 2008 14:52:26 -0800 perltidy (20071205-1) unstable; urgency=low * New upstream release - -- Steve Hancock Wed, 05 Dec 2007 09:54:33 -0800 + -- Don Armstrong Tue, 18 Dec 2007 15:53:34 -0800 perltidy (20070801-1) unstable; urgency=low * New upstream release - -- Steve Hancock Tue, 31 Jul 2007 19:12:50 -0700 + -- Don Armstrong Mon, 20 Aug 2007 23:07:33 -0700 perltidy (20070508-1) unstable; urgency=low * New upstream release - -- Steve Hancock Tue, 08 May 2007 13:04:28 -0700 + -- Don Armstrong Tue, 1 May 2007 03:03:29 -0700 -perltidy (20070504-1) unstable; urgency=low - - * New upstream release - - -- Steve Hancock Fri, 04 May 2007 07:03:29 -0700 - -perltidy (20070424-1) unstable; urgency=low - - * New upstream release - - -- Steve Hancock Tue, 24 Apr 2007 16:40:09 -0700 - perltidy (20060719-1) unstable; urgency=low * New upstream release - - -- Steve Hancock Wed, 19 Jul 2006 16:16:15 -0700 + -- Don Armstrong Fri, 28 Jul 2006 22:02:55 -0700 perltidy (20060614-1) unstable; urgency=low * New upstream release - -- Steve Hancock Tue, 13 Jun 2006 18:59:02 -0700 + -- Don Armstrong Fri, 23 Jun 2006 13:23:08 -0700 + +perltidy (20031021-2) unstable; urgency=low + * New maintainer adopting this package (closes: #206884) + * Modifications to packaging to make the package suitable for inclusion + in debian. (closes: #162066) + * Change Build-Depends to perl (>=5.6.0-16) as per perl policy + * Add reference to -st and note that - doesn't mean stdout to -o + documentation (closes: #202916) + * New upstream properly removes useless semi-colons (closes: #203171) + + -- Don Armstrong Wed, 18 Aug 2004 22:54:01 -0700 perltidy (20031021-1) unstable; urgency=low @@ -116,6 +122,4 @@ -- Dr. Guenter Bechly Tue, 27 Mar 2001 19:39:30 +0200 -Local variables: -mode: debian-changelog -End: + --- perltidy-20120701.orig/debian/rules +++ perltidy-20120701/debian/rules @@ -1,88 +1,7 @@ #!/usr/bin/make -f -#-*- makefile -*- -# Made with the aid of dh_make, by Craig Small -# Sample debian/rules that uses debhelper. GNU copyright 1997 by Joey Hess. -# Some lines taken from debmake, by Christoph Lameter. -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 -export DH_COMPAT=3 +%: + dh $@ -PACKAGE=$(shell dh_listpackages) - -ifndef PERL -PERL = /usr/bin/perl -endif - -ifndef DESTDIR -DESTDIR=.. -endif -TMP =`pwd`/debian/$(PACKAGE) - -build: build-stamp -build-stamp: - dh_testdir - - - # Add here commands to compile the package. - $(PERL) Makefile.PL INSTALLDIRS=vendor - $(MAKE) OPTIMIZE="-O2 -g -Wall" - - touch build-stamp - -clean: - dh_testdir - dh_testroot - rm -f build-stamp - - # Add here commands to clean up after the build process. - -$(MAKE) realclean - - dh_clean - -install: - dh_testdir - dh_testroot - dh_clean -k - dh_installdirs - - # Add here commands to install the package into debian/tmp. - #$(MAKE) install DESTDIR=`pwd`/debian/tmp - $(MAKE) install PREFIX=$(TMP)/usr - - -# Build architecture-dependent files here. -binary-arch: build install -# We have nothing to do by default. - -# Build architecture-independent files here. -binary-indep: build install -# dh_testversion - dh_testdir - dh_testroot - dh_installdocs BUGS TODO README examples/README docs/README - dh_installexamples - dh_installmenu -# dh_installemacsen -# dh_installinit - dh_installcron - dh_installman -# dh_undocumented - dh_installchangelogs CHANGES - dh_link - dh_strip - dh_compress - dh_fixperms -# dh_makeshlibs - dh_installdeb - dh_perl - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb --destdir=$(DESTDIR) - -source diff: - @echo >&2 'source and diff are obsolete - use dpkg-source -b'; false - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary +override_dh_installexamples: + dh_installexamples examples/* \ No newline at end of file --- perltidy-20120701.orig/debian/source/format +++ perltidy-20120701/debian/source/format @@ -0,0 +1 @@ +1.0 --- perltidy-20120701.orig/docs/perltidy.1 +++ perltidy-20120701/docs/perltidy.1 @@ -727,7 +727,7 @@ .IX Item "-icp, --indent-closing-paren" The \fB\-icp\fR flag is equivalent to \&\fB\-cti=2\fR, described in the previous section. The \fB\-nicp\fR flag is -equivalent \fB\-cti=0\fR. They are included for backwards compatability. +equivalent \fB\-cti=0\fR. They are included for backwards compatibility. .IP "\fB\-icb\fR, \fB\-\-indent\-closing\-brace\fR" 4 .IX Item "-icb, --indent-closing-brace" The \fB\-icb\fR option gives one extra level of indentation to a brace which @@ -2263,7 +2263,7 @@ for the previous item \fB\-blbs=n\fR. .IP "\fB\-bbs\fR, \fB\-\-blanks\-before\-subs\fR" 4 .IX Item "-bbs, --blanks-before-subs" -For compatability with previous versions, \fB\-bbs\fR or \fB\-\-blanks\-before\-subs\fR +For compatibility with previous versions, \fB\-bbs\fR or \fB\-\-blanks\-before\-subs\fR is equivalent to \fI\-blbp=1\fR and \fI\-blbs=1\fR. .Sp Likewise, \fB\-nbbs\fR or \fB\-\-noblanks\-before\-subs\fR @@ -2320,11 +2320,11 @@ The default is \fBn=1\fR. .IP "\fB\-sob\fR, \fB\-\-swallow\-optional\-blank\-lines\fR" 4 .IX Item "-sob, --swallow-optional-blank-lines" -This is equivalent to \fBkbl=0\fR and is included for compatability with +This is equivalent to \fBkbl=0\fR and is included for compatibility with previous versions. .IP "\fB\-nsob\fR, \fB\-\-noswallow\-optional\-blank\-lines\fR" 4 .IX Item "-nsob, --noswallow-optional-blank-lines" -This is equivalent to \fBkbl=1\fR and is included for compatability with +This is equivalent to \fBkbl=1\fR and is included for compatibility with previous versions. .SS "Styles" .IX Subsection "Styles" --- perltidy-20120701.orig/bin/perltidy +++ perltidy-20120701/bin/perltidy @@ -171,7 +171,9 @@ Name of the output file (only if a single input file is being processed). If no output file is specified, and output is not -redirected to the standard output, the output will go to F. +redirected to the standard output (see B<-st>), the output will go to +F. [Note: - does not redirect to standard output. Use +B<-st> instead.] =item B<-st>, B<--standard-output> @@ -614,7 +616,7 @@ The B<-icp> flag is equivalent to B<-cti=2>, described in the previous section. The B<-nicp> flag is -equivalent B<-cti=0>. They are included for backwards compatability. +equivalent B<-cti=0>. They are included for backwards compatibility. =item B<-icb>, B<--indent-closing-brace> @@ -2149,7 +2151,7 @@ =item B<-bbs>, B<--blanks-before-subs> -For compatability with previous versions, B<-bbs> or B<--blanks-before-subs> +For compatibility with previous versions, B<-bbs> or B<--blanks-before-subs> is equivalent to F<-blbp=1> and F<-blbs=1>. Likewise, B<-nbbs> or B<--noblanks-before-subs> @@ -2215,12 +2217,12 @@ =item B<-sob>, B<--swallow-optional-blank-lines> -This is equivalent to B and is included for compatability with +This is equivalent to B and is included for compatibility with previous versions. =item B<-nsob>, B<--noswallow-optional-blank-lines> -This is equivalent to B and is included for compatability with +This is equivalent to B and is included for compatibility with previous versions. =back