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

[bubulle at users.alioth.debian.org]

Author: bubulle
Date: Fri May 27 15:45:31 2011
New Revision: 2643

URL: http://svn.debian.org/wsvn/?sc=1&rev=2643
Log:
  Closes: #627958, #585873

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

Modified: pootle/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pootle/trunk/debian/changelog?rev=2643&op=diff
==============================================================================
--- pootle/trunk/debian/changelog (original)
+++ pootle/trunk/debian/changelog Fri May 27 15:45:31 2011
@@ -1,7 +1,7 @@
 pootle (2.1.6-1) UNRELEASED; urgency=medium
 
   * New upstream version, compatible with django 1.3
-    Closes: #627958
+    Closes: #627958, #585873
   * Run update-python-modules before invoking django-admin
     Closes: #591599
   * Correct build dependency on quilt

Modified: pootle/trunk/debian/patches/debian_remove_external
URL: http://svn.debian.org/wsvn/pootle/trunk/debian/patches/debian_remove_external?rev=2643&op=diff
==============================================================================
--- pootle/trunk/debian/patches/debian_remove_external (original)
+++ pootle/trunk/debian/patches/debian_remove_external Fri May 27 15:45:31 2011
@@ -1,26 +1,32 @@
---- a/setup.py
-+++ b/setup.py
-@@ -72,12 +72,11 @@
+Index: trunk/setup.py
+===================================================================
+--- trunk.orig/setup.py
++++ trunk/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*'))
      package_data = {
-         '':           ['*.html', '*.txt', '*.xml', '*.css', '*.js'],
+         '': ['*.html', '*.txt', '*.xml', '*.css', '*.js'],
          'pootle_app': expand_tree_globs('local_apps/pootle_app', ['templates'], ['*.html']),
-         'pootle_notifications': expand_tree_globs('local_apps/pootle_notifications', ['templates'], ['*.html']),
--        'djblets':    expand_tree_globs('external_apps/djblets', ['siteconfig', 'util'], ['*.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',
-@@ -85,9 +84,7 @@
-         'pootle_misc':  'local_apps/pootle_misc',
-         'pootle_notifications': 'local_apps/pootle_notifications',
-         'pootle_autonotices': 'local_apps/pootle_autonotices',
+         'pootle_app': 'local_apps/pootle_app',
+@@ -96,10 +95,8 @@
+         'pootle_store': 'local_apps/pootle_store',
+         'pootle_terminology': 'local_apps/pootle_terminology',
+         'pootle_translationproject': 'local_apps/pootle_translationproject',
 -        'registration': 'external_apps/registration',
-         'profiles':     'external_apps/profiles',
--        'djblets':      'external_apps/djblets',
+         'contact_form_i18n': 'external_apps/contact_form_i18n',
+         'profiles': 'external_apps/profiles',
+-        'djblets': 'external_apps/djblets',
      }
      scripts = ['import_pootle_prefs', 'updatetm', 'PootleServer']
      options = {