[Python-modules-commits] r11180 - in packages/python-django-shorturls/trunk/debian (8 files)
janos-guest at users.alioth.debian.org
janos-guest at users.alioth.debian.org
Sat Jan 16 23:10:00 UTC 2010
Date: Saturday, January 16, 2010 @ 23:09:57
Author: janos-guest
Revision: 11180
Applied changes from git
Added:
packages/python-django-shorturls/trunk/debian/README.source
packages/python-django-shorturls/trunk/debian/patches/
packages/python-django-shorturls/trunk/debian/patches/01_doc-sync.diff
packages/python-django-shorturls/trunk/debian/patches/02_setup-sync.diff
packages/python-django-shorturls/trunk/debian/patches/series
Modified:
packages/python-django-shorturls/trunk/debian/changelog
packages/python-django-shorturls/trunk/debian/control
packages/python-django-shorturls/trunk/debian/rules
Added: packages/python-django-shorturls/trunk/debian/README.source
===================================================================
--- packages/python-django-shorturls/trunk/debian/README.source (rev 0)
+++ packages/python-django-shorturls/trunk/debian/README.source 2010-01-16 23:09:57 UTC (rev 11180)
@@ -0,0 +1,2 @@
+The package uses the quilt patch system to apply patches.
+See /usr/share/doc/quilt/README.source.
Modified: packages/python-django-shorturls/trunk/debian/changelog
===================================================================
--- packages/python-django-shorturls/trunk/debian/changelog 2010-01-16 20:51:59 UTC (rev 11179)
+++ packages/python-django-shorturls/trunk/debian/changelog 2010-01-16 23:09:57 UTC (rev 11180)
@@ -1,3 +1,16 @@
+python-django-shorturls (1.0.1-2) unstable; urgency=low
+
+ * Changed Long description (Closes: #563574)
+ * New patch 01_doc-sync.diff:
+ - Apply changes in README from the git
+ - Add LICENCE from the git
+ * New patch 02_setup-sync.diff:
+ - Apply changes in setup.py from the git
+ * Added quilt under Build-Depends
+ * Added README.source
+
+ -- Janos Guljas <janos at janos.in.rs> Wed, 06 Jan 2010 21:00:06 +0100
+
python-django-shorturls (1.0.1-1) unstable; urgency=low
* Initial release. (Closes: #560254)
Modified: packages/python-django-shorturls/trunk/debian/control
===================================================================
--- packages/python-django-shorturls/trunk/debian/control 2010-01-16 20:51:59 UTC (rev 11179)
+++ packages/python-django-shorturls/trunk/debian/control 2010-01-16 23:09:57 UTC (rev 11180)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Janos Guljas <janos at janos.in.rs>
Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
-Build-Depends: debhelper (>= 7.0.50), python-support, python-setuptools
+Build-Depends: debhelper (>= 7.0.50), python-support, python-setuptools, quilt
XS-Python-Version: >= 2.5
Standards-Version: 3.8.3
Homepage: http://pypi.python.org/pypi/django-shorturls/
@@ -15,5 +15,5 @@
XB-Python-Version: ${python:Versions}
Depends: ${misc:Depends}, ${python:Depends}
Description: A short URL handler for Django applications
- A custom URL shortening application for Django, including easy rev=cannonical
- support.
+ Django-shorturls is a custom URL shortening application for Django, including
+ easy rev=canonical support.
Added: packages/python-django-shorturls/trunk/debian/patches/01_doc-sync.diff
===================================================================
--- packages/python-django-shorturls/trunk/debian/patches/01_doc-sync.diff (rev 0)
+++ packages/python-django-shorturls/trunk/debian/patches/01_doc-sync.diff 2010-01-16 23:09:57 UTC (rev 11180)
@@ -0,0 +1,165 @@
+Description: Apply changes in README and add LICENCE from the git
+Author: Janos Guljas <janos at janos.in.rs>
+Last-Update: 2010-01-06
+
+--- /dev/null
++++ b/LICENCE
+@@ -0,0 +1,27 @@
++Copyright (c) 2008 Simon Willison and Jacob Kaplan-Moss
++All rights reserved.
++
++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 this project 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.
+--- a/README
++++ b/README
+@@ -1,7 +1,7 @@
+ django-shorturls
+ ================
+
+-A custom URL shortening app for Django, including easy ``rev=cannonical``
++A custom URL shortening app for Django, including easy ``rev=canonical``
+ support.
+
+ Most code was originally by Simon Willison; see
+@@ -15,43 +15,43 @@ Usage
+
+ So, you want to host your own short URLs on your Django site:
+
+- 1. In your settings, define a set of prefixes for short URLs::
++1. In your settings, define a set of prefixes for short URLs::
+
+- SHORTEN_MODELS = {
+- 'A': 'myapp.animal',
+- 'V': 'myapp.vegetable',
+- 'M': 'myapp.mineral'
+- }
++ SHORTEN_MODELS = {
++ 'A': 'myapp.animal',
++ 'V': 'myapp.vegetable',
++ 'M': 'myapp.mineral'
++ }
++
++ The keys are string prefixes; they can be any string, actually,
++ but since we're going for short a single character is probably good.
++
++ Values are the (hopefully-familiar) ``"<app-name>.<model-class>"`` used
++ by Django to identify a model. Remember: ``app-name`` is the
++ (case-sensitive) last bit of your app's name in ``INSTALLED_APPS``, and
++ ``<model-class>`` is your model class's name, lowercased.
++
++ Make sure your models have a ``get_absolute_url()`` method defined.
+
+- The keys are string prefixes; they can be any string, actually,
+- but since we're going for short a single character is probably good.
+-
+- Values are the (hopefully-familiar) ``"<app-name>.<model-class>"`` used
+- by Django to identify a model. Remember: ``app-name`` is the
+- (case-sensitive) last bit of your app's name in ``INSTALLED_APPS``, and
+- ``<model-class>`` is your model class's name, lowercased.
++2. Wire up the redirect view by adding to your URLconf::
++
++ ('^short/', include('shorturls.urls'))
+
+- Make sure your models have a ``get_absolute_url()`` method defined.
++3. If you'd like to quickly link to shortened URLs in your templates, stick
++ ``"shorturls"`` in ``INSTALLED_APPS``, and then in your templates do::
++
++ {% load shorturl %}
++ <a href="{% shorturl object %}">...</a>
++
++ (where ``object`` is a model instance).
++
++ Alternatively::
++
++ {% load shorturl %}
++ {% revcanonical object %}
+
+- 2. Wire up the redirect view by adding to your URLconf::
+-
+- ('^short/', include('shorturls.urls'))
+-
+- 3. If you'd like to quickly link to shortened URLs in your templates, stick
+- ``"shorturls"`` in ``INSTALLED_APPS``, and then in your templates do::
+-
+- {% load shorturls %}
+- <a href="{% shorturl object %}">...</a>
+-
+- (where ``object`` is a model instance).
+-
+- Alternatively::
+-
+- {% load shorturls %}
+- {% recanonical object %}
+-
+- This generates the whole ``<link rev="canonical" href="...">`` tag for
+- you.
++ This generates the whole ``<link rev="canonical" href="...">`` tag for
++ you.
+
+ That's it.
+
+@@ -62,22 +62,22 @@ Settings
+
+ Available settings are:
+
+- ``SHORTEN_MODELS``
+- You've seen this one.
+-
+- ``SHORT_BASE_URL``
+- If defined, the ``shorturl`` and ``revcanonical`` template tags will
+- prefix generated URLs with this value. Use this if you've got a shorter
+- domain name you'd like to use for small URLs.
+-
+- For example, given ``SHORT_BASE_URL = 'http://exm.pl/'``, ``{% shorturl
+- obj %}`` would return something like ``http://exm.pl/AbCd``.
+-
+- ``SHORTEN_FULL_BASE_URL``
+- The domain to redirect to when redirecting away from the small URL.
+- Again, you'll use this if your short URL base and your "real" site
+- differ.
+-
+- If not defined, the redirect view will try to guess the proper domain by
+- consulting the ``django.contrib.sites`` framework, if installed, or the
+- requested domain, if not.
+\ No newline at end of file
++``SHORTEN_MODELS``
++ You've seen this one.
++
++``SHORT_BASE_URL``
++ If defined, the ``shorturl`` and ``revcanonical`` template tags will
++ prefix generated URLs with this value. Use this if you've got a shorter
++ domain name you'd like to use for small URLs.
++
++ For example, given ``SHORT_BASE_URL = 'http://exm.pl/'``, ``{% shorturl
++ obj %}`` would return something like ``http://exm.pl/AbCd``.
++
++``SHORTEN_FULL_BASE_URL``
++ The domain to redirect to when redirecting away from the small URL.
++ Again, you'll use this if your short URL base and your "real" site
++ differ.
++
++ If not defined, the redirect view will try to guess the proper domain by
++ consulting the ``django.contrib.sites`` framework, if installed, or the
++ requested domain, if not.
Added: packages/python-django-shorturls/trunk/debian/patches/02_setup-sync.diff
===================================================================
--- packages/python-django-shorturls/trunk/debian/patches/02_setup-sync.diff (rev 0)
+++ packages/python-django-shorturls/trunk/debian/patches/02_setup-sync.diff 2010-01-16 23:09:57 UTC (rev 11180)
@@ -0,0 +1,20 @@
+Description: Apply changes in setup.py from the git
+Author: Janos Guljas <janos at janos.in.rs>
+Last-Update: 2010-01-06
+
+--- a/setup.py
++++ b/setup.py
+@@ -22,10 +22,11 @@ setup(
+
+ classifiers = [
+ 'Development Status :: 4 - Beta',
++ 'Framework :: Django',
+ 'Intended Audience :: Developers',
+ 'License :: OSI Approved :: BSD License',
+ 'Operating System :: OS Independent',
+ 'Programming Language :: Python',
+- 'Topic :: Internet',
++ 'Topic :: Internet :: WWW/HTTP',
+ ]
+ )
+\ No newline at end of file
Added: packages/python-django-shorturls/trunk/debian/patches/series
===================================================================
--- packages/python-django-shorturls/trunk/debian/patches/series (rev 0)
+++ packages/python-django-shorturls/trunk/debian/patches/series 2010-01-16 23:09:57 UTC (rev 11180)
@@ -0,0 +1,2 @@
+01_doc-sync.diff
+02_setup-sync.diff
Modified: packages/python-django-shorturls/trunk/debian/rules
===================================================================
--- packages/python-django-shorturls/trunk/debian/rules 2010-01-16 20:51:59 UTC (rev 11179)
+++ packages/python-django-shorturls/trunk/debian/rules 2010-01-16 23:09:57 UTC (rev 11180)
@@ -1,9 +1,13 @@
#!/usr/bin/make -f
%:
- dh $@
+ dh --with quilt $@
override_dh_auto_clean:
# remove AppleDouble encoded Macintosh files
find -name "._*" -exec rm -rf {} +
+ # remove PKG-INFO
+ rm -f PKG-INFO
+ # remove egg
+ rm -rf src/django_shorturls.egg-info
dh_auto_clean
More information about the Python-modules-commits
mailing list