[Python-modules-commits] r12639 - in packages/django-markupfield/trunk/debian (7 files)

Mon Apr 19 06:16:00 UTC 2010

Date: Monday, April 19, 2010 @ 06:15:56
  Author: fladi-guest
Revision: 12639

Give patch a proper name.
Don't quote full license text for packaging license.
Add fix for #575377.
Use set -e for proper error handling in for-loop.
Remove unnecessary assumption about cache from long description and fix grammar.

Added:
  packages/django-markupfield/trunk/debian/patches/fix_tests
Modified:
  packages/django-markupfield/trunk/debian/changelog
  packages/django-markupfield/trunk/debian/control
  packages/django-markupfield/trunk/debian/copyright
  packages/django-markupfield/trunk/debian/patches/series
  packages/django-markupfield/trunk/debian/rules
Deleted:
  packages/django-markupfield/trunk/debian/patches/debian-changes-1.0.0a2-1

Modified: packages/django-markupfield/trunk/debian/changelog
===================================================================

--- packages/django-markupfield/trunk/debian/changelog	2010-04-19 05:41:33 UTC (rev 12638)
+++ packages/django-markupfield/trunk/debian/changelog	2010-04-19 06:15:56 UTC (rev 12639)
@@ -1,6 +1,6 @@
 django-markupfield (1.0.0a2-1) UNRELEASED; urgency=low
 
   * Initial release (Closes: #577193)
-  * Include debian-changes-1.0.0a2-1 to fix tests.
+  * Include fix_tests patch to to have correct markup settings during tests.
 
  -- Fladischer Michael <FladischerMichael at fladi.at>  Sun, 11 Apr 2010 21:06:55 +0200

Modified: packages/django-markupfield/trunk/debian/control
===================================================================
--- packages/django-markupfield/trunk/debian/control	2010-04-19 05:41:33 UTC (rev 12638)
+++ packages/django-markupfield/trunk/debian/control	2010-04-19 06:15:56 UTC (rev 12639)
@@ -14,16 +14,15 @@
 Architecture: all
 Depends: ${python:Depends}, ${misc:Depends}, python-django (>= 1.0)
 Suggests: python-markdown, python-docutils, python-textile
-Description: Custom Django field for easy use of markup in text fields
+Description: custom Django field for easy use of markup in text fields
  An implementation of a custom MarkupField for Django. A MarkupField is in 
  essence a TextField with an associated markup type. The field also caches 
- its rendered value on the assumption that disk space is cheaper than CPU 
- cycles in a web application.
+ its rendered value.
  .
  It supports this markup types by default:
   * html: allows HTML, potentially unsafe
   * plain: plain text markup, calls urlize and replaces text with linebreaks
- And this markups if the appropriate Python module is installed:
+ And these markups if the appropriate Python module is installed:
   * markdown: default markdown renderer (requires python-markdown)
   * restructuredtext: default ReST renderer (requires python-docutils)
   * textile: default textile renderer (requires python-textile) 

Modified: packages/django-markupfield/trunk/debian/copyright
===================================================================
--- packages/django-markupfield/trunk/debian/copyright	2010-04-19 05:41:33 UTC (rev 12638)
+++ packages/django-markupfield/trunk/debian/copyright	2010-04-19 06:15:56 UTC (rev 12639)
@@ -49,28 +49,4 @@
 
     Copyright (C) 2010 Fladischer Michael <FladischerMichael at fladi.at>
 
-and is licensed under the this terms:
-
-    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 django-markupfield 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.
+and is licensed under the same terms.

Deleted: packages/django-markupfield/trunk/debian/patches/debian-changes-1.0.0a2-1
===================================================================
--- packages/django-markupfield/trunk/debian/patches/debian-changes-1.0.0a2-1	2010-04-19 05:41:33 UTC (rev 12638)
+++ packages/django-markupfield/trunk/debian/patches/debian-changes-1.0.0a2-1	2010-04-19 06:15:56 UTC (rev 12639)
@@ -1,43 +0,0 @@
-Description: Upstream changes introduced in version 1.0.0a2-1
- This patch has been created by dpkg-source during the package build.
- Here's the last changelog entry, hopefully it gives details on why
- those changes were made:
- .
- django-markupfield (1.0.0a2-1) UNRELEASED; urgency=low
- .
-   * Initial release (Closes: #577193)
-   * Include debian-changes-1.0.0a2-1 to fix tests.
- .
- The person named in the Author field signed this changelog entry.
-Author: Fladischer Michael <FladischerMichael at fladi.at>
-Bug-Debian: http://bugs.debian.org/577193
-
----
-The information above should follow the Patch Tagging Guidelines, please
-checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
-are templates for supplementary fields that you might want to add:
-
-Origin: <vendor|upstream|other>, <url of original patch>
-Bug: <url in upstream bugtracker>
-Bug-Debian: http://bugs.debian.org/<bugnumber>
-Forwarded: <no|not-needed|url proving that it has been forwarded>
-Reviewed-By: <name and email of someone who approved the patch>
-Last-Update: <YYYY-MM-DD>
-
---- django-markupfield-1.0.0a2.orig/markupfield/tests/settings.py
-+++ django-markupfield-1.0.0a2/markupfield/tests/settings.py
-@@ -9,10 +9,10 @@ def render_rest(markup):
-     parts = publish_parts(source=markup, writer_name="html4css1")
-     return parts["fragment"]
- 
--MARKUP_FIELD_TYPES = {
--    'markdown': markdown.markdown,
--    'ReST': render_rest,
--}
-+MARKUP_FIELD_TYPES = [
-+    ('markdown', markdown.markdown),
-+    ('ReST', render_rest),
-+]
- 
- INSTALLED_APPS = (
-     'markupfield.tests',

Added: packages/django-markupfield/trunk/debian/patches/fix_tests
===================================================================
--- packages/django-markupfield/trunk/debian/patches/fix_tests	                        (rev 0)
+++ packages/django-markupfield/trunk/debian/patches/fix_tests	2010-04-19 06:15:56 UTC (rev 12639)
@@ -0,0 +1,24 @@
+Description: Fix the tests shipped with django-markupfield as upstream
+ used a deprecated format for it's settings.
+Author: Fladischer Michael <FladischerMichael at fladi.at>
+Bug-Debian: http://bugs.debian.org/577193
+Forwarded: http://github.com/jamesturk/django-markupfield/commit/6fdbe51f390a8fd05116745d3bbd2f749067dec3
+Last-Update: 2010-04-19
+
+--- django-markupfield-1.0.0a2.orig/markupfield/tests/settings.py
++++ django-markupfield-1.0.0a2/markupfield/tests/settings.py
+@@ -9,10 +9,10 @@ def render_rest(markup):
+     parts = publish_parts(source=markup, writer_name="html4css1")
+     return parts["fragment"]
+ 
+-MARKUP_FIELD_TYPES = {
+-    'markdown': markdown.markdown,
+-    'ReST': render_rest,
+-}
++MARKUP_FIELD_TYPES = [
++    ('markdown', markdown.markdown),
++    ('ReST', render_rest),
++]
+ 
+ INSTALLED_APPS = (
+     'markupfield.tests',

Modified: packages/django-markupfield/trunk/debian/patches/series
===================================================================
--- packages/django-markupfield/trunk/debian/patches/series	2010-04-19 05:41:33 UTC (rev 12638)
+++ packages/django-markupfield/trunk/debian/patches/series	2010-04-19 06:15:56 UTC (rev 12639)
@@ -1 +1 @@
-debian-changes-1.0.0a2-1
+fix_tests

Modified: packages/django-markupfield/trunk/debian/rules
===================================================================
--- packages/django-markupfield/trunk/debian/rules	2010-04-19 05:41:33 UTC (rev 12638)
+++ packages/django-markupfield/trunk/debian/rules	2010-04-19 06:15:56 UTC (rev 12639)
@@ -2,13 +2,21 @@
 %:
 	dh $@
 
+.PHONY: override_dh_auto_test
 override_dh_auto_test:
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 	django-admin startproject testproject
 	cp markupfield/tests/*.py testproject/
+	set -e; \
 	for python in $(shell pyversions -r); do \
 	  $$python testproject/manage.py test --settings=testproject.settings --pythonpath=. ; \
 	done
 	rm -rf testproject
 endif
 
+.PHONY: override_dh_pysupport
+override_dh_pysupport:
+	  # Work-around for bug #575377:
+	  find debian/ -name PKG-INFO | tail -n +2 | xargs -r -n1 cp -vf $(shell find debian/ -name PKG-INFO | head -n 1)
+	  dh_pysupport
+


