[Python-modules-commits] r23487 - in packages/circuits/trunk/debian (3 files)

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

    Date: Saturday, February 16, 2013 @ 01:45:36
  Author: eriol-guest
Revision: 23487

Removed 05_fix-circuit-web-entry-point.patch because merged upstream

Modified:
  packages/circuits/trunk/debian/changelog
  packages/circuits/trunk/debian/patches/series
Deleted:
  packages/circuits/trunk/debian/patches/05_fix-circuit-web-entry-point.patch

Modified: packages/circuits/trunk/debian/changelog
===================================================================
--- packages/circuits/trunk/debian/changelog	2013-02-16 00:05:12 UTC (rev 23486)
+++ packages/circuits/trunk/debian/changelog	2013-02-16 01:45:36 UTC (rev 23487)
@@ -1,5 +1,8 @@
 circuits (2.0.1-1) UNRELEASED; urgency=low
 
+  * New upstream release
+    - Provided patch to fix entry point path for circuits.web CLI tool was
+      merged upstream. Thanks to Jakub Wilk for the report. (Closes: #684740)
   * debian/patches/01_use_issuetraker_instead_of_bitbucket.patch
     - Superseded by 01_disable_sphinxcontrib-bitbucket.patch
       because sphinxcontrib.issuetraker requires a network
@@ -8,9 +11,6 @@
   * debian/patches/01_disable_sphinxcontrib-bitbucket.patch
     - Disable sphinxcontrib-bitbucket because it is not
       packaged for Debian
-  * debian/patches/05_fix-circuit-web-entry-point.patch
-    - Fix entry point path for circuits.web CLI tool. Thanks to
-      Jakub Wilk for the report. (Closes: #684740)
   * debian/rules
     - Clean circuits.egg-info/entry_points.txt to make the package
       build twice in a row

Deleted: packages/circuits/trunk/debian/patches/05_fix-circuit-web-entry-point.patch
===================================================================
--- packages/circuits/trunk/debian/patches/05_fix-circuit-web-entry-point.patch	2013-02-16 00:05:12 UTC (rev 23486)
+++ packages/circuits/trunk/debian/patches/05_fix-circuit-web-entry-point.patch	2013-02-16 01:45:36 UTC (rev 23487)
@@ -1,15 +0,0 @@
-Description: Fix entry point path for circuits.web CLI tool.
-Author: Daniele Tricoli <eriol at mornie.org>
-Forwarded: https://bitbucket.org/prologic/circuits/pull-request/4/fixed-circuitsweb-entry-point
-Last-Update: 2012-08-24
---- a/setup.py
-+++ b/setup.py
-@@ -91,7 +91,7 @@
-     scripts=glob("scripts/*"),
-     entry_points="""
-     [console_scripts]
--    circuits.web = circuits.web.__main__:main
-+    circuits.web = circuits.web.main:main
-     """,
-     zip_safe=False,
-     test_suite="tests.main.runtests",

Modified: packages/circuits/trunk/debian/patches/series
===================================================================
--- packages/circuits/trunk/debian/patches/series	2013-02-16 00:05:12 UTC (rev 23486)
+++ packages/circuits/trunk/debian/patches/series	2013-02-16 01:45:36 UTC (rev 23487)
@@ -2,4 +2,3 @@
 02_remove_templatebuiltins_js.patch
 03_force-localhost-as-host-name.patch
 04_fix-python3-sintax-error.patch
-05_fix-circuit-web-entry-point.patch