[Python-modules-commits] r3057 - in /packages/python-markdown/trunk/debian: README.Debian changelog copyright rules

Sat Aug 18 07:51:17 UTC 2007

Author: bzed-guest
Date: Sat Aug 18 07:51:17 2007
New Revision: 3057

URL: http://svn.debian.org/wsvn/python-modules/?sc=1&rev=3057
Log:
more updates for markdown

Modified:
    packages/python-markdown/trunk/debian/README.Debian
    packages/python-markdown/trunk/debian/changelog
    packages/python-markdown/trunk/debian/copyright
    packages/python-markdown/trunk/debian/rules

Modified: packages/python-markdown/trunk/debian/README.Debian
URL: http://svn.debian.org/wsvn/python-modules/packages/python-markdown/trunk/debian/README.Debian?rev=3057&op=diff
==============================================================================

--- packages/python-markdown/trunk/debian/README.Debian (original)
+++ packages/python-markdown/trunk/debian/README.Debian Sat Aug 18 07:51:17 2007
@@ -12,6 +12,5 @@
 You can read about the markdown syntax here:
 http://daringfireball.net/projects/markdown/basics
 
-The changelog for python-markdown is in the end of markdown.py file.
- 
- -- Fredrik Steen <stone at debian.org>, Fri, 21 Apr 2006 13:18:31 +0200
+ -- Fredrik Steen <stone at debian.org>, Fri, 21 Apr 2006 13:18:31 +0200,
+    Bernd Zeimetz <bernd at bzed.de>,  Sat, 18 Aug 2007 09:37:31 +0200

Modified: packages/python-markdown/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/python-modules/packages/python-markdown/trunk/debian/changelog?rev=3057&op=diff
==============================================================================
--- packages/python-markdown/trunk/debian/changelog (original)
+++ packages/python-markdown/trunk/debian/changelog Sat Aug 18 07:51:17 2007
@@ -4,7 +4,7 @@
   * Added XS-Vcs-Svn field
 
   [ Bernd Zeimetz ]
-  * New upstream version
+  * New upstream version (Closes: #398856)
   * debian/control:
     - Added XS-Vcs-Browser field
     - Moved python-support to Build-Depends, fixing lintian
@@ -13,8 +13,13 @@
     - Updating watch file - upstream ships a .zip file now
   * debian/changelog.pointer:
     - removing file, upstream ships a changelog now
+  * debian/README.Debian:
+    - updated, upstream ships a changelog now
+  * debian/changelog:
+    - reflecting upstreams change in licensing, markdown is dual-licensed
+      under GPL-2 and BSD now
 
- -- Bernd Zeimetz <bernd at bzed.de>  Sat, 18 Aug 2007 09:22:34 +0200
+ -- Bernd Zeimetz <bernd at bzed.de>  Sat, 18 Aug 2007 09:49:09 +0200
 
 python-markdown (1.4-2) unstable; urgency=low
 

Modified: packages/python-markdown/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/python-modules/packages/python-markdown/trunk/debian/copyright?rev=3057&op=diff
==============================================================================
--- packages/python-markdown/trunk/debian/copyright (original)
+++ packages/python-markdown/trunk/debian/copyright Sat Aug 18 07:51:17 2007
@@ -3,24 +3,64 @@
 
 It was downloaded from http://sourceforge.net/project/showfiles.php?group_id=153041
 
-Authors: Manfred Stienstra <manfred.stienstra at dwerg.net>, Yuri Takhteyev <qaramazov at gmail.com>
+Authors:
+    Manfred Stienstra <manfred.stienstra at dwerg.net>
+    Yuri Takhteyev <qaramazov at gmail.com>
 
-Copyright: 2004-2006, Manfred Stienstra <manfred.stienstra at dwerg.net>, Yuri Takhteyev <qaramazov at gmail.com>
+Copyright:
+    2004-2007  Manfred Stienstra <manfred.stienstra at dwerg.net>
+               Yuri Takhteyev <qaramazov at gmail.com>
 
-   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.
+Licenses:
 
-   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
+    markdown is dual-licensed under GPL 2 and the BSD license:
 
-On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
+    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.
+
+

Modified: packages/python-markdown/trunk/debian/rules
URL: http://svn.debian.org/wsvn/python-modules/packages/python-markdown/trunk/debian/rules?rev=3057&op=diff
==============================================================================
--- packages/python-markdown/trunk/debian/rules (original)
+++ packages/python-markdown/trunk/debian/rules Sat Aug 18 07:51:17 2007
@@ -6,7 +6,7 @@
 include /usr/share/cdbs/1/class/python-distutils.mk 
 
 DEB_AUTO_CLEANUP_RCS            := yes
-#DEB_INSTALL_CHANGELOGS_ALL	:= debian/changelog.pointer
+DEB_INSTALL_CHANGELOGS_ALL	:= CHANGE_LOG.txt
 
 binary-post-install/python-markdown::
 	chmod 0755 debian/python-markdown/usr/share/python-support/python-markdown/markdown.py


