tags 445379 + patch thank you
Hi, It appears that this might have been a false positive? The linking to libpython in SConstruct was already commented out. Either way, here is a patch that is more intrusive to that regard as well as should handle the transition to python2.5 more effectively. It does need some more thorough testing though since I don't have the equipment to test it properly. Thanks and hope it helps! Barry deFreese
diff -u jppy-0.0.43/debian/rules jppy-0.0.43/debian/rules --- jppy-0.0.43/debian/rules +++ jppy-0.0.43/debian/rules @@ -6,6 +6,7 @@ # This has to be exported to make some magic below work. export DH_OPTIONS +PYVER_DEFAULT=$(shell pyversions -vd) PYVERS=$(shell pyversions -vr) FINDLIBNAME := debian/find-python-library-name.sh @@ -19,10 +20,10 @@ build: build-stamp -mkdir $(CURDIR)/debian/jppy -mkdir $(CURDIR)/debian/jppy-jpilot-plugins - scons $(SCONS_ARGS) python_includes=/usr/include/python2.4 \ - mx_datetime_includes=/usr/include/python2.4 \ - python_module_prefix=/usr/lib/python2.4/site-packages/jppy \ - python_version=$(shell sh $(FINDLIBNAME) python2.4.so) ./jpilot_plugins + scons $(SCONS_ARGS) python_includes=/usr/include/python$(PYVER_DEFAULT) \ + mx_datetime_includes=/usr/include/python$(PYVER_DEFAULT) \ + python_module_prefix=/usr/lib/python$(PYVER_DEFAULT)/site-packages/jppy \ + python_version=$(shell sh $(FINDLIBNAME) python$(PYVER_DEFAULT).so) ./jpilot_plugins touch $@ build-stamp: $(PYVERS:%=build-python%) @@ -49,10 +50,10 @@ dh_clean install: build install-prereq $(PYVERS:%=install-python%) - scons $(SCONS_ARGS) python_includes=/usr/include/python2.4 \ - mx_datetime_includes=/usr/include/python2.4 \ - python_module_prefix=/usr/lib/python2.4/site-packages/jppy \ - python_version=$(shell sh $(FINDLIBNAME) python2.4.so) \ + scons $(SCONS_ARGS) python_includes=/usr/include/python$(PYVER_DEFAULT) \ + mx_datetime_includes=/usr/include/python$(PYVER_DEFAULT) \ + python_module_prefix=/usr/lib/python$(PYVER_DEFAULT)/site-packages/jppy \ + python_version=$(shell sh $(FINDLIBNAME) python$(PYVER_DEFAULT).so) \ $(CURDIR)/debian/jppy-jpilot-plugins $(CURDIR)/debian/jppy # scons sucks diff -u jppy-0.0.43/debian/changelog jppy-0.0.43/debian/changelog --- jppy-0.0.43/debian/changelog +++ jppy-0.0.43/debian/changelog @@ -1,3 +1,9 @@ +jppy (0.0.43-1.1) unstable; urgency=low + + * Test build + + -- Barry deFreese <[EMAIL PROTECTED]> Thu, 06 Mar 2008 21:43:23 -0500 + jppy (0.0.43-1) unstable; urgency=low * New upstream release. diff -u jppy-0.0.43/debian/control jppy-0.0.43/debian/control --- jppy-0.0.43/debian/control +++ jppy-0.0.43/debian/control @@ -6,7 +6,7 @@ Standards-Version: 3.7.2 XS-Vcs-Svn: http://cvs.zanu.org.uk/svn/jppy/debian/trunk Build-Depends: debhelper (>= 5.0.37.1), scons, swig, libgtk2.0-dev, python-gtk2-dev, bison, libpisock-dev ( >= 0.12.2-1), python-egenix-mx-base-dev, python-egenix-mxdatetime, python-dev, python-glade2, python-gnome2, python-all-dev (>= 2.3.5-11), python-central (>= 0.5), python-dateutil -XS-Python-Version: current +XS-Python-Version: all Package: python-jppy Section: python only in patch2: unchanged: --- jppy-0.0.43.orig/SConstruct +++ jppy-0.0.43/SConstruct @@ -18,7 +18,6 @@ opts = Options('SCustomize') -opts.Add(('python_version','Python library version to use','libpython2.4.so')) opts.Add(PathOption('python_module_prefix','Prefix to install python module and extension to', os.path.join(distutils.sysconfig.get_python_lib(),'jppy'),PathOption.PathAccept)) opts.Add(PathOption('prefix','Prefix to install /bin/<scripts> to', @@ -43,8 +42,6 @@ CCFLAGS=['-g', '-DPYTHON_SHARED_LIB=\\"${python_version}\\"'], LINKFLAGS=['-L$pisock_library'], -# distutils.sysconfig.get_config_var('LINKFORSHARED')], -# '-lpython%s' % sys.version[0:3]], CPPPATH=['${mx_datetime_includes}', '${pisock_includes}', '${python_includes}', @@ -108,11 +105,6 @@ print "You need libpisock to compile this program" Exit(1) -if not config.CheckLibWithHeader('libpython%s' % sys.version[0:3], - 'Python.h','C','PyErr_Clear();'): - print "You need libpython%s.so to compile this program" % sys.version[0:3] - Exit(1) - env.ParseConfig('pkg-config --cflags --libs gtk+-2.0') env.ParseConfig('pkg-config --cflags --libs glib-2.0') env.ParseConfig('pkg-config --cflags --libs pygtk-2.0')
