[Python-modules-commits] r13087 - in packages/sphinx/trunk/debian (4 files)

[piotr at users.alioth.debian.org]

    Date: Tuesday, May 25, 2010 @ 20:54:51
  Author: piotr
Revision: 13087

* New upstream release
  - disable_ez_setup.patch removed, no longer needed
  - move_static_files_outside_site-packages.patch updated

Modified:
  packages/sphinx/trunk/debian/changelog
  packages/sphinx/trunk/debian/patches/move_static_files_outside_site-packages.patch
  packages/sphinx/trunk/debian/patches/series
Deleted:
  packages/sphinx/trunk/debian/patches/disable_ez_setup.patch

Modified: packages/sphinx/trunk/debian/changelog
===================================================================
--- packages/sphinx/trunk/debian/changelog	2010-05-25 20:33:56 UTC (rev 13086)
+++ packages/sphinx/trunk/debian/changelog	2010-05-25 20:54:51 UTC (rev 13087)
@@ -1,9 +1,18 @@
-sphinx (0.6.5-1) unstable; urgency=low
+sphinx (0.6.6-1) unstable; urgency=low
 
   [ Piotr Ożarowski ]
   * New upstream release
+    - disable_ez_setup.patch removed, no longer needed
+    - move_static_files_outside_site-packages.patch updated
   * Bump Standards-Version to 3.8.4, no changes needed.
 
+ -- Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>  Tue, 25 May 2010 22:30:46 +0200
+
+sphinx (0.6.5-1) unstable; urgency=low
+
+  [ Piotr Ożarowski ]
+  * New upstream release
+
  -- Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>  Mon, 29 Mar 2010 23:08:45 +0200
 
 sphinx (0.6.4-1) unstable; urgency=low

Deleted: packages/sphinx/trunk/debian/patches/disable_ez_setup.patch
===================================================================
--- packages/sphinx/trunk/debian/patches/disable_ez_setup.patch	2010-05-25 20:33:56 UTC (rev 13086)
+++ packages/sphinx/trunk/debian/patches/disable_ez_setup.patch	2010-05-25 20:54:51 UTC (rev 13087)
@@ -1,13 +0,0 @@
-all dependencies should be are already installed (see Build-Depends*),
-ignore ez_setup's attempt to download different version of setuptools
---- a/setup.py
-+++ b/setup.py
-@@ -1,6 +1,6 @@
- # -*- coding: utf-8 -*-
--import ez_setup
--ez_setup.use_setuptools()
-+#import ez_setup
-+#ez_setup.use_setuptools()
- 
- import os
- import sys

Modified: packages/sphinx/trunk/debian/patches/move_static_files_outside_site-packages.patch
===================================================================
--- packages/sphinx/trunk/debian/patches/move_static_files_outside_site-packages.patch	2010-05-25 20:33:56 UTC (rev 13086)
+++ packages/sphinx/trunk/debian/patches/move_static_files_outside_site-packages.patch	2010-05-25 20:54:51 UTC (rev 13087)
@@ -39,16 +39,3 @@
          for filename in os.listdir(staticdirname):
              if not filename.startswith('.'):
                  copyfile(path.join(staticdirname, filename),
---- a/sphinx/builders/html.py
-+++ b/sphinx/builders/html.py
-@@ -91,8 +91,8 @@
-             self.link_suffix = self.out_suffix
- 
-         if self.config.language is not None:
--            jsfile = path.join(package_dir, 'locale', self.config.language,
--                               'LC_MESSAGES', 'sphinx.js')
-+            jsfile = path.join('/usr/share/sphinx/locale', \
-+                               self.config.language, 'sphinx.js')
-             if path.isfile(jsfile):
-                 self.script_files.append('_static/translations.js')
- 

Modified: packages/sphinx/trunk/debian/patches/series
===================================================================
--- packages/sphinx/trunk/debian/patches/series	2010-05-25 20:33:56 UTC (rev 13086)
+++ packages/sphinx/trunk/debian/patches/series	2010-05-25 20:54:51 UTC (rev 13087)
@@ -1,2 +1 @@
 move_static_files_outside_site-packages.patch
-disable_ez_setup.patch