[Python-modules-commits] r18184 - in packages/python-django-feincms/trunk/debian (9 files)
janos-guest at users.alioth.debian.org
janos-guest at users.alioth.debian.org
Wed Aug 17 00:14:13 UTC 2011
Date: Wednesday, August 17, 2011 @ 00:14:11
Author: janos-guest
Revision: 18184
New upstream release 1.4.1.
Added:
packages/python-django-feincms/trunk/debian/source/local-options
Modified:
packages/python-django-feincms/trunk/debian/changelog
packages/python-django-feincms/trunk/debian/control
packages/python-django-feincms/trunk/debian/copyright
packages/python-django-feincms/trunk/debian/patches/series
packages/python-django-feincms/trunk/debian/python-django-feincms.links
packages/python-django-feincms/trunk/debian/rules
packages/python-django-feincms/trunk/debian/watch
Deleted:
packages/python-django-feincms/trunk/debian/patches/fix-tagging-import.patch
Modified: packages/python-django-feincms/trunk/debian/changelog
===================================================================
--- packages/python-django-feincms/trunk/debian/changelog 2011-08-16 23:53:43 UTC (rev 18183)
+++ packages/python-django-feincms/trunk/debian/changelog 2011-08-17 00:14:11 UTC (rev 18184)
@@ -1,3 +1,16 @@
+python-django-feincms (1.4.1-1) unstable; urgency=low
+
+ * New upstream release.
+ * Remove get-orig-source from debian/rules as there is no need for
+ repacking orig tarball. Upstream is providing not compressed JavaScript
+ files as preferred form of modification.
+ * Add jquery and jquery-ui licences to debian/copyright.
+ * Link jquery and jquery-ui files in debian/python-django-feincms.links.
+ * Remove debian/patches/fix-tagging-import.patch as it is fixed upstream.
+ * Add debian/source/local-options.
+
+ -- Janos Guljas <janos at resenje.org> Wed, 17 Aug 2011 02:09:45 +0200
+
python-django-feincms (1.3.1~dfsg-1) unstable; urgency=low
* New upstream release.
Modified: packages/python-django-feincms/trunk/debian/control
===================================================================
--- packages/python-django-feincms/trunk/debian/control 2011-08-16 23:53:43 UTC (rev 18183)
+++ packages/python-django-feincms/trunk/debian/control 2011-08-17 00:14:11 UTC (rev 18184)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Janos Guljas <janos at resenje.org>
Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
-Build-Depends: debhelper (>= 7.0.50~), python-setuptools, python-django (>= 1.2),
+Build-Depends: debhelper (>= 7.0.50~), python-setuptools, python-django,
python-sphinx, python-imaging, python-feedparser, python-django-mptt,
python-django-tagging, python-lxml, python-tidylib
Standards-Version: 3.9.2
@@ -15,7 +15,7 @@
Architecture: all
Depends: ${misc:Depends}, ${python:Depends}, python-django, python-django-mptt,
python-django-tagging, python-imaging, python-feedparser, python-tidylib,
- libjs-jquery (>= 1.5.1), libjs-jquery-ui (>= 1.8), libjs-jquery-cookie
+ libjs-jquery, libjs-jquery-ui, libjs-jquery-cookie
Recommends: python-lxml
Provides: ${python:Provides}
Description: Django-based Page CMS and CMS building toolkit
Modified: packages/python-django-feincms/trunk/debian/copyright
===================================================================
--- packages/python-django-feincms/trunk/debian/copyright 2011-08-16 23:53:43 UTC (rev 18183)
+++ packages/python-django-feincms/trunk/debian/copyright 2011-08-17 00:14:11 UTC (rev 18184)
@@ -19,6 +19,39 @@
Copyright: 2008 Greg Weber greg at gregweber.info
License: MIT, GPL-2+
+Files: feincms/static/feincms/jquery-1.5.1.js
+ feincms/static/feincms/jquery-1.5.1.min.js
+Copyright: 2011, John Resig
+License: MIT, GPL-2+
+
+Files: feincms/static/feincms/jquery-ui-1.8.13.custom.js
+ feincms/static/feincms/jquery-ui-1.8.13.custom.min.js
+Copyright: 2008 Paul Bakaus (ui.jquery.com)
+ Brandon Aaron
+ David Bolter
+ Rich Caloggero
+ Chi Cheng (cloudream at gmail.com)
+ Colin Clark (http://colin.atrc.utoronto.ca/)
+ Michelle D'Souza
+ Aaron Eisenberger (aaronchi at gmail.com)
+ Ariel Flesler
+ Bohdan Ganicky
+ Scott González
+ Marc Grabanski (m at marcgrabanski.com)
+ Klaus Hartl (stilbuero.de)
+ Scott Jehl
+ Cody Lindley
+ Eduardo Lundgren (eduardolundgren at gmail.com)
+ Todd Parker
+ John Resig
+ Patty Toland
+ Ca-Phun Ung (yelotofu.com)
+ Keith Wood (kbwood at virginbroadband.com.au)
+ Maggie Costello Wachs
+ Richard D. Worth (rdworth.org)
+ Jörn Zaefferer (bassistance.de)
+License: MIT, GPL-2+
+
Files: feincms/static/feincms/jquery.cookie.js
Copyright: 2006 Klaus Hartl (stilbuero.de)
License: MIT, GPL-2+
Deleted: packages/python-django-feincms/trunk/debian/patches/fix-tagging-import.patch
===================================================================
--- packages/python-django-feincms/trunk/debian/patches/fix-tagging-import.patch 2011-08-16 23:53:43 UTC (rev 18183)
+++ packages/python-django-feincms/trunk/debian/patches/fix-tagging-import.patch 2011-08-17 00:14:11 UTC (rev 18184)
@@ -1,52 +0,0 @@
-Description: Fix conflicting imports in feincms/contrib/tagging.py module
-Author: Janos Guljas <janos at resenje.org>
-Last-Update: 2011-07-15
-
---- a/feincms/contrib/tagging.py
-+++ b/feincms/contrib/tagging.py
-@@ -7,12 +7,13 @@
- # from feincms.contrib import tagging
- # tagging.tag_model(Page)
- # ------------------------------------------------------------------------
-+__package__ = 'feincms.contrib.tagging'
-
- from django.db.models.signals import pre_save
- from django import forms
- from django.contrib.admin.widgets import FilteredSelectMultiple
-
--from ..tagging.fields import TagField
-+from tagging.fields import TagField
-
- # ------------------------------------------------------------------------
- def taglist_to_string(taglist):
-@@ -48,8 +49,8 @@ class TagSelectField(TagField):
- self.filter_horizontal = filter_horizontal
-
- def formfield(self, **defaults):
-- from ..tagging.models import Tag, TaggedItem
-- from ..tagging.utils import parse_tag_input
-+ from tagging.models import Tag, TaggedItem
-+ from tagging.utils import parse_tag_input
-
- if self.filter_horizontal:
- widget = FilteredSelectMultiple(self.verbose_name, is_stacked=False)
-@@ -70,7 +71,7 @@ def pre_save_handler(sender, instance, *
- Intercept attempts to save and sort the tag field alphabetically, so
- we won't have different permutations in the filter list.
- """
-- from ..tagging.utils import parse_tag_input
-+ from tagging.utils import parse_tag_input
-
- taglist = parse_tag_input(instance.tags)
- instance.tags = taglist_to_string(taglist)
-@@ -92,8 +93,8 @@ def tag_model(cls, admin_cls=None, field
- select_field If True, show a multi select instead of the standard
- CharField for tag entry.
- """
-- from ..tagging.fields import TagField
-- from ..tagging import register as tagging_register
-+ from tagging.fields import TagField
-+ from tagging import register as tagging_register
-
- cls.add_to_class(field_name, (select_field and TagSelectField or TagField)(field_name.capitalize(), blank=True))
- # use another name for the tag descriptor
Modified: packages/python-django-feincms/trunk/debian/patches/series
===================================================================
--- packages/python-django-feincms/trunk/debian/patches/series 2011-08-16 23:53:43 UTC (rev 18183)
+++ packages/python-django-feincms/trunk/debian/patches/series 2011-08-17 00:14:11 UTC (rev 18184)
@@ -1,2 +1 @@
fix-sphinx-comment.patch
-fix-tagging-import.patch
Modified: packages/python-django-feincms/trunk/debian/python-django-feincms.links
===================================================================
--- packages/python-django-feincms/trunk/debian/python-django-feincms.links 2011-08-16 23:53:43 UTC (rev 18183)
+++ packages/python-django-feincms/trunk/debian/python-django-feincms.links 2011-08-17 00:14:11 UTC (rev 18184)
@@ -1,3 +1,5 @@
+/usr/share/javascript/jquery/jquery.js usr/share/pyshared/feincms/static/feincms/jquery-1.5.1.js
/usr/share/javascript/jquery/jquery.min.js usr/share/pyshared/feincms/static/feincms/jquery-1.5.1.min.js
-/usr/share/javascript/jquery-ui/jquery-ui.min.js usr/share/pyshared/feincms/static/feincms/jquery-ui-1.8.7.custom.min.js
+/usr/share/javascript/jquery-ui/jquery-ui.js usr/share/pyshared/feincms/static/feincms/jquery-ui-1.8.13.custom.js
+/usr/share/javascript/jquery-ui/jquery-ui.min.js usr/share/pyshared/feincms/static/feincms/jquery-ui-1.8.13.custom.min.js
/usr/share/javascript/jquery-cookie/jquery.cookie.js usr/share/pyshared/feincms/static/feincms/jquery.cookie.js
Modified: packages/python-django-feincms/trunk/debian/rules
===================================================================
--- packages/python-django-feincms/trunk/debian/rules 2011-08-16 23:53:43 UTC (rev 18183)
+++ packages/python-django-feincms/trunk/debian/rules 2011-08-17 00:14:11 UTC (rev 18184)
@@ -21,14 +21,3 @@
override_dh_installexamples:
dh_installexamples -Xexample/media/.gitignore
-
-get-orig-source:
- $(eval VER:=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^~]+).*,\1,p'))
- rm -rf feincms-feincms-* python-django-feincms_*~dfsg.orig.tar.gz
- uscan --noconf --force-download --rename --download-version=$(VER) --destdir=.
- tar -xf python-django-feincms_$(VER).orig.tar.gz
- rm -f python-django-feincms_$(VER).orig.tar.gz
- rm feincms-feincms-*/feincms/static/feincms/jquery-1.5.1.min.js
- rm feincms-feincms-*/feincms/static/feincms/jquery-ui-1.8.7.custom.min.js
- tar -czf python-django-feincms_$(VER)~dfsg.orig.tar.gz feincms-feincms-*
- rm -rf feincms-feincms-*
Added: packages/python-django-feincms/trunk/debian/source/local-options
===================================================================
--- packages/python-django-feincms/trunk/debian/source/local-options (rev 0)
+++ packages/python-django-feincms/trunk/debian/source/local-options 2011-08-17 00:14:11 UTC (rev 18184)
@@ -0,0 +1,2 @@
+unapply-patches
+abort-on-upstream-changes
Modified: packages/python-django-feincms/trunk/debian/watch
===================================================================
--- packages/python-django-feincms/trunk/debian/watch 2011-08-16 23:53:43 UTC (rev 18183)
+++ packages/python-django-feincms/trunk/debian/watch 2011-08-17 00:14:11 UTC (rev 18184)
@@ -1,3 +1,2 @@
version=3
-opts=dversionmangle=s/~dfsg$// \
http://githubredir.debian.net/github/feincms/feincms /github/feincms/feincms/v((?:\d\.)+\d).tar.gz
More information about the Python-modules-commits
mailing list