[Python-modules-commits] r16068 - in packages/django-reversion/trunk/debian (11 files)

fladi-guest at users.alioth.debian.org fladi-guest at users.alioth.debian.org
Wed Mar 9 14:28:17 UTC 2011


    Date: Wednesday, March 9, 2011 @ 14:28:10
  Author: fladi-guest
Revision: 16068

Add experimental Babel support.
Overall clean-up.

Added:
  packages/django-reversion/trunk/debian/patches/
  packages/django-reversion/trunk/debian/patches/babel_support.patch
  packages/django-reversion/trunk/debian/patches/series
  packages/django-reversion/trunk/debian/settings.py
  packages/django-reversion/trunk/debian/source/local-options
Modified:
  packages/django-reversion/trunk/debian/changelog
  packages/django-reversion/trunk/debian/control
  packages/django-reversion/trunk/debian/copyright
  packages/django-reversion/trunk/debian/docs
  packages/django-reversion/trunk/debian/rules
Deleted:
  packages/django-reversion/trunk/debian/pyversion

Modified: packages/django-reversion/trunk/debian/changelog
===================================================================
--- packages/django-reversion/trunk/debian/changelog	2011-03-09 10:25:48 UTC (rev 16067)
+++ packages/django-reversion/trunk/debian/changelog	2011-03-09 14:28:10 UTC (rev 16068)
@@ -1,12 +1,19 @@
-django-reversion (1.3.2-1) unstable; urgency=low
+django-reversion (1.3.3-1) unstable; urgency=low
 
   * New upstream release.
   * Update debian/watch for github.
   * Include upstream changelog.
   * README has been renamed to README.markdown.
   * Update to Debian policy 3.9.1.
+  * Streamlined files in debian/ with `wrap-and-sort`.
+  * Set PMPT as maintainer and myself as uploader.
+  * Drop debian/pyversions in favour of XS-Python-Version.
+  * Use DEP5 for copyright file.
+  * Add patch babel_support to compile .mo files during build.
+  * Simplify debian/rules by using a static settings.py.
+  * Add local-options to debian/source.
 
- -- Fladischer Michael <FladischerMichael at fladi.at>  Fri, 22 Oct 2010 13:23:32 +0200
+ -- Fladischer Michael <FladischerMichael at fladi.at>  Wed, 09 Mar 2011 15:24:33 +0100
 
 django-reversion (1.3.1-2) unstable; urgency=low
 

Modified: packages/django-reversion/trunk/debian/control
===================================================================
--- packages/django-reversion/trunk/debian/control	2011-03-09 10:25:48 UTC (rev 16067)
+++ packages/django-reversion/trunk/debian/control	2011-03-09 14:28:10 UTC (rev 16068)
@@ -1,28 +1,32 @@
 Source: django-reversion
 Section: python
 Priority: optional
-Maintainer: Fladischer Michael <FladischerMichael at fladi.at>
-Build-Depends: debhelper (>= 7.0.50~), python-all (>= 2.5), python-support, 
- python-django (>= 1.1.1)
+Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
+Uploaders: Fladischer Michael <FladischerMichael at fladi.at>
+Build-Depends: debhelper (>= 7.0.50~),
+               python-all (>= 2.5),
+               python-django (>= 1.1.1),
+               python-pybabel,
+               python-support
 Standards-Version: 3.9.1
+XS-Python-Version: >= 2.5
 Homepage: https://code.google.com/p/django-reversion/
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/django-reversion/trunk/
 Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/django-reversion/trunk/
 
 Package: python-django-reversion
 Architecture: all
-Depends: ${python:Depends}, ${misc:Depends}, python-django (>= 1.1.1)
+Depends: python-django (>= 1.1.1), ${misc:Depends}, ${python:Depends}
 Description: Provides comprehensive version control facilities for Django
- Reversion is an extension to the Django web framework that provides 
- comprehensive version control facilities. 
+ Reversion is an extension to the Django web framework that provides
+ comprehensive version control facilities.
  .
  Features:
   * Roll back to any point in a model's history - an unlimited undo facility!
   * Recover deleted models - never lose data again!
   * Admin integration for maximum usability.
-  * Group related changes into revisions that can be rolled back in a single 
+  * Group related changes into revisions that can be rolled back in a single
     transaction.
-  * Automatically save a new version whenever your model changes using Django's 
+  * Automatically save a new version whenever your model changes using Django's
     flexible signalling framework.
-  * Automate your revision management with easy-to-use middleware. 
-
+  * Automate your revision management with easy-to-use middleware.

Modified: packages/django-reversion/trunk/debian/copyright
===================================================================
--- packages/django-reversion/trunk/debian/copyright	2011-03-09 10:25:48 UTC (rev 16067)
+++ packages/django-reversion/trunk/debian/copyright	2011-03-09 14:28:10 UTC (rev 16068)
@@ -1,6 +1,6 @@
-Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
-Name: django-reversion
-Maintainer: David Hall <david at etianen.com>
+Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=166
+Upstream-Name: django-reversion
+Upstream-Contact: David Hall <david at etianen.com>
 Source: https://code.google.com/p/django-reversion/downloads/list
 
 Files: *

Modified: packages/django-reversion/trunk/debian/docs
===================================================================
--- packages/django-reversion/trunk/debian/docs	2011-03-09 10:25:48 UTC (rev 16067)
+++ packages/django-reversion/trunk/debian/docs	2011-03-09 14:28:10 UTC (rev 16068)
@@ -1,2 +1 @@
 README.markdown
-CHANGELOG.markdown

Added: packages/django-reversion/trunk/debian/patches/babel_support.patch
===================================================================
--- packages/django-reversion/trunk/debian/patches/babel_support.patch	                        (rev 0)
+++ packages/django-reversion/trunk/debian/patches/babel_support.patch	2011-03-09 14:28:10 UTC (rev 16068)
@@ -0,0 +1,55 @@
+Description: Add support for Babel
+ Enable Babel in setup.py to compile .po files during build.
+Author: Fladischer Michael <FladischerMichael at fladi.at>
+Last-Update: 2011-03-09
+Forwarded: no
+
+--- a/setup.py
++++ b/setup.py
+@@ -1,21 +1,27 @@
+ from distutils.core import setup
+-
++from babel.messages import frontend as babel
+ 
+ setup(name="django-reversion",
+-      version="1.3.3",
+-      description="An extension to the Django web framework that provides comprehensive version control facilities",
+-      author="Dave Hall",
+-      author_email="dave at etianen.com",
+-      url="http://github.com/etianen/django-reversion",
+-      download_url="http://github.com/downloads/etianen/django-reversion/django-reversion-1.3.3.tar.gz",
+-      zip_safe=False,
+-      packages=["reversion", "reversion.management", "reversion.templatetags", "reversion.management.commands"],
+-      package_dir={"": "src"},
+-      package_data = {"reversion": ["locale/*/LC_MESSAGES/django.*", "templates/reversion/*.html"]},
+-      classifiers=["Development Status :: 5 - Production/Stable",
+-                   "Environment :: Web Environment",
+-                   "Intended Audience :: Developers",
+-                   "License :: OSI Approved :: BSD License",
+-                   "Operating System :: OS Independent",
+-                   "Programming Language :: Python",
+-                   "Framework :: Django",])
+\ No newline at end of file
++    version="1.3.3",
++    description="An extension to the Django web framework that provides comprehensive version control facilities",
++    author="Dave Hall",
++    author_email="dave at etianen.com",
++    url="http://github.com/etianen/django-reversion",
++    download_url="http://github.com/downloads/etianen/django-reversion/django-reversion-1.3.3.tar.gz",
++    packages=["reversion", "reversion.management", "reversion.templatetags", "reversion.management.commands"],
++    package_dir={"": "src"},
++    package_data = {"reversion": ["locale/*/LC_MESSAGES/django.*", "templates/reversion/*.html"]},
++    classifiers=["Development Status :: 5 - Production/Stable",
++                 "Environment :: Web Environment",
++                 "Intended Audience :: Developers",
++                 "License :: OSI Approved :: BSD License",
++                 "Operating System :: OS Independent",
++                 "Programming Language :: Python",
++                 "Framework :: Django",
++                 ],
++    cmdclass = {'compile_catalog': babel.compile_catalog,
++                'extract_messages': babel.extract_messages,
++                'init_catalog': babel.init_catalog,
++                'update_catalog': babel.update_catalog,
++                },
++)

Added: packages/django-reversion/trunk/debian/patches/series
===================================================================
--- packages/django-reversion/trunk/debian/patches/series	                        (rev 0)
+++ packages/django-reversion/trunk/debian/patches/series	2011-03-09 14:28:10 UTC (rev 16068)
@@ -0,0 +1 @@
+babel_support.patch

Deleted: packages/django-reversion/trunk/debian/pyversion
===================================================================
--- packages/django-reversion/trunk/debian/pyversion	2011-03-09 10:25:48 UTC (rev 16067)
+++ packages/django-reversion/trunk/debian/pyversion	2011-03-09 14:28:10 UTC (rev 16068)
@@ -1 +0,0 @@
-2.5-

Modified: packages/django-reversion/trunk/debian/rules
===================================================================
--- packages/django-reversion/trunk/debian/rules	2011-03-09 10:25:48 UTC (rev 16067)
+++ packages/django-reversion/trunk/debian/rules	2011-03-09 14:28:10 UTC (rev 16068)
@@ -6,16 +6,22 @@
 override_dh_auto_test:
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 	django-admin startproject testproject
-	echo 'DATABASE_ENGINE = "sqlite3"' > testproject/settings.py
-	echo 'DATABASE_NAME = "testproject/test.db3"' >> testproject/settings.py
-	echo 'INSTALLED_APPS = ["reversion","django.contrib.auth","django.contrib.contenttypes","django.contrib.admin","django.contrib.sites","django.contrib.sessions"]' >> testproject/settings.py
-	echo 'SITE_ID = 1' >> testproject/settings.py
-	echo 'ROOT_URLCONF = "testproject.urls"' >> testproject/settings.py
+	cp debian/settings.py testproject/settings.py
 	PYTHONPATH=".:src" django-admin syncdb --settings=testproject.settings --noinput
 	set -e; \
 	for python in $(shell pyversions -r); do \
-	    PYTHONPATH=".:src" $$python testproject/manage.py test --settings=testproject.settings reversion ; \
+		PYTHONPATH=".:src" $$python testproject/manage.py test --settings=testproject.settings reversion ; \
 	done
 	rm -rf testproject
 endif
 
+.PHONY: override_dh_auto_build
+override_dh_auto_build:
+	for loc in src/reversion/locale/*; do \
+		python setup.py compile_catalog --directory src/reversion/locale/ --locale $$(basename $$loc) --domain django; \
+	done
+	dh_auto_build
+
+.PHONY: override_dh_installchangelogs
+override_dh_installchangelogs:
+	dh_installchangelogs CHANGELOG.markdown

Added: packages/django-reversion/trunk/debian/settings.py
===================================================================
--- packages/django-reversion/trunk/debian/settings.py	                        (rev 0)
+++ packages/django-reversion/trunk/debian/settings.py	2011-03-09 14:28:10 UTC (rev 16068)
@@ -0,0 +1,11 @@
+DATABASE_ENGINE = "sqlite3"
+DATABASE_NAME = "testproject/test.db3"
+INSTALLED_APPS = ["reversion",
+                  "django.contrib.auth",
+                  "django.contrib.contenttypes",
+                  "django.contrib.admin",
+                  "django.contrib.sites",
+                  "django.contrib.sessions",
+                  ]
+SITE_ID = 1
+ROOT_URLCONF = "testproject.urls"

Added: packages/django-reversion/trunk/debian/source/local-options
===================================================================
--- packages/django-reversion/trunk/debian/source/local-options	                        (rev 0)
+++ packages/django-reversion/trunk/debian/source/local-options	2011-03-09 14:28:10 UTC (rev 16068)
@@ -0,0 +1 @@
+abort-on-upstream-changes




More information about the Python-modules-commits mailing list