[Debian-l10n-commits] r2781 - in /pootle/trunk/debian: changelog control patches/debian_remove_external

[themill-guest at users.alioth.debian.org]

Author: themill-guest
Date: Wed Nov 16 16:08:51 2011
New Revision: 2781

URL: http://svn.debian.org/wsvn/?sc=1&rev=2781
Log:
Use internal djblets since package was removed

Modified:
    pootle/trunk/debian/changelog
    pootle/trunk/debian/control
    pootle/trunk/debian/patches/debian_remove_external

Modified: pootle/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pootle/trunk/debian/changelog?rev=2781&op=diff
==============================================================================
--- pootle/trunk/debian/changelog (original)
+++ pootle/trunk/debian/changelog Wed Nov 16 16:08:51 2011
@@ -29,6 +29,7 @@
   * Depend on packaged libjs-json and libjs-jquery-cookie.
   * Update README.Debian with a more detailed quick-start; thanks to
     Sam Morris for the suggestions. Closes: #629914
+  * Don't depend on python-django-djblets since the package no longer exists.
 
  -- Christian Perrier <bubulle at debian.org>  Fri, 27 Aug 2010 07:56:07 +0200
 

Modified: pootle/trunk/debian/control
URL: http://svn.debian.org/wsvn/pootle/trunk/debian/control?rev=2781&op=diff
==============================================================================
--- pootle/trunk/debian/control (original)
+++ pootle/trunk/debian/control Wed Nov 16 16:08:51 2011
@@ -13,9 +13,10 @@
 Package: pootle
 Architecture: all
 Pre-Depends: python-django
-Depends: ${misc:Depends}, ${python:Depends}, translate-toolkit (>= 1.9.0), adduser, python-lxml, libjs-jquery, libjs-jquery-cookie, libjs-json, python-django-registration, python-django-djblets, python-django-south, dbconfig-common, libapache2-mod-wsgi | httpd | cherrypy
+Depends: ${misc:Depends}, ${python:Depends}, translate-toolkit (>= 1.9.0), adduser, python-lxml, libjs-jquery, libjs-jquery-cookie, libjs-json, python-django-registration, python-django-south, dbconfig-common, libapache2-mod-wsgi | httpd | cherrypy
 Recommends: python-xapian, zip, python-levenshtein, iso-codes, mysql-client | postgresql-client
 Suggests: python-aeidon
+Conflicts: python-django-djblets
 XB-Python-Version: ${python:Versions}
 Description: Web-based translation and translation management tool
  Pootle provides a rich set of features for managing a translation

Modified: pootle/trunk/debian/patches/debian_remove_external
URL: http://svn.debian.org/wsvn/pootle/trunk/debian/patches/debian_remove_external?rev=2781&op=diff
==============================================================================
--- pootle/trunk/debian/patches/debian_remove_external (original)
+++ pootle/trunk/debian/patches/debian_remove_external Wed Nov 16 16:08:51 2011
@@ -1,32 +1,19 @@
-Index: trunk/setup.py
-===================================================================
---- trunk.orig/setup.py
-+++ trunk/setup.py
+--- a/setup.py
++++ b/setup.py
 @@ -72,7 +72,7 @@
          list_tree(INSTALL_WORKING_DIR, 'po') + list_tree(INSTALL_DATA_DIR, 'mo')
  
      packages = ['pootle'] + ['pootle.' + pkg for pkg in find_packages('pootle')] + \
 -            find_packages('local_apps') + find_packages('external_apps')
-+            find_packages('local_apps') + find_packages('external_apps',('djblets*','registration*'))
++            find_packages('local_apps') + find_packages('external_apps',('registration*',))
      package_data = {
          '': ['*.html', '*.txt', '*.xml', '*.css', '*.js'],
          'pootle_app': expand_tree_globs('local_apps/pootle_app', ['templates'], ['*.html']),
-@@ -82,7 +82,6 @@
-         'pootle_store': expand_tree_globs('local_apps/pootle_store', ['templates'], ['*.html']),
-         'pootle_terminology': expand_tree_globs('local_apps/pootle_terminology', ['templates'], ['*.html']),
-         'pootle_translationproject': expand_tree_globs('local_apps/pootle_translationproject', ['templates'], ['*.html']),
--        'djblets': expand_tree_globs('external_apps/djblets', ['siteconfig', 'util'], ['*.html']),
-     }
-     package_dir = {
-         'pootle_app': 'local_apps/pootle_app',
-@@ -96,10 +95,8 @@
+@@ -96,7 +96,6 @@
          'pootle_store': 'local_apps/pootle_store',
          'pootle_terminology': 'local_apps/pootle_terminology',
          'pootle_translationproject': 'local_apps/pootle_translationproject',
 -        'registration': 'external_apps/registration',
          'contact_form_i18n': 'external_apps/contact_form_i18n',
          'profiles': 'external_apps/profiles',
--        'djblets': 'external_apps/djblets',
-     }
-     scripts = ['import_pootle_prefs', 'updatetm', 'PootleServer']
-     options = {
+         'djblets': 'external_apps/djblets',