[Python-modules-commits] r20632 - in packages/python-markdown/trunk/debian (3 files)
mitya57-guest at users.alioth.debian.org
mitya57-guest at users.alioth.debian.org
Thu Mar 1 14:59:34 UTC 2012
Date: Thursday, March 1, 2012 @ 14:59:32
Author: mitya57-guest
Revision: 20632
* Switch to the newest copyright format
* Bump Standards-Version to 3.9.3
* Module packages now suggest doc package
Modified:
packages/python-markdown/trunk/debian/changelog
packages/python-markdown/trunk/debian/control
packages/python-markdown/trunk/debian/copyright
Modified: packages/python-markdown/trunk/debian/changelog
===================================================================
--- packages/python-markdown/trunk/debian/changelog 2012-03-01 13:32:45 UTC (rev 20631)
+++ packages/python-markdown/trunk/debian/changelog 2012-03-01 14:59:32 UTC (rev 20632)
@@ -1,6 +1,13 @@
+python-markdown (2.1.1-3) UNRELEASED; urgency=low
+
+ * Switch to the newest copyright format
+ * Bump Standards-Version to 3.9.3
+
+ -- Dmitry Shachnev <mitya57 at gmail.com> Thu, 01 Mar 2012 18:57:10 +0400
+
python-markdown (2.1.1-2) unstable; urgency=low
- * Switch to dedhelper 8
+ * Switch to debhelper 8
* Add python-markdown-doc package
-- Dmitry Shachnev <mitya57 at gmail.com> Thu, 16 Feb 2012 19:06:04 +0400
Modified: packages/python-markdown/trunk/debian/control
===================================================================
--- packages/python-markdown/trunk/debian/control 2012-03-01 13:32:45 UTC (rev 20631)
+++ packages/python-markdown/trunk/debian/control 2012-03-01 14:59:32 UTC (rev 20632)
@@ -5,7 +5,7 @@
Uploaders: Fredrik Steen <stone at debian.org>, Bernd Zeimetz <bzed at debian.org>,
Dmitry Shachnev <mitya57 at gmail.com>
Build-Depends: debhelper (>= 8), python-all (>= 2.6.6-3~), python3-all (>= 3.1.2-7~)
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
Homepage: http://www.freewisdom.org/projects/python-markdown/
Vcs-Svn: svn://svn.debian.org/python-modules/packages/python-markdown/trunk/
Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/python-markdown/trunk/
@@ -15,6 +15,7 @@
Package: python-markdown
Architecture: all
Depends: ${python:Depends}, ${misc:Depends}
+Suggests: python-markdown-doc
Description: text-to-HTML conversion library/tool (implemented in Python 2)
Markdown is a text-to-HTML conversion tool for web writers. Markdown
allows you to write using an easy-to-read, easy-to-write plain text
@@ -31,6 +32,7 @@
Package: python3-markdown
Architecture: all
Depends: ${python3:Depends}, ${misc:Depends}
+Suggests: python-markdown-doc
Description: text-to-HTML conversion library/tool (implemented in Python 3)
Markdown is a text-to-HTML conversion tool for web writers. Markdown
allows you to write using an easy-to-read, easy-to-write plain text
Modified: packages/python-markdown/trunk/debian/copyright
===================================================================
--- packages/python-markdown/trunk/debian/copyright 2012-03-01 13:32:45 UTC (rev 20631)
+++ packages/python-markdown/trunk/debian/copyright 2012-03-01 14:59:32 UTC (rev 20632)
@@ -1,66 +1,62 @@
-This package was debianized by Fredrik Steen <stone at debian.org> on
-Fri, 21 Apr 2006 13:18:31 +0200.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Source: http://pypi.python.org/pypi/Markdown/
-It was downloaded from http://sourceforge.net/project/showfiles.php?group_id=153041
+Files: *
+Copyright:
+ 2007-2008 The Python Markdown Project (v. 1.7 and later)
+ 2004-2006 Yuri Takhteyev (v. 0.2-1.6b)
+ 2004 Manfred Stienstra (the original version)
+License: BSD-3-clause
-Authors:
- Manfred Stienstra <manfred.stienstra at dwerg.net>
- Yuri Takhteyev <qaramazov at gmail.com>
-
+Files: debian/*
Copyright:
- 2004-2007 Manfred Stienstra <manfred.stienstra at dwerg.net>
- Yuri Takhteyev <qaramazov at gmail.com>
+ 2006 Fredrik Steen <stone at debian.org>
+ 2007-2010 Bernd Zeimetz <bzed at debian.org>
+ 2012 Dmitry Shachnev <mitya57 at gmail.com>
+License: GPL-2+ or BSD-3-clause
+License: BSD-3-clause
+ 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 <organization> 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 PYTHON MARKDOWN PROJECT ''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 ANY CONTRIBUTORS TO THE
+ PYTHON MARKDOWN PROJECT 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.
-Licenses:
-
- markdown is dual-licensed under GPL 2 and the BSD license:
-
- GPL v2:
-
- This package 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.
-
- This package is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this package; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
- On Debian systems, the complete text of the GNU General Public License,
- version 2, can be found in `/usr/share/common-licenses/GPL-2'.
-
-
-
- BSD:
-
- 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. Neither the name of the University 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 REGENTS 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 REGENTS 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.
-
-
+License: GPL-2+
+ 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.
+ .
+ This program is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License along
+ with this package; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ .
+ On Debian systems, the full text of the GNU General Public License
+ version 2 can be found in the file `/usr/share/common-licenses/GPL-2'.
More information about the Python-modules-commits
mailing list