--- astyle-1.22.orig/debian/astyle.docs +++ astyle-1.22/debian/astyle.docs @@ -0,0 +1,5 @@ +doc/astyle.html +doc/astyleX.html +doc/notes.html +doc/news.html +doc/links.html --- astyle-1.22.orig/debian/rules +++ astyle-1.22/debian/rules @@ -0,0 +1,72 @@ +#!/usr/bin/make -f + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +# This package uses dpatch +include /usr/share/dpatch/dpatch.make + +# Flags for debugging, and original flags from the program. +CXXFLAGS = -g -Wall -Wno-sign-compare + +# Flags for optimization +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CXXFLAGS += -O0 +else + CXXFLAGS += -O2 +endif + +# Target for stripping / not stripping +BUILD_TARGET = astyle +ifneq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) + BUILD_TARGET = astyled +endif + +# The Makefile erroneously calls CPPFLAGS the CXXFLAGS +build: build-stamp +build-stamp: patch-stamp + dh_testdir + $(MAKE) -C buildgcc $(BUILD_TARGET) CFLAGS="$(CXXFLAGS)" + [ "$(BUILD_TARGET)" = "astyle" ] || mv bin/$(BUILD_TARGET) bin/astyle + touch build-stamp + +clean: unpatch + dh_testdir + dh_testroot + rm -f build-stamp install-stamp + [ ! -f buildgcc/Makefile ] || $(MAKE) -C buildgcc clean + rm -rf buildgcc/obj + rm -rf bin + dh_clean + +install: install-stamp +install-stamp: build-stamp + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + dh_install + touch install-stamp + +# Build architecture-independent files here. +binary-indep: build install +# We have nothing to do by default. + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir + dh_testroot + dh_installdocs + dh_installman + dh_installchangelogs + dh_strip + dh_compress + dh_fixperms + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary patch-stamp unpatch --- astyle-1.22.orig/debian/copyright +++ astyle-1.22/debian/copyright @@ -0,0 +1,23 @@ +The original source code was downloaded from http://astyle.sourceforge.net/ + +Files: * +Copyright: © 1998-2004 Tal Davidson , + © 2005-2006 Martin Baute + © 2006-2008 Jim Pattee +License: LGPL-2.1+ + The "Artistic Style" project, including all files needed to + compile it, is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later + version. + +Files: debian/* +Copyright: © 1999 Brian M. Almeida , + © 1999-2001 Sean 'Shaleh' Perry + © 2001-2003 Luca Filipozzi + © 2004-2008 Margarita Manterola +License: LGPL-2.1+ + +On Debian machines, the full text of the GNU Lesser General Public License +be found in the file /usr/share/common-licenses/LGPL. --- astyle-1.22.orig/debian/changelog +++ astyle-1.22/debian/changelog @@ -0,0 +1,237 @@ +astyle (1.22-1) unstable; urgency=low + + * New upstream release + + Fix incorrect identification of bracket type following a struct + statement. (Closes: #112546) + * Added new "links.html" document to debian/astyle.docs + * Changed debian/rules to use the new "buildgcc" directory. + * Corrected the doc-base section. + + -- Margarita Manterola Sun, 27 Apr 2008 13:58:37 +0000 + +astyle (1.21-3) unstable; urgency=low + + * Fixed debian/rules so that "nostrip" is honored by the build process. + (Closes: #436484) + * Fixed the clean rule to actually call make clean. + + -- Margarita Manterola Tue, 11 Mar 2008 17:51:07 +0000 + +astyle (1.21-2) unstable; urgency=low + + * New fix_for_gcc_4.3.dpatch, provided by Cyril Brulebois. + (Closes: #455426) + * Fixed watch file. + * Added Homepage field to the Source package. + * Updated Standards-Version (no changes needed). + * Fixed debian/rules to not ignore make clean errors. + * Fixed debian/copyright to have a copyright statement and make it machine + parseable. Added the years for the upstream authors and the debian + maintainers. + * Updated the doc-base section to reflect the new menu structure. + + -- Margarita Manterola Tue, 11 Mar 2008 17:34:44 +0000 + +astyle (1.21-1) unstable; urgency=low + + * New upstream release + + Do not apply fix_for_gcc_4.3.dpatch, since it's now applied upstream. + + Fix formatting of empty blocks. (Closes: #397799) + + -- Margarita Manterola Fri, 22 Jun 2007 17:49:56 -0300 + +astyle (1.20.2-2) unstable; urgency=low + + * New upstream release (now in unstable). (Closes: #412333). + + Fix incorrect formatting for an empty comment (Closes: #415565). + * Added debian/patches/fix_for_gcc_4.3.dpatch, fixing the dependencies + for gcc 4.3 (Closes: #413481). Thanks to Martin Michlmayr for the + report and the patch. + + -- Margarita Manterola Sun, 15 Apr 2007 14:12:30 -0300 + +astyle (1.20.2-1) experimental; urgency=low + + * New upstream release. (Would close: #412333) + * Changed copyright file, astyle is now LGPL. + * Updated the manpage to the current version. + + -- Margarita Manterola Tue, 13 Mar 2007 00:23:12 -0300 + +astyle (1.18-1) unstable; urgency=low + + * New upstream release (Closes: #375760). + + Doesn't remove leading spaces from multi-line comments. + (Closes: #201655) + + Fixed indentation problem with ending }; of class statements. + (Closes: #270999) + + Fixed extra space that was sometimes added when pad operators was + used. (Closes: #118203) + + Fixed problems detecting some keywords as "lock" or "get". + (Closes: #355171) + * Updated debhelper compatibility to level 5, no changes needed. + * Updated Standards-Version to 3.7.2, no changes needed. + * Updated the watch file. + * Dropped 100_g++-3.4.dpatch, since it has been applied upstream. + * Dropped 200_long_lines.dpatch, since it has been applied upstream. + + -- Margarita Manterola Sat, 15 Jul 2006 19:32:20 -0300 + +astyle (1.15.3-5) unstable; urgency=low + + * New upload to trigger a recompile due to the C++ transition. + * Fixed debian/rules to comply better with policy. + * Updated debian/control to the latest policy version. + + -- Margarita Manterola Tue, 4 Oct 2005 11:13:02 -0300 + +astyle (1.15.3-4) unstable; urgency=low + + * Added patch to support longer lines (closes: #187171). + * Fixed typo in the manpage (closes: #238693). + * Added patch to support g++-3.4 (closes: #266663). + * Added dpatch to work with patches. + * Fixed the watch and control files to match present policy. + * New Maintainer - Adopting package (closes: #266457). + + -- Margarita Manterola Thu, 21 Oct 2004 12:09:00 -0300 + +astyle (1.15.3-3) unstable; urgency=low + + * built with latest g++ + + -- Luca Filipozzi Sat, 14 Jun 2003 11:27:20 -0700 + +astyle (1.15.3-2) unstable; urgency=low + + * the 'no new functionality' release + * debian/watch: trivial change to handle sf.net brokeness + + -- Luca Filipozzi Sun, 2 Jun 2002 17:26:27 -0700 + +astyle (1.15.3-1) unstable; urgency=low + + * New upstream release + * Note that the license has changed: + was: (dual) GPL + Artistic + is: GPL only + + -- Luca Filipozzi Sat, 23 Mar 2002 17:40:03 -0800 + +astyle (1.14.1-5) unstable; urgency=low + + * added a watch file + + -- Luca Filipozzi Wed, 26 Dec 2001 12:38:03 -0800 + +astyle (1.14.1-4) unstable; urgency=low + + * fixed html bug and used tidy on astyle.html (Closes: Bug#120184) + + -- Luca Filipozzi Mon, 19 Nov 2001 03:27:31 -0800 + +astyle (1.14.1-3) unstable; urgency=low + + * minor modification to copyright notice + + -- Luca Filipozzi Tue, 23 Oct 2001 08:14:02 -0700 + +astyle (1.14.1-2) unstable; urgency=low + + * Added a manpage for astyle (provided by "The Missing Man Pages Project") + + -- Luca Filipozzi Sat, 18 Aug 2001 13:11:50 -0700 + +astyle (1.14.1-1) unstable; urgency=low + + * New upstream release (Closes: #108992) + + -- Luca Filipozzi Sat, 18 Aug 2001 11:25:49 -0700 + +astyle (1.11.6-4) unstable; urgency=low + + * applied patch provided by Matthew Wilcox to + allow astyle to be compiled with gcc 3.0 (Closes: #104406, #104683) + + -- Luca Filipozzi Sun, 15 Jul 2001 20:25:34 -0700 + +astyle (1.11.6-3) unstable; urgency=low + + * Adopting package (Closes: #86873). + + -- Luca Filipozzi Thu, 22 Feb 2001 11:02:34 -0800 + +astyle (1.11.6-2) unstable; urgency=low + + * Orphaning package + + -- Sean 'Shaleh' Perry Wed, 21 Feb 2001 08:01:35 -0800 + +astyle (1.11.6-1) unstable; urgency=low + + * New upstream release + + -- Sean 'Shaleh' Perry Mon, 22 May 2000 16:31:30 -0700 + +astyle (1.11.5-1) unstable; urgency=low + + * New upstream release + * changes to meet current policy + + -- Sean E. Perry Thu, 11 Nov 1999 22:31:40 -0800 + +astyle (1.11.4-1) unstable; urgency=low + + * New upstream + * supports FHS policy now + + -- Sean E. Perry Mon, 20 Sep 1999 15:05:39 -0700 + +astyle (1.11.1-1) unstable; urgency=low + + * New upstream release + * New maintainer + + -- Sean E. Perry Fri, 3 Sep 1999 11:17:28 -0700 + +astyle (1.10.4-3) unstable; urgency=low + + * Rebuild with newer debhelper (Closes: #43208) + + -- Brian M. Almeida Thu, 19 Aug 1999 09:59:26 -0400 + +astyle (1.10.4-2) unstable; urgency=low + + * Make help print out to stdout instead of stderr (Closes: #42551) + + -- Brian M. Almeida Fri, 6 Aug 1999 09:05:29 -0400 + +astyle (1.10.4-1) unstable; urgency=low + + * New upstream release + + -- Brian M. Almeida Wed, 4 Aug 1999 11:03:36 -0400 + +astyle (1.10.1-1) unstable; urgency=low + + * New upstream release + + -- Brian M. Almeida Wed, 21 Jul 1999 11:13:01 -0400 + +astyle (1.8.2-1) unstable; urgency=low + + * New upstream release + + -- Brian M. Almeida Wed, 24 Mar 1999 18:46:15 -0500 + +astyle (1.8.1-1) unstable; urgency=low + + * New upstream release + + -- Brian M. Almeida Thu, 11 Mar 1999 01:16:11 -0500 + +astyle (1.7.6-1) unstable; urgency=low + + * Initial Release. + + -- Brian M. Almeida Mon, 22 Feb 1999 00:19:25 -0500 --- astyle-1.22.orig/debian/astyle.doc-base +++ astyle-1.22/debian/astyle.doc-base @@ -0,0 +1,11 @@ +Document: astyle +Title: Artistic Style documentation +Author: Tal Davidson +Abstract: Documentation for the Artistic Style code reformatter. + . +Section: Programming + +Format: HTML +Index: /usr/share/doc/astyle/astyle.html +Files: /usr/share/doc/astyle/astyle.html + --- astyle-1.22.orig/debian/watch +++ astyle-1.22/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://sf.net/astyle/astyle_(.*)__linux\.tar\.gz --- astyle-1.22.orig/debian/control +++ astyle-1.22/debian/control @@ -0,0 +1,14 @@ +Source: astyle +Section: devel +Priority: optional +Build-Depends: debhelper (>= 5.0), dpatch +Maintainer: Margarita Manterola +Standards-Version: 3.7.3 +Homepage: http://astyle.sourceforge.net/ + +Package: astyle +Architecture: any +Depends: ${shlibs:Depends} +Description: Source code indenter for C++/C/Java/C# source code + Artistic Style is a reindenter and reformatter of C++, C, Java or C# + source code. --- astyle-1.22.orig/debian/astyle.install +++ astyle-1.22/debian/astyle.install @@ -0,0 +1 @@ +bin/astyle usr/bin --- astyle-1.22.orig/debian/compat +++ astyle-1.22/debian/compat @@ -0,0 +1 @@ +5 --- astyle-1.22.orig/debian/astyle.1 +++ astyle-1.22/debian/astyle.1 @@ -0,0 +1,281 @@ +.TH ASTYLE 1 "March 13, 2007" astyle "User's Manual" +.SH NAME +astyle \- indentation and reformatting filters for C, C++, C#, Java + +.SH SYNOPSIS +.B astyle +[\fIOPTIONS\fR] < \fIOriginal\fR > \fIBeautified\fR + +\fBastyle\fR [\fIOPTIONS\fR] [\fIFILE1\fR] [\fIFILE2\fR] [\fI...\fR] + +.SH DESCRIPTION +\fBArtistic Style\fR (or \fBastyle\fR) is a reindenter and reformatter for +the C, C++, C# and Java programming languages. + +When indenting source code, we as programmers have a tendency to use both +spaces and tab characters to create the wanted indentation. Moreover, some +editors by default insert spaces instead of tabs when pressing the tab key, and +other editors (Emacs for example) have the ability to "pretty up" lines by +automatically setting up the white space before the code on the line, possibly +inserting spaces in a code that up to now used only tabs for indentation. + +Since the NUMBER of space characters showed on screen for each tab character +in the source code changes between editors (until the user sets up the number +to his liking...), one of the standard problems facing programmers when moving +from one source code editor to another is that code containing both spaces and +tabs that was up to now perfectly indented, suddently becomes a mess to look +at when changing to another editor. Even if you as a programmer take care to +ONLY use spaces or tabs, looking at other peoples source code can still be +problematic. + +To address this problem \fBastyle\fR was created - a series of filters, +written in C++, that automatically reindent and reformat C/C++/C#/Java source +files. These can be used from a command line, or it can be incorporated as +classes in another C++ program. + +.SH USAGE +When indenting a specific file, the newly indented file RETAINS the +original filename. While a copy of the original file is created, with a +suffix of ".orig" added to the original filename. + +By default, astyle is set up to indent C/C++ files, with 4 spaces per +indent, a maximal indentation of 40 spaces inside continuous statements, +and NO formatting. + +A default options file may be used to set your favorite source style. But, +the command line options have precedence. The default options file can be +\fB$HOME/.astylerc\fR, or be specified in the \fBARTISTIC_STYLE_OPTIONS\fR +environment variable or the \fB--options\fR command line option. + +.SH OPTIONS +This program follows the usual GNU command line syntax, with long options +starting with two dashes (`--'). Long options must be written one at a time. +Short options (starting with '-') may be appended together. + +Thus, \fB-bps4\fR is the same as \fB-b -p -s4\fR. + +A summary of the options supported by \fBastyle\fR is included below. + +.SS "Predefined Styling options:" + +Predefined Style options define the style by setting several other options. +If other options are also used, the placement of the predefined style +option in the command line is important. If the predefined style option is +placed first, the other options may override the predefined style. If +placed last, the predefined style will override the other options. + +.BR \-\-style= ansi +ANSI style formatting/indenting. +.TP +.BR \-\-style= kr +Kernighan&Ritchie style formatting/indenting. +.TP +.BR \-\-style= gnu +GNU style formatting/indenting. +.TP +.BR \-\-style= java +Java mode, with standard java style formatting/indenting. +.TP +.BR \-\-style= linux +Linux mode (i.e. 8 spaces per indent, break definition-block +brackets but attach command-block brackets). + +.SS "Tab and Bracket Options:" +.TP +\fB\-s, \-s\fR\fI#\fR\fB, \--indent=\fR\fIspaces=#\fR +Indent using # spaces per indent. Between 2 to 20. +Not specifying # will result in a default of 4 spaces +per indent. +.TP +\fB\-t, \-t\fR\fI#\fR\fB, \-\-indent=\fR\fItab=#\fR +Indent using tab characters, assuming that each +tab is # spaces long. Between 2 and 20. Not specifying # will result in a +default assumption of 4 spaces per tab. +.TP +\fB\-T\fR\fI#\fR\fB, \-\-indent-tab=#\fR +Indent using tab characters, assuming that each +tab is # spaces long. Between 2 and 20. Force tabs to be used in areas +astyle would usually prefer to use spaces (as in multi-line statements). + +.TP +\fB\-b, \-\-brackets=\fR\fIbreak\fR\fR +Break brackets from pre-block code (i.e. ANSI C/C++ style). +.TP +\fB\-a, \-\-brackets=\fR\fIattach\fR +Attach brackets to pre-block code (i.e. Java/K&R style). +.TP +\fB\-l, \-\-brackets=\fR\fIlinux\fR +Break brackets from class and function declarations, but attach brackets +to pre-block command statements. +.TP +\fB\-y, \-\-brackets=\fR\fIbreak-closing\fR +Break brackets before closing headers (e.g. 'else', 'catch', ..). +Should be appended to --brackets=attach or --brackets=linux. + +.SS "Indentation Options:" +.TP +\fB\-C, \-\-indent-classes\fR +Indent 'class' blocks, so that the inner 'public:', 'protected:' +and 'private:' headers are indented in relation to the class block. +.TP +\fB\-S, \-\-indent-switches\fR +Indent 'switch' blocks, so that the inner 'case XXX:' +headers are indented in relation to the switch block. +The entire case block is indented. +.TP +\fB\-K, \-\-indent-cases\fR +Indent 'case XXX:' lines, so that they are flush with +their bodies. Case statements not enclosed in blocks are NOT indented. +.TP +\fB\-N, \-\-indent-namespaces\fR +Indent the contents of namespace blocks. +.TP +\fB\-B, \-\-indent-brackets\fR +Add extra indentation to '{' and '}' block brackets. This option has no +effect if --indent-blocks is used. +.TP +\fB\-G, \-\-indent-blocks\fR +Add extra indentation entire blocks (including brackets). +.TP +\fB\-L, \-\-indent-labels\fR +Indent labels so that they appear one indent less than +the current indentation level, rather than being +flushed completely to the left (which is the default). +.TP +\fB\-w, \-\-indent-preprocessor\fR +Indent multi-line preprocessor definitions. Should be used with --convert-tabs +for proper results. +.TP +\fB\-m#, \-\-min-conditional-indent=\fR\fI#\FR\fR +Indent a minimal # spaces in a continuous conditional +belonging to a conditional header. Must be less than 40. +The default value is 8. +.TP +\fB\-M#, \-\-max-instatement-indent=\fR\fI#\fR +Indent a maximal # spaces in a continuous statement, +relatively to the previous line. Must be less than 80. +The default value is 40. + +.SS "Formatting options:" +.TP +\fB\-f, \-\-break-blocks\fR +Insert empty lines around unrelated blocks, labels, classes, ... +.TP +\fB\-F, \-\-break-blocks=all\fR +Like --break-blocks, except also insert empty lines +around closing headers (e.g. 'else', 'catch', ...). +.TP +\fB\-e, \-\-break-elseifs\fR +Break 'else if()' statements into two different lines. +.TP +\fB\-p, \-\-pad=\fR\fIoper\fR +Insert space paddings around operators only. Operators inside block parens +[] are not padded. +.TP +\fB\-P, \-\-pad=\fR\fIparen\fR +Insert space paddings around parenthesies on both the outside and the +inside. +.TP +\fB\-d, \-\-pad=\fR\fIparen-out\fR +Insert space paddings around parenthesies on the outside only. This can be +used with unpad=paren to remove unwanted spaces. +.TP +\fB\-D, \-\-pad=\fR\fIparen-in\fR +Insert space paddings around parenthesies on the inside only. This can be +used with unpad=paren to remove unwanted spaces. +.TP +\fB\-U, \-\-unpad=\fR\fIparen\fR +Remove space padding around parenthesis on the inside and outside. Can be +used in combination with the paren padding options. Only padding that +has not been requested by other options will be removed. +.TP +\fB\-o, \-\-one-line=\fR\fIkeep-statements\fR +Don't break lines containing multiple statements into +multiple single-statement lines. +.TP +\fB\-O, \-\-one-line=\fR\fIkeep-blocks\fR +Don't break blocks residing completely on one line +.TP +\fB\-V, \-\-convert-tabs\fR +Convert tabs to spaces. +.TP +\fB\-E, \-\-fill-empty-lines\fR +Fill empty lines with the white space of their +previous lines. + +.SS "Indentation modes:" +The modes used for indentation are set by each file's extension, but it can +be overriden with the following options: +\fB\-c,\-\-mode=\fR\fIc\fR +Indent a C or C++ source file (default) +.TP +\fB\-j,\-\-mode=\fR\fI\fR\fIjava\fR +Indent a Java(TM) source file + +.SS "Other options:" +.TP +\fB\-\-suffix=\fR\fI####\fR +Append the suffix \fI####\fR instead of '.orig' to original filename. +.TP +\fB\-n, \-\-suffix=\fR\fInone\fR +Do not retain a backup of the original file. The original file is purged +after it is formatted. +.TP +\fB\-\-options=\fR\fI####\fR +Specify an options file \fI####\fR to read and use. +.TP +\fB\-\-options=\fR\fInone\fR +Disable the default options file. Only the command-line parameters will be +used. +.TP +\fB\-X, \-\-errors-to-standard-output\fR +Print errors and help information to standard-output rather than +to standard-error. +.TP +\fB\-v, \-\-version\fR +Print version number +.TP +\fB\-h, \-?, \-\-help\fR +Show summary of Options + +.SH FILES +Artistic Style looks for a default options file in the +following order: +.TP +.B 1. +The contents of the \fIARTISTIC_STYLE_OPTIONS\fR environment variable if it +exists. +.TP +.B 2. +The file called \fI.astylerc\fR in the directory pointed to by the +\fIHOME\fR environment variable ( i.e. \fI$HOME/.astylerc\fR). +.TP +.B 3. +The file called \fI.astylerc\fR in the directory pointed to by the +\fIHOMEPATH\fR environment variable ( i.e. \fI%HOMEPATH%\.astylerc\fR). +.P +If a default options file is found, the options in this file will be parsed +BEFORE the command-line options. Options within the default option file may be +written without the preliminary '-' or '--'. + +.SH VERSION +1.20.2 + +.SH "SEE ALSO" +.BR indent(1) + +.I http://astyle.sourceforge.net +.br +.I http://www.sourceforge.net/projects/astyle +.br +.I http://packages.debian.org/astyle + +.SH AUTHOR +Tal Davidson + +This man-page was written by Jan Schaumann as part of +"The Missing Man Pages Project". Please see +\fIhttp://www.netmeister.org/misc/m2p2/index.html\fR for details. + +Minor modifications by Luca Filipozzi . Updated on +March 2007 by Margarita Manterola --- astyle-1.22.orig/debian/astyle.manpages +++ astyle-1.22/debian/astyle.manpages @@ -0,0 +1 @@ +debian/astyle.1 --- astyle-1.22.orig/debian/astyle.dirs +++ astyle-1.22/debian/astyle.dirs @@ -0,0 +1 @@ +usr/bin --- astyle-1.22.orig/debian/patches/fix_for_gcc_4.3.dpatch +++ astyle-1.22/debian/patches/fix_for_gcc_4.3.dpatch @@ -0,0 +1,18 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## fix_for_gcc_4.3.dpatch by +## +## DP: Fix to make astyle compile with gcc-4.3. +## DP: Patch provided by Cyril Brulebois + +@DPATCH@ +diff -urNad astyle-1.21~/src/astyle.h astyle-1.21/src/astyle.h +--- astyle-1.21~/src/astyle.h 2007-05-12 14:08:02.000000000 +0000 ++++ astyle-1.21/src/astyle.h 2008-03-11 15:48:58.000000000 +0000 +@@ -37,6 +37,7 @@ + #include + #include + #include ++#include + + using namespace std; + --- astyle-1.22.orig/debian/patches/00list +++ astyle-1.22/debian/patches/00list @@ -0,0 +1 @@ +fix_for_gcc_4.3