ubuntu-packaging-guide-team team mailing list archive

[Dmitry Shachnev <mitya57@xxxxxxxxx>]

Dmitry Shachnev has proposed merging lp:~mitya57/ubuntu-packaging-guide/fixes into lp:ubuntu-packaging-guide.

Requested reviews:
  Ubuntu Packaging Guide Team (ubuntu-packaging-guide-team)
Related bugs:
  Bug #1047457 in Ubuntu Packaging Guide: "python-packaging.html will result in incorrect #! lines for Python 3"
  https://bugs.launchpad.net/ubuntu-packaging-guide/+bug/1047457

For more details, see:
https://code.launchpad.net/~mitya57/ubuntu-packaging-guide/fixes/+merge/123315
-- 
https://code.launchpad.net/~mitya57/ubuntu-packaging-guide/fixes/+merge/123315
Your team Ubuntu Packaging Guide Team is requested to review the proposed merge of lp:~mitya57/ubuntu-packaging-guide/fixes into lp:ubuntu-packaging-guide.

=== modified file 'themes/ubuntu/static/guide.css'
--- themes/ubuntu/static/guide.css	2012-08-02 12:06:12 +0000
+++ themes/ubuntu/static/guide.css	2012-09-07 16:24:20 +0000
@@ -7,10 +7,6 @@
     margin-bottom: 5px;
 }
 
-.section ul {
+.section ul, .highlight {
     margin-bottom: 10px;
 }
-
-.highlight {
-    padding-bottom: 10px;
-}

=== modified file 'ubuntu-packaging-guide/python-packaging.rst'
--- ubuntu-packaging-guide/python-packaging.rst	2012-08-23 11:29:49 +0000
+++ ubuntu-packaging-guide/python-packaging.rst	2012-09-07 16:24:20 +0000
@@ -37,8 +37,12 @@
 
 .. code-block:: makefile
 
-   # This command builds the list of supported Python 3 versions
-   PYTHON3=$(shell py3versions -r)
+   # These command build the list of supported Python 3 versions
+   # The last version should be just "python3" so that the scripts
+   # get a correct shebang.
+   PY3REQUESTED := $(shell py3versions -r)
+   PY3DEFAULT := $(shell py3versions -d)
+   PYTHON3 := $(filter-out $(PY3DEFAULT),$(PY3REQUESTED)) python3
    
    %:
        # Adding the required helpers