[Python-modules-commits] r16195 - in packages/springpython/trunk (9 files)
nomadium-guest at users.alioth.debian.org
nomadium-guest at users.alioth.debian.org
Wed Mar 23 20:34:44 UTC 2011
Date: Wednesday, March 23, 2011 @ 20:34:26
Author: nomadium-guest
Revision: 16195
* Set mergeWithUpstream property.
* Remove Breaks: ${python:Breaks}.
* Update to-do file.
* Fix coily manpage.
* Make copyright file DEP5 compliant.
* Remove redundant python-springpython.manpages file.
Modified:
packages/springpython/trunk/debian/ (properties)
packages/springpython/trunk/debian/00TODO
packages/springpython/trunk/debian/changelog
packages/springpython/trunk/debian/coily.rst
packages/springpython/trunk/debian/control
packages/springpython/trunk/debian/copyright
packages/springpython/trunk/debian/manpages
packages/springpython/trunk/debian/rules
Deleted:
packages/springpython/trunk/debian/python-springpython.manpages
Property changes on: packages/springpython/trunk/debian
___________________________________________________________________
Added: mergeWithUpstream
+ 1
Modified: packages/springpython/trunk/debian/00TODO
===================================================================
--- packages/springpython/trunk/debian/00TODO 2011-03-23 20:32:25 UTC (rev 16194)
+++ packages/springpython/trunk/debian/00TODO 2011-03-23 20:34:26 UTC (rev 16195)
@@ -1,2 +1,2 @@
-* Prepare a python-springpython-doc package.
-* Test coily.
+* Convince upstream to provide documentation, the goal is to prepare a
+ python-springpython-doc package.
Modified: packages/springpython/trunk/debian/changelog
===================================================================
--- packages/springpython/trunk/debian/changelog 2011-03-23 20:32:25 UTC (rev 16194)
+++ packages/springpython/trunk/debian/changelog 2011-03-23 20:34:26 UTC (rev 16195)
@@ -2,4 +2,4 @@
* Initial release. (Closes: #576311).
- -- Miguel Landaeta <miguel at miguel.cc> Wed, 02 Mar 2011 20:45:44 -0430
+ -- Miguel Landaeta <miguel at miguel.cc> Wed, 23 Mar 2011 21:22:31 -0430
Modified: packages/springpython/trunk/debian/coily.rst
===================================================================
--- packages/springpython/trunk/debian/coily.rst 2011-03-23 20:32:25 UTC (rev 16194)
+++ packages/springpython/trunk/debian/coily.rst 2011-03-23 20:34:26 UTC (rev 16195)
@@ -1,17 +1,17 @@
=========
- rst2man
+ coily
=========
--------------------------------------------------------
-coily - command-line management tool for Spring Python
--------------------------------------------------------
+----------------------------------------------
+command-line management tool for Spring Python
+----------------------------------------------
:Author: Greg Turnquist <gturnquist at vmware dotcom>
:Date: 2010-11-03
:Copyright: Apache Software License
:Version: 1.2.0
:Manual section: 1
-:Manual group: text processing
+:Manual group: Spring Python Documentation
SYNOPSIS
========
@@ -34,15 +34,10 @@
OPTIONS
=======
---help Displays a brief summary with all options.
---list-installed-plugins List the plugins currently installed in this account.
---list-available-plugins List the plugins available for installation.
---install-plugin <name> Install the named plugin.
---uninstall-plugin <name> Uninstall the named plugin by deleting its entry from F<~/.springpython>
---reinstall-plugin <name> Uninstall then install the plugin.
+--help Displays a brief summary with all options.
+--list-installed-plugins List the plugins currently installed in this account.
+--list-available-plugins List the plugins available for installation.
+--install-plugin <name> Install the named plugin.
+--uninstall-plugin <name> Uninstall the named plugin by deleting its entry from ~/.springpython.
+--reinstall-plugin <name> Uninstall then install the plugin.
-
-SEE ALSO
-========
-
-* `coily <http://springpython.webfactional.com/1.1.x/reference/html/plugins.html#coily>`__
Modified: packages/springpython/trunk/debian/control
===================================================================
--- packages/springpython/trunk/debian/control 2011-03-23 20:32:25 UTC (rev 16194)
+++ packages/springpython/trunk/debian/control 2011-03-23 20:34:26 UTC (rev 16195)
@@ -14,7 +14,6 @@
Package: python-springpython
Architecture: all
Depends: ${python:Depends}, ${misc:Depends}, python-yaml, python-paste
-Breaks: ${python:Breaks}
Recommends: python-mysqldb
Suggests: python-cherrypy3, python-ldap, python-circuits, pyro
Description: Python module that implements concepts from Spring Java Framework
Modified: packages/springpython/trunk/debian/copyright
===================================================================
--- packages/springpython/trunk/debian/copyright 2011-03-23 20:32:25 UTC (rev 16194)
+++ packages/springpython/trunk/debian/copyright 2011-03-23 20:34:26 UTC (rev 16195)
@@ -1,7 +1,14 @@
-Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=166
+Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=173
Upstream-Name: Spring Python Framework
Upstream-Contact: Greg Turnquist <gturnquist at vmware.com>
Source: http://www.springsource.com/download/community
+Comment: The tarball from upstream was repackaged because it uses unknown
+ extended headers. Any operation on that file caused annoying warnings like
+ these:
+ tar: Ignoring unknown extended header keyword `SCHILY.dev'
+ tar: Ignoring unknown extended header keyword `SCHILY.ino'
+ tar: Ignoring unknown extended header keyword `SCHILY.nlink'
+ To generate a proper tarball, just run: ./debian/rules get-orig-source.
Files: *
Copyright: © 2006-2011, SpringSource (http://springsource.com)
@@ -9,37 +16,37 @@
Files: springpython/remoting/hessian/hessianlib.py
Copyright: 2001-2002, Caucho Technology, Inc.
-License: Apache-1.1
+License:
The Apache Software License, Version 1.1
-
+ .
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:
-
+ .
1. Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
-
+ .
2. 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.
-
+ .
3. The end-user documentation included with the redistribution, if
any, must include the following acknowlegement:
"This product includes software developed by the
Caucho Technology (http://www.caucho.com/)."
Alternately, this acknowlegement may appear in the software itself,
if and wherever such third-party acknowlegements normally appear.
-
+ .
4. The names "Hessian", "Resin", and "Caucho" must not be used to
endorse or promote products derived from this software without prior
written permission. For written permission, please contact
info at caucho.com.
-
+ .
5. Products derived from this software may not be called "Resin"
nor may "Resin" appear in their names without prior written
permission of Caucho Technology.
-
+ .
THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -61,7 +68,7 @@
notice, this list of conditions and the following disclaimer in
the documentation and/or other materials provided with the
distribution.
-
+ .
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
@@ -81,13 +88,15 @@
License: Apache-2.0
License: Apache-2.0
- On Debian systems the full text of the Apache License can be found
- in the `/usr/share/common-licenses/Apache-2.0' file.
-
-Comment: The tarball from upstream was repackaged because it uses unknown
- extended headers. Any operation on that file caused annoying warnings like
- these:
- tar: Ignoring unknown extended header keyword `SCHILY.dev'
- tar: Ignoring unknown extended header keyword `SCHILY.ino'
- tar: Ignoring unknown extended header keyword `SCHILY.nlink'
- To generate a proper tarball, just run: ./debian/rules get-orig-tarball.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ .
+ http://www.apache.org/licenses/LICENSE-2.0
+ /usr/share/common-licenses/Apache-2.0 (on Debian systems)
+ .
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
Modified: packages/springpython/trunk/debian/manpages
===================================================================
--- packages/springpython/trunk/debian/manpages 2011-03-23 20:32:25 UTC (rev 16194)
+++ packages/springpython/trunk/debian/manpages 2011-03-23 20:34:26 UTC (rev 16195)
@@ -1 +1 @@
-build/coily.1
+coily.1
Deleted: packages/springpython/trunk/debian/python-springpython.manpages
===================================================================
--- packages/springpython/trunk/debian/python-springpython.manpages 2011-03-23 20:32:25 UTC (rev 16194)
+++ packages/springpython/trunk/debian/python-springpython.manpages 2011-03-23 20:34:26 UTC (rev 16195)
@@ -1 +0,0 @@
-coily.1
Modified: packages/springpython/trunk/debian/rules
===================================================================
--- packages/springpython/trunk/debian/rules 2011-03-23 20:32:25 UTC (rev 16194)
+++ packages/springpython/trunk/debian/rules 2011-03-23 20:34:26 UTC (rev 16195)
@@ -16,4 +16,4 @@
get-orig-source:
cd $(dir $(firstword $(MAKEFILE_LIST)))../ && \
- uscan --rename --force-download --watchfile debian/watch --destdir $(CURDIR)
+ uscan --no-conf --rename --force-download --destdir $(CURDIR)
More information about the Python-modules-commits
mailing list