[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#682653: marked as done (unblock vim/2:7.3.547-4)

Your message dated Tue, 24 Jul 2012 15:21:07 +0200
with message-id <20120724132107.GG10809@radis.cristau.org>
and subject line Re: Bug#682653: unblock vim/2:7.3.547-4
has caused the Debian Bug report #682653,
regarding unblock vim/2:7.3.547-4
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
682653: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=682653
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
Package: release.debian.org
User: release.debian.org@packages.debian.org
Usertags: unblock
Severity: normal

On Wed, Jul 18, 2012 at 06:42:41AM -0400, James McCoy wrote:
> On Wed, Jul 18, 2012 at 11:41:31AM +0200, Julien Cristau wrote:
> > On Wed, Jul 18, 2012 at 09:35:28 +0200, Jakub Wilk wrote:
> > > Plan B
> > > ======
> > > In any order:
> > > - Fix vim build not to link config.c into the binary. (I attached a
> > > proposed patch.)
> > > - Fix python2.7 symbols. Add Breaks for each provider of vim-python.
> > > 
> > > 
> > > Personally, I'd prefer plan B.
> > > 
> > I'd have thought there was a reason for linking in config.c, but if not
> > then I agree plan B sounds better.
> 
> Ditto.  Unless I hear of a compelling reason from upstream, I'll apply
> Jakub's patch.

Done and uploaded as 2:7.3.547-4 with the below diff.  Please consider
unblocking.

unblock vim/2:7.3.547-4

Cheers,

James


diffstat for vim-7.3.547 vim-7.3.547

 changelog                               |    7 ++
 patches/series                          |    1 
 patches/upstream/remove-py_config.patch |   80 ++++++++++++++++++++++++++++++++
 3 files changed, 88 insertions(+)

diff -Nru vim-7.3.547/debian/changelog vim-7.3.547/debian/changelog
--- vim-7.3.547/debian/changelog	2012-06-26 19:14:31.000000000 -0400
+++ vim-7.3.547/debian/changelog	2012-07-23 22:55:58.000000000 -0400
@@ -1,3 +1,10 @@
+vim (2:7.3.547-4) unstable; urgency=low
+
+  * Add remove-py_config.patch, removing the dependence on Python's config.c.
+    (Closes: #681599)
+
+ -- James McCoy <jamessan@debian.org>  Mon, 23 Jul 2012 22:55:51 -0400
+
 vim (2:7.3.547-3) unstable; urgency=low
 
   * Add netrw-syntax-fix.patch to fix a syntax error in NetRead's ftp
diff -Nru vim-7.3.547/debian/patches/series vim-7.3.547/debian/patches/series
--- vim-7.3.547/debian/patches/series	2012-06-26 06:57:07.000000000 -0400
+++ vim-7.3.547/debian/patches/series	2012-07-23 22:54:13.000000000 -0400
@@ -5,6 +5,7 @@
 upstream/pythoncomplete-autoload-init.patch
 upstream/debian-runtime-spell.patch
 upstream/netrw-syntax-fix.patch
+upstream/remove-py_config.patch
 debian/vim-tiny.patch
 debian/disabled-modelines.patch
 debian/extra-tex-detection.patch
diff -Nru vim-7.3.547/debian/patches/upstream/remove-py_config.patch vim-7.3.547/debian/patches/upstream/remove-py_config.patch
--- vim-7.3.547/debian/patches/upstream/remove-py_config.patch	1969-12-31 19:00:00.000000000 -0500
+++ vim-7.3.547/debian/patches/upstream/remove-py_config.patch	2012-07-18 21:02:18.000000000 -0400
@@ -0,0 +1,80 @@
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -2556,19 +2556,11 @@
+ objects/if_perlsfio.o: if_perlsfio.c
+ 	$(CCC) $(PERL_CFLAGS) -o $@ if_perlsfio.c
+ 
+-objects/py_config.o: $(PYTHON_CONFDIR)/config.c
+-	$(CCC) $(PYTHON_CFLAGS) -o $@ $(PYTHON_CONFDIR)/config.c \
+-		-I$(PYTHON_CONFDIR) -DHAVE_CONFIG_H -DNO_MAIN
+-
+ objects/py_getpath.o: $(PYTHON_CONFDIR)/getpath.c
+ 	$(CCC) $(PYTHON_CFLAGS) -o $@ $(PYTHON_CONFDIR)/getpath.c \
+ 		-I$(PYTHON_CONFDIR) -DHAVE_CONFIG_H -DNO_MAIN \
+ 		$(PYTHON_GETPATH_CFLAGS)
+ 
+-objects/py3_config.o: $(PYTHON3_CONFDIR)/config.c
+-	$(CCC) $(PYTHON3_CFLAGS) -o $@ $(PYTHON3_CONFDIR)/config.c \
+-		-I$(PYTHON3_CONFDIR) -DHAVE_CONFIG_H -DNO_MAIN
+-
+ objects/if_python.o: if_python.c if_py_both.h
+ 	$(CCC) $(PYTHON_CFLAGS) $(PYTHON_CFLAGS_EXTRA) -o $@ if_python.c
+ 
+--- a/src/auto/configure
++++ b/src/auto/configure
+@@ -5354,11 +5354,7 @@
+ 	  PYTHON_CFLAGS="-I${vi_cv_path_python_pfx}/include/python${vi_cv_var_python_version} -I${vi_cv_path_python_epfx}/include/python${vi_cv_var_python_version} -DPYTHON_HOME=\\\"${vi_cv_path_python_pfx}\\\""
+ 	fi
+ 	PYTHON_SRC="if_python.c"
+-		if test "x$MACOSX" = "xyes"; then
+-	  PYTHON_OBJ="objects/if_python.o"
+-	else
+-	  PYTHON_OBJ="objects/if_python.o objects/py_config.o"
+-	fi
++	PYTHON_OBJ="objects/if_python.o"
+ 	if test "${vi_cv_var_python_version}" = "1.4"; then
+ 	   PYTHON_OBJ="$PYTHON_OBJ objects/py_getpath.o"
+ 	fi
+@@ -5653,11 +5649,7 @@
+         PYTHON3_CFLAGS="-I${vi_cv_path_python3_pfx}/include/python${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags} -I${vi_cv_path_python3_epfx}/include/python${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags} -DPYTHON3_HOME=L\\\"${vi_cv_path_python3_pfx}\\\""
+       fi
+       PYTHON3_SRC="if_python3.c"
+-            if test "x$MACOSX" = "xyes"; then
+-        PYTHON3_OBJ="objects/if_python3.o"
+-      else
+-        PYTHON3_OBJ="objects/if_python3.o objects/py3_config.o"
+-      fi
++      PYTHON3_OBJ="objects/if_python3.o"
+ 
+                                                 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if -pthread should be used" >&5
+ $as_echo_n "checking if -pthread should be used... " >&6; }
+--- a/src/configure.in
++++ b/src/configure.in
+@@ -913,12 +913,7 @@
+ 	  PYTHON_CFLAGS="-I${vi_cv_path_python_pfx}/include/python${vi_cv_var_python_version} -I${vi_cv_path_python_epfx}/include/python${vi_cv_var_python_version} -DPYTHON_HOME=\\\"${vi_cv_path_python_pfx}\\\""
+ 	fi
+ 	PYTHON_SRC="if_python.c"
+-	dnl For Mac OSX 10.2 config.o is included in the Python library.
+-	if test "x$MACOSX" = "xyes"; then
+-	  PYTHON_OBJ="objects/if_python.o"
+-	else
+-	  PYTHON_OBJ="objects/if_python.o objects/py_config.o"
+-	fi
++	PYTHON_OBJ="objects/if_python.o"
+ 	if test "${vi_cv_var_python_version}" = "1.4"; then
+ 	   PYTHON_OBJ="$PYTHON_OBJ objects/py_getpath.o"
+ 	fi
+@@ -1103,12 +1098,7 @@
+         PYTHON3_CFLAGS="-I${vi_cv_path_python3_pfx}/include/python${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags} -I${vi_cv_path_python3_epfx}/include/python${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags} -DPYTHON3_HOME=L\\\"${vi_cv_path_python3_pfx}\\\""
+       fi
+       PYTHON3_SRC="if_python3.c"
+-      dnl For Mac OSX 10.2 config.o is included in the Python library.
+-      if test "x$MACOSX" = "xyes"; then
+-        PYTHON3_OBJ="objects/if_python3.o"
+-      else
+-        PYTHON3_OBJ="objects/if_python3.o objects/py3_config.o"
+-      fi
++      PYTHON3_OBJ="objects/if_python3.o"
+ 
+       dnl On FreeBSD linking with "-pthread" is required to use threads.
+       dnl _THREAD_SAFE must be used for compiling then.

-- 
James
GPG Key: 4096R/331BA3DB 2011-12-05 James McCoy <jamessan@debian.org>

Attachment: signature.asc
Description: Digital signature


--- End Message ---
--- Begin Message --- 
On Tue, Jul 24, 2012 at 07:01:47 -0400, James McCoy wrote:

> Done and uploaded as 2:7.3.547-4 with the below diff.  Please consider
> unblocking.
> 
> unblock vim/2:7.3.547-4
> 
Done.  That means python2.7(-minimal?) gets to add Breaks on some vim-*
packages << 2:7.3.547-4~ I guess.

Cheers,
Julien

Attachment: signature.asc
Description: Digital signature


--- End Message ---
Reply to: