[Python-modules-commits] r18423 - in packages/sqlparse/trunk/debian (7 files)

jollyroger-guest at users.alioth.debian.org jollyroger-guest at users.alioth.debian.org
Fri Sep 2 18:17:44 UTC 2011


    Date: Friday, September 2, 2011 @ 18:17:43
  Author: jollyroger-guest
Revision: 18423

New upstream version (0.1.3)

 * Manpage migrated into upstream, using it.
 * Include HTML documentation generated with Sphinx rather than .rst files.
 * debian/copyright: switch to DEP-5 format.

Added:
  packages/sqlparse/trunk/debian/python-sqlparse.docs
Modified:
  packages/sqlparse/trunk/debian/changelog
  packages/sqlparse/trunk/debian/copyright
  packages/sqlparse/trunk/debian/python-sqlparse.manpages
  packages/sqlparse/trunk/debian/rules
Deleted:
  packages/sqlparse/trunk/debian/python-sqlparse.install
  packages/sqlparse/trunk/debian/sqlformat.1

Modified: packages/sqlparse/trunk/debian/changelog
===================================================================
--- packages/sqlparse/trunk/debian/changelog	2011-09-02 05:17:03 UTC (rev 18422)
+++ packages/sqlparse/trunk/debian/changelog	2011-09-02 18:17:43 UTC (rev 18423)
@@ -1,9 +1,13 @@
-sqlparse (0.1.2-3) unstable; urgency=low
+sqlparse (0.1.3-1) unstable; urgency=low
 
+  * New upstream version.
   * Fix debian/watch.
   * Bump Standards-Version to 3.9.2.
+  * Manpage migrated into upstream, using it.
+  * Include HTML documentation generated with Sphinx rather than .rst files.
+  * debian/copyright: switch to DEP-5 format.
 
- -- Andriy Senkovych <jolly_roger at itblog.org.ua>  Thu, 30 Jun 2011 14:48:50 +0300
+ -- Andriy Senkovych <jolly_roger at itblog.org.ua>  Fri, 02 Sep 2011 20:23:43 +0300
 
 sqlparse (0.1.2-2) unstable; urgency=low
 

Modified: packages/sqlparse/trunk/debian/copyright
===================================================================
--- packages/sqlparse/trunk/debian/copyright	2011-09-02 05:17:03 UTC (rev 18422)
+++ packages/sqlparse/trunk/debian/copyright	2011-09-02 18:17:43 UTC (rev 18423)
@@ -1,47 +1,33 @@
-This work was packaged for Debian by:
+Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?rev=173&sc=0
+Upstream-Name: python-sqlparse
+Upstream-Contact: Andi Albrecht <albrecht.andi at gmail.com>
+Source: http://code.google.com/p/python-sqlparse/downloads/list
 
-    Andriy Senkovych <jolly_roger at itblog.org.ua> on Mon, 29 Nov 2010 16:36:21 +0200
+Files: *
+Copyright: 2009 Andi Albrecht
+License: New BSD License
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+     * Redistributions of source code must retain the above copyright
+       notice, this list of conditions and the following disclaimer.
+     * Redistributions in binary form must reproduce the above copyright
+       notice, this list of conditions and the following disclaimer in the
+       documentation and/or other materials provided with the distribution.
+     * Neither the name of the authors nor the names of its contributors may be 
+       used to endorse or promote products derived from this software without 
+       specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED. IN NO EVENT SHALL AUTHOR BE LIABLE FOR ANY
+ DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-It was downloaded from:
-
-    http://code.google.com/p/python-sqlparse/
-
-Upstream Author(s):
-
-    Andi Albrecht <albrecht.andi at gmail.com>
-
-Copyright:
-
-    Copyright (c) 2009 Andi Albrecht
-
-License:
-
-    Redistribution and use in source and binary forms, with or without modification,
-    are permitted provided that the following conditions are met:
-
-        * Redistributions of source code must retain the above copyright notice,
-          this list of conditions and the following disclaimer.
-        * Redistributions in binary form must reproduce the above copyright notice,
-          this list of conditions and the following disclaimer in the documentation
-          and/or other materials provided with the distribution.
-        * Neither the name of the authors nor the names of its contributors may be
-          used to endorse or promote products derived from this software without
-          specific prior written permission.
-
-    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-    ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-    WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-    DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
-    ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-    DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-    SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-    CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-    OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-    OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-The Debian packaging is:
-
-    Copyright (C) 2010 Andriy Senkovych <jolly_roger at itblog.org.ua>
-
-and is licensed under the GPL License, see "/usr/share/common-licenses/GPL".
+Files: debian/*
+Copyright: 2010 Andriy Senkovych <jolly_roger at itblog.org.ua>
+License: New BSD License

Added: packages/sqlparse/trunk/debian/python-sqlparse.docs
===================================================================
--- packages/sqlparse/trunk/debian/python-sqlparse.docs	                        (rev 0)
+++ packages/sqlparse/trunk/debian/python-sqlparse.docs	2011-09-02 18:17:43 UTC (rev 18423)
@@ -0,0 +1 @@
+docs/build/html

Deleted: packages/sqlparse/trunk/debian/python-sqlparse.install
===================================================================
--- packages/sqlparse/trunk/debian/python-sqlparse.install	2011-09-02 05:17:03 UTC (rev 18422)
+++ packages/sqlparse/trunk/debian/python-sqlparse.install	2011-09-02 18:17:43 UTC (rev 18423)
@@ -1 +0,0 @@
-docs/source/*.rst /usr/share/doc/python-sqlparse/rst

Modified: packages/sqlparse/trunk/debian/python-sqlparse.manpages
===================================================================
--- packages/sqlparse/trunk/debian/python-sqlparse.manpages	2011-09-02 05:17:03 UTC (rev 18422)
+++ packages/sqlparse/trunk/debian/python-sqlparse.manpages	2011-09-02 18:17:43 UTC (rev 18423)
@@ -1 +1 @@
-debian/sqlformat.1
+docs/sqlformat.1

Modified: packages/sqlparse/trunk/debian/rules
===================================================================
--- packages/sqlparse/trunk/debian/rules	2011-09-02 05:17:03 UTC (rev 18422)
+++ packages/sqlparse/trunk/debian/rules	2011-09-02 18:17:43 UTC (rev 18423)
@@ -11,6 +11,12 @@
 	done
 endif
 
-override_dh_compress:
-	# Document files got accidentally compressed, excluding these files
-	dh_compress -X.rst
+override_dh_clean:
+	rm -fR docs/build
+	dh_clean
+
+build: binary-indep
+binary-indep: docs/build/html
+
+docs/build/html:
+	cd docs && $(MAKE) html

Deleted: packages/sqlparse/trunk/debian/sqlformat.1
===================================================================
--- packages/sqlparse/trunk/debian/sqlformat.1	2011-09-02 05:17:03 UTC (rev 18422)
+++ packages/sqlparse/trunk/debian/sqlformat.1	2011-09-02 18:17:43 UTC (rev 18423)
@@ -1,63 +0,0 @@
-.\" Based on template /usr/share/man-db/examples/manpage.example provided by 
-.\" Tom Christiansen <tchrist at jhereg.perl.com>.
-.TH SQLFORMAT "1" "December 2010" "python-sqlparse version: 0.1.2" "User Commands"
-.SH NAME
-sqlformat \- reformat SQL
-.SH SYNOPSIS
-.PP
-.B sqlformat
-[
-.I "OPTION"
-] ... [
-.I "FILE"
-] ...
-.SH DESCRIPTION
-.\" Putting a newline after each sentence can generate better output.
-The `sqlformat' command-line tool can be used to reformat SQL file according to
-specified options or prepare a snippet in in some programming language (only
-Python and PHP currently supported).
-Use "-" for
-.I FILE
-to read from stdin.
-.SH OPTIONS
-.TP
-\fB\-i\fR \fICHOICE\fR|\fB\-\-identifiers\fR=\fIFORMAT\fR
-Change case of identifiers.
-.I FORMAT
-is one of "upper", "lower", "capitalize".
-.TP
-\fB\-k\fR \fICHOICE\fR|\fB\-\-keywords\fR=\fIFORMAT\fR
-Change case of keywords.
-.I FORMAT
-is one of "upper", "lower", "capitalize".
-.TP
-\fB\-l\fR \fICHOICE\fR|\fB\-\-language\fR=\fILANG\fR
-Output a snippet in programming language LANG.
-.I LANG
-can be "python", "php".
-.TP
-\fB\-o\fR \fIFILE\fR|\fB\-\-outfile\fR=\fIFILE\fR
-Write output to
-.I FILE
-(defaults to stdout).
-.TP
-.BR \-r | \-\-reindent
-Reindent statements.
-.TP
-\fB\-\-indent_width\fR=\fIINDENT_WIDTH\fR
-Set indent width to
-.IR INDENT_WIDTH .
-Default is 2 spaces.
-.TP
-\fB\-\-strip\-comments
-Remove comments.
-.TP
-.BR \-h | \-\-help
-Print a short help message and exit.
-All subsequent options are ignored.
-.TP
-.BR --verbose
-Verbose output.
-.TP
-.BR \-\-version
-Print program's version number and exit.




More information about the Python-modules-commits mailing list