Ubuntu Pastebin

Paste from ubuntu at Tue, 5 May 2015 16:36:42 +0000

Download as text 
 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
--- vim-7.4.488.dist/debian/changelog	2014-12-09 16:56:44.000000000 +0000
+++ vim-7.4.488/debian/changelog	2015-05-05 16:25:03.389215319 +0000
@@ -1,3 +1,10 @@
+vim (2:7.4.488-3ubuntu3) UNRELEASED; urgency=medium
+
+  * debian/rules, debian/control: replace python2 support with python3.
+    (LP: #1427275)
+
+ -- Scott Moser <smoser@ubuntu.com>  Tue, 05 May 2015 16:13:30 +0000
+
 vim (2:7.4.488-3ubuntu2) vivid; urgency=medium
 
   * debian/patches/fixtest63.patch: Cherry-pick r6411 from upstream to fix
--- vim-7.4.488.dist/debian/control	2014-12-09 13:23:09.000000000 +0000
+++ vim-7.4.488/debian/control	2015-05-05 15:53:06.577215319 +0000
@@ -15,7 +15,7 @@
  libgtk2.0-dev, libxaw7-dev, libxt-dev, libxpm-dev, libgnomeui-dev,
 # B-D for language interpreters
 # Update d/rules when ruby version changes
- libperl-dev, tcl-dev, python-dev, ruby, ruby-dev, lua5.2, liblua5.2-dev
+ libperl-dev, tcl-dev, python3-dev, ruby, ruby-dev, lua5.2, liblua5.2-dev
 # ruby1.8{,-dev} Provides: ruby{,-dev} which can cause breakage on buildds if
 # ruby/ruby1.8-dev or ruby1.8/ruby-dev pairs get installed due to a mismatch in
 # the ruby binary version and the library version
@@ -155,7 +155,7 @@
 Architecture: any
 Depends: vim-gui-common (= ${source:Version}), vim-common (= ${binary:Version}), vim-runtime (= ${source:Version}), ${misc:Depends}, ${shlibs:Depends}
 Suggests: cscope, vim-doc, ttf-dejavu, gnome-icon-theme
-Provides: vim, gvim, editor, vim-perl, vim-python, vim-ruby, vim-tcl, vim-lua
+Provides: vim, gvim, editor, vim-perl, vim-python3, vim-ruby, vim-tcl, vim-lua
 Description: Vi IMproved - enhanced vi editor - with GTK2 GUI
  Vim is an almost compatible version of the UNIX editor Vi.
  .
@@ -171,7 +171,7 @@
 Architecture: any
 Depends: vim-common (= ${binary:Version}), vim-runtime (= ${source:Version}), ${misc:Depends}, ${shlibs:Depends}
 Suggests: cscope, vim-doc
-Provides: vim, editor, vim-perl, vim-python, vim-ruby, vim-tcl, vim-lua
+Provides: vim, editor, vim-perl, vim-python3, vim-ruby, vim-tcl, vim-lua
 Description: Vi IMproved - enhanced vi editor - with scripting languages support
  Vim is an almost compatible version of the UNIX editor Vi.
  .
@@ -187,7 +187,7 @@
 Architecture: any
 Depends: vim-gui-common (= ${source:Version}), vim-common (= ${binary:Version}), vim-runtime (= ${source:Version}), ${misc:Depends}, ${shlibs:Depends}
 Suggests: cscope, vim-doc
-Provides: vim, gvim, editor, vim-perl, vim-python, vim-ruby, vim-tcl, vim-lua
+Provides: vim, gvim, editor, vim-perl, vim-python3, vim-ruby, vim-tcl, vim-lua
 Description: Vi IMproved - enhanced vi editor - with Athena GUI
  Vim is an almost compatible version of the UNIX editor Vi.
  .
@@ -211,7 +211,7 @@
 Architecture: any
 Depends: vim-gui-common (= ${source:Version}), vim-common (= ${binary:Version}), vim-runtime (= ${source:Version}), ${misc:Depends}, ${shlibs:Depends}
 Suggests: cscope, vim-doc, ttf-dejavu, gnome-icon-theme
-Provides: vim, gvim, editor, vim-perl, vim-python, vim-ruby, vim-tcl, vim-lua
+Provides: vim, gvim, editor, vim-perl, vim-python3, vim-ruby, vim-tcl, vim-lua
 Description: Vi IMproved - enhanced vi editor - with GNOME2 GUI
  Vim is an almost compatible version of the UNIX editor Vi.
  .
diff -Naur vim-7.4.488.dist/debian/rules vim-7.4.488/debian/rules
--- vim-7.4.488.dist/debian/rules	2014-12-09 11:39:30.000000000 +0000
+++ vim-7.4.488/debian/rules	2015-05-05 16:10:42.789215319 +0000
@@ -95,20 +95,25 @@
 NOINTERPFLAGS:=--disable-luainterp
 NOINTERPFLAGS+=--disable-mzschemeinterp
 NOINTERPFLAGS+=--disable-perlinterp
+
+ENABLE_PYTHON3:=--enable-python3interp --with-python3-config-dir=$(shell python3-config --configdir) 
+ENABLE_PYTHON2:=--enable-pythoninterp --with-python-config-dir=$(shell python-config --configdir) 
+
 ifeq ($(DEB_VENDOR),Ubuntu)
-	NOINTERPFLAGS+=--enable-pythoninterp --with-python-config-dir=$(shell python-config --configdir)
-else
-	NOINTERPFLAGS+=--disable-pythoninterp
+	NOINTERPFLAGS+=$(ENABLE_PYTHON3)
 endif
-NOINTERPFLAGS+=--disable-python3interp
+NOINTERPFLAGS+=--disable-pythoninterp
 NOINTERPFLAGS+=--disable-rubyinterp
 NOINTERPFLAGS+=--disable-tclinterp
 
 ALLINTERPFLAGS:=--enable-luainterp
 ALLINTERPFLAGS+=--disable-mzschemeinterp
 ALLINTERPFLAGS+=--enable-perlinterp
-ALLINTERPFLAGS+=--enable-pythoninterp --with-python-config-dir=$(shell python-config --configdir)
-ALLINTERPFLAGS+=--disable-python3interp
+ifeq ($(DEB_VENDOR),Ubuntu)
+	ALLINTERPFLAGS+=--disable-pythoninterp $(ENABLE_PYTHON3)
+else
+	ALLINTERPFLAGS+=--disable-python3interp $(ENABLE_PYTHON2)
+endif
 ALLINTERPFLAGS+=--enable-rubyinterp
 ALLINTERPFLAGS+=--enable-tclinterp
Download as text