Load perltidy-20031021 into perltidy/trunk.

diff --git a/bin/perltidy b/bin/perltidy
index 23e3ccb36d4493d2976d0e70bf87e3798bea576d..66c16b843d773a1082ee371b796ab48b804c499f 100755 (executable)
--- a/bin/perltidy
+++ b/bin/perltidy
@@ -170,7 +170,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<filename.tdy>.
+redirected to the standard output (see B<-st>), the output will go to
+F<filename.tdy>. [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 15bc36bf710f10565fd253d0cc07d594cd9921b9..4e5e0608798b66de2ab4232aba23daea358d1aa9 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+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 <don@donarmstrong.com>  Wed, 18 Aug 2004 22:54:01 -0700
+
 perltidy (20031021-1) unstable; urgency=low
 
   * New upstream release
@@ -48,6 +60,4 @@ perltidy (20010323-1) unstable; urgency=low
 
  -- Dr. Guenter Bechly <gbechly@debian.org>  Tue, 27 Mar 2001 19:39:30 +0200
 
-Local variables:
-mode: debian-changelog
-End:
+

diff --git a/debian/control b/debian/control
index 5107fe8e30c53320edd7cfb496b23353a66b4424..9bd42ccad0a0095af816eac152d51eba24adf27e 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,14 +1,14 @@
 Source: perltidy
 Section: interpreters
 Priority: optional
-Maintainer: Steve Hancock <perltidy@users.sourceforge.net>
-Build-Depends: debhelper (>= 3.0.5), perl (>= 5.6.1-7)
-Standards-Version: 3.5.1
+Maintainer: Don Armstrong <don@donarmstrong.com>
+Build-Depends: debhelper (>= 3.0.5), perl (>= 5.6.0-16)
+Standards-Version: 3.6.1
 
 Package: perltidy
 Architecture: all
 Depends: ${perl:Depends}
-Description: A Perl script indenter and reformatter
+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 +16,8 @@ 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/
+ .
+ Homepage: http://perltidy.sourceforge.net/

diff --git a/debian/rules b/debian/rules
index f6289a72f7d44941403717b0bcbfe5e964f2ab4b..5241f1b7d24800cefdd1f4e90ef6821063016099 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -14,17 +14,12 @@ 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"
 
@@ -35,8 +30,10 @@ clean:
        dh_testroot
        rm -f build-stamp
 
-       # Add here commands to clean up after the build process.
-       -$(MAKE) realclean
+       if [ -e Makefile ]; then \
+               $(MAKE) distclean;\
+               rm -f Makefile;\
+       fi
 
        dh_clean
 
@@ -46,43 +43,31 @@ install:
        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_installexamples examples/*
        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
+       dh_builddeb
 
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary

diff --git a/debian/watch b/debian/watch
new file mode 100644 (file)
index 0000000..e37f1f8
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,4 @@
+# format version number, currently 2; this line is compulsory!
+version=2
+
+http://umn.dl.sourceforge.net/sourceforge/perltidy/Perl-Tidy-(.*)\.tar\.gz