From: Don Armstrong Date: Sat, 8 Mar 2014 02:12:33 +0000 (-0800) Subject: merge upstream version 20130922 X-Git-Tag: debian/20170521-1~19 X-Git-Url: https://git.donarmstrong.com/?p=perltidy.git;a=commitdiff_plain;h=95f0396837606890bfbd39a5aa0254af7c8b4f52;hp=caa9a6008de8bbc9dddfb772bff67005c099d6dd merge upstream version 20130922 --- diff --git a/bin/perltidy b/bin/perltidy index 0809763..64ab4a0 100755 --- a/bin/perltidy +++ b/bin/perltidy @@ -175,7 +175,9 @@ Show summary of usage and exit. 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> diff --git a/debian/changelog b/debian/changelog index 01d65c8..fbf2f8b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,100 +1,76 @@ -perltidy (20130805-1) unstable; urgency=low - - * New upstream release - - -- Steve Hancock Mon, 05 Aug 2013 06:59:59 -0700 - -perltidy (20121207-1) unstable; urgency=low - - * New upstream release - - -- Steve Hancock Wed, 17 Jul 2013 06:59:59 -0700 - -perltidy (20121207-1) unstable; urgency=low - - * new upstream release - - -- steve hancock fri, 07 dec 2012 06:59:59 -0700 - -perltidy (20120717-1) unstable; urgency=low - - * New upstream release - - -- Steve Hancock Tue, 17 Jul 2012 06:59:59 -0700 - -perltidy (20120714-1) unstable; urgency=low - - * New upstream release - - -- Steve Hancock Sat, 14 Jul 2012 06:59:59 -0700 - 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 - -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 + -- Don Armstrong Tue, 1 May 2007 03:03:29 -0700 - -- 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 @@ -146,6 +122,4 @@ perltidy (20010323-1) unstable; urgency=low -- Dr. Guenter Bechly Tue, 27 Mar 2001 19:39:30 +0200 -Local variables: -mode: debian-changelog -End: + diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..ec63514 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +9 diff --git a/debian/control b/debian/control index 5107fe8..54e1b3c 100644 --- a/debian/control +++ b/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 @@ Description: A Perl script indenter and reformatter 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/ + . diff --git a/debian/copyright b/debian/copyright index 8cc9b9d..f2739ec 100644 --- a/debian/copyright +++ b/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 diff --git a/debian/rules b/debian/rules index f6289a7..945a74d 100755 --- a/debian/rules +++ b/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 diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..d3827e7 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +1.0 diff --git a/debian/watch b/debian/watch new file mode 100644 index 0000000..1500f7b --- /dev/null +++ b/debian/watch @@ -0,0 +1,3 @@ +# format version number, currently 2; this line is compulsory! +version=2 +http://search.cpan.org/CPAN/authors/id/S/SH/SHANCOCK/Perl-Tidy-(.+)\.tar\.gz \ No newline at end of file