Merge lp:~hggdh2/ubuntu/oneiric/ajaxterm/bug795159 into lp:ubuntu/oneiric/ajaxterm

[C de-Avillez]

adjust as requested for bug 795159:

    + debian/patches/93_bug795159.diff: removed add to sys.path at beginning
      of the code (unneeded, potential security issue);
    + debian/patches/series: adjusted for above patch;
    + debian/rules: delete auto-installed /usr/share/python/runtime.d
    + debian/control: adjusted Maintainer field.

[lp:~hggdh2/ubuntu/oneiric/ajaxterm/bug795159]

18. By C de-Avillez on 2011-08-18

additional corrections requested by Daviey on personal chat.

[Kees Cook (kees)]

Looks good, thanks! I've made some small changes to the Description, added the newly-created Debian bug, and slightly cleaned up the changelog entry to match.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2011-04-17 09:32:01 +0000
+++ debian/changelog	2011-08-18 01:12:31 +0000
@@ -1,3 +1,13 @@
+ajaxterm (0.10-11ubuntu1) oneiric; urgency=low
+
+  * Resolutions for issues outlined in MIR - LP: #795159:
+    + debian/patches/93_bug795159.diff: removed add to sys.path at beginning
+      of the code (unneeded, potential security issue); 
+    + debian/rules: delete auto-installed /usr/share/python/runtime.d
+    (LP: #795159)
+
+ -- C de-Avillez <[e-mail]>  Wed, 17 Aug 2011 12:29:51 -0500
+
 ajaxterm (0.10-11) unstable; urgency=low
 
   * Switch from pysupport to dh_python2 
 
=== modified file 'debian/control'
--- debian/control	2011-04-17 09:32:01 +0000
+++ debian/control	2011-08-18 01:12:31 +0000
@@ -1,7 +1,8 @@
 Source: ajaxterm
 Section: web
 Priority: optional
-Maintainer: Julien Valroff <[e-mail]>
+XSBC-Original-Maintainer: Julien Valroff <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
 Build-Depends: debhelper (>= 8), python (>= 2.6.6-3)
 Standards-Version: 3.9.2
 X-Python-Version: >= 2.3
 
=== added file 'debian/patches/93_bug795159.diff'
--- debian/patches/93_bug795159.diff	1970-01-01 00:00:00 +0000
+++ debian/patches/93_bug795159.diff	2011-08-18 01:12:31 +0000
@@ -0,0 +1,18 @@
+Description: Ubuntu-requested changes introduced in version 0.10-11ubuntu1
+Author: C de-Avillez <[e-mail]>
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/795159
+Forwarded: no
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: 2011-07-17
+
+--- ajaxterm-0.10.orig/ajaxterm.py
++++ ajaxterm-0.10/ajaxterm.py
+@@ -18,8 +18,6 @@ except ImportError:
+ 	sha1 = sha.new
+ 
+ os.chdir(os.path.normpath(os.path.dirname(__file__)))
+-# Optional: Add QWeb in sys path
+-sys.path[0:0]=glob.glob('../../python')
+ 
+ import qweb, codecs
+ utf8decoder = codecs.getincrementaldecoder('utf8')()
 
=== modified file 'debian/patches/series'
--- debian/patches/series	2011-04-17 09:32:01 +0000
+++ debian/patches/series	2011-08-18 01:12:31 +0000
@@ -14,3 +14,4 @@
 40_more-ctrl-catches.diff
 90_token_based_access_control.diff
 91_terminate_on_idle.diff
+93_bug795159.diff
 
=== modified file 'debian/rules'
--- debian/rules	2011-04-17 09:32:01 +0000
+++ debian/rules	2011-08-18 01:12:31 +0000
@@ -1,6 +1,16 @@
 #!/usr/bin/make -f
+
+PACKAGE	= $(shell dh_listpackages)
+TMP     = $(CURDIR)/debian/$(PACKAGE)
+
 %:
 	dh $@ --with python2
 
 override_dh_auto_configure:
-	./configure --prefix=debian/ajaxterm/usr --confdir=debian/ajaxterm/etc
+	./configure --prefix=$(TMP)/usr --confdir=$(TMP)/etc
+
+override_dh_python2:
+	dh_python2
+	rm -rf $(TMP)/usr/share/python/runtime.d/
+
+.PHONY: override_dh_python2