diff -Nru gnome-python-2.28.1/bonobo/wscript gnome-python-2.28.1+dfsg/bonobo/wscript --- gnome-python-2.28.1/bonobo/wscript 2009-05-04 10:24:35.000000000 +0000 +++ gnome-python-2.28.1+dfsg/bonobo/wscript 1970-01-01 00:00:00.000000000 +0000 @@ -1,80 +0,0 @@ -# -*- python -*- -# encoding: utf-8 - -import os - -def configure(conf): - conf.env.append_value('MODULES_AVAILABLE', 'bonobo') - conf.env.append_value('MODULES_AVAILABLE', 'bonobo.ui') - - if 'bonobo' in conf.env['ENABLE_MODULES'] or 'all' in conf.env['ENABLE_MODULES']: - if conf.pkg_check_modules('BONOBO', - 'libbonobo-2.0 >= 2.8.0 pygobject-2.0 pyorbit-2 >= 2.0.1', - mandatory=False): - conf.env.append_value('MODULES_TO_BUILD', 'bonobo') - - if 'bonobo.ui' in conf.env['ENABLE_MODULES'] or 'all' in conf.env['ENABLE_MODULES']: - if conf.pkg_check_modules('BONOBOUI', - 'libbonoboui-2.0 >= 2.8.0 pygobject-2.0 pyorbit-2 >= 2.0.1', - mandatory=False): - conf.env.append_value('MODULES_TO_BUILD', 'bonobo.ui') - - -def build(bld): - env = bld.env - - if 'bonobo' in bld.env['MODULES_TO_BUILD']: - py = bld.new_task_gen('py') - py.install_path = '${PYTHONDIR}/gtk-2.0/bonobo' - py.source = "__init__.py" - - bld.codegen('bonobo', local_load_types=['bonobo-arg-types.py'], - local_register=['../gnome/gnome-types.defs', - '../gnomecanvas/canvas.defs', - 'bonobo-types.defs'], - register=[os.path.join(env['PYGTK_DEFSDIR'], 'pango-types.defs'), - os.path.join(env['PYGTK_DEFSDIR'], 'gdk-types.defs'), - os.path.join(env['PYGTK_DEFSDIR'], 'gtk-types.defs')]) - - pyext = bld.create_pyext() - pyext.source = 'bonobomodule.c bonobo.c bonobo-arg.c pybonobo.c' - pyext.target = '_bonobo' - pyext.uselib = 'BONOBO' - pyext.includes = '.' - pyext.install_path = '${PYTHONDIR}/gtk-2.0/bonobo' - - defsdir = bld.install_files('${DATADIR}/pygtk/2.0/defs', - ['bonobo.defs', - 'bonobo-types.defs', - ]) - - pyext = bld.create_pyext() - pyext.source = 'activationmodule.c' - pyext.target = 'activation' - pyext.uselib = 'BONOBO' - pyext.includes = '.' - pyext.install_path = '${PYTHONDIR}/gtk-2.0/bonobo' - - - if 'bonobo.ui' in bld.env['MODULES_TO_BUILD']: - bld.codegen('bonoboui', local_load_types=['bonobo-arg-types.py'], - local_register=['../gnome/gnome-types.defs', - '../gnomecanvas/canvas.defs', - 'bonobo-types.defs'], - register=[os.path.join(env['PYGTK_DEFSDIR'], 'pango-types.defs'), - os.path.join(env['PYGTK_DEFSDIR'], 'gdk-types.defs'), - os.path.join(env['PYGTK_DEFSDIR'], 'gtk-types.defs')]) - - pyext = bld.create_pyext() - pyext.source = 'bonobouimodule.c bonoboui.c' - pyext.target = 'ui' - pyext.uselib = 'BONOBOUI' - pyext.includes = '.' - pyext.install_path = '${PYTHONDIR}/gtk-2.0/bonobo' - - defsdir = bld.install_files('${DATADIR}/pygtk/2.0/defs', - ['bonoboui.defs', - 'bonoboui-types.defs', - ]) - - bld.install_files('${DATADIR}/pygtk/2.0/argtypes', 'bonobo-arg-types.py') diff -Nru gnome-python-2.28.1/debian/changelog gnome-python-2.28.1+dfsg/debian/changelog --- gnome-python-2.28.1/debian/changelog 2011-12-31 02:03:25.000000000 +0000 +++ gnome-python-2.28.1+dfsg/debian/changelog 2012-02-06 14:06:38.000000000 +0000 @@ -1,8 +1,16 @@ -gnome-python (2.28.1-3build1) precise; urgency=low +gnome-python (2.28.1+dfsg-1) unstable; urgency=low - * Rebuild to drop python2.6 dependencies. + [ Josselin Mouette ] + * Replace python-gobject by python-gobject-2. + * Update repository URL. + + [ Michael Biebl ] + * Repack upstream tarball and drop the waf build system. Closes: #654470 + * Update watch file to mangle the version for the +dfsg suffix. + * Update Vcs-* URLs. + * Don't use brace expansion in .install files. - -- Matthias Klose Sat, 31 Dec 2011 02:03:25 +0000 + -- Michael Biebl Mon, 06 Feb 2012 14:52:26 +0100 gnome-python (2.28.1-3) unstable; urgency=low diff -Nru gnome-python-2.28.1/debian/control gnome-python-2.28.1+dfsg/debian/control --- gnome-python-2.28.1/debian/control 2011-06-08 15:06:38.000000000 +0000 +++ gnome-python-2.28.1+dfsg/debian/control 2012-02-06 14:07:49.000000000 +0000 @@ -7,11 +7,11 @@ Section: python Priority: optional Maintainer: Sebastien Bacher -Uploaders: Debian GNOME Maintainers , Josselin Mouette , Laurent Bigonville , Luca Falavigna +Uploaders: Debian GNOME Maintainers , Josselin Mouette , Laurent Bigonville , Michael Biebl Build-Depends: debhelper (>= 8), gnome-pkg-tools (>= 0.10), python-all-dev (>= 2.6.6-3~), - python-gobject-dev (>= 2.17.0), + python-gobject-2-dev (>= 2.17.0), python-gtk2-dev (>= 2.10.3), python-pyorbit-dev (>= 2.0.1-4), libglib2.0-dev (>= 2.6.0), @@ -27,8 +27,8 @@ Standards-Version: 3.9.2 X-Python-Version: >= 2.5 Homepage: http://www.pygtk.org/ -Vcs-Browser: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-python/?op=log -Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/unstable/gnome-python/ +Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/attic/gnome-python/ +Vcs-Svn: svn://anonscm.debian.org/svn/pkg-gnome/attic/gnome-python/ Package: python-gnome2 Architecture: any @@ -38,7 +38,7 @@ python-gconf (= ${binary:Version}), python-gtk2 (>= 2.10.3), python-pyorbit (>= 2.0.1-4), - python-gobject (>= 2.17.0) + python-gobject-2 (>= 2.17.0) Conflicts: python-gnomecanvas Replaces: python-gnomecanvas Suggests: python-gnome2-doc @@ -52,7 +52,7 @@ Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}, - python-gobject (>= 2.17.0) + python-gobject-2 (>= 2.17.0) Suggests: python-gnome2-doc Breaks: python-gnome2 (<< 2.22.3-3) Replaces: python-gnome2 (<< 2.22.3-3) @@ -65,7 +65,7 @@ Depends: ${python:Depends}, ${misc:Depends}, python-gnome2 (>= ${source:Version}), - python-gobject-dev (>= 2.17.0), + python-gobject-2-dev (>= 2.17.0), python-gtk2-dev (>= 2.10.3), python-pyorbit-dev (>= 2.0.1-4) Recommends: python-gnome2-doc diff -Nru gnome-python-2.28.1/debian/control.in gnome-python-2.28.1+dfsg/debian/control.in --- gnome-python-2.28.1/debian/control.in 2011-05-29 15:21:54.000000000 +0000 +++ gnome-python-2.28.1+dfsg/debian/control.in 2012-02-06 13:56:44.000000000 +0000 @@ -6,7 +6,7 @@ Build-Depends: debhelper (>= 8), gnome-pkg-tools (>= 0.10), python-all-dev (>= 2.6.6-3~), - python-gobject-dev (>= 2.17.0), + python-gobject-2-dev (>= 2.17.0), python-gtk2-dev (>= 2.10.3), python-pyorbit-dev (>= 2.0.1-4), libglib2.0-dev (>= 2.6.0), @@ -22,8 +22,8 @@ Standards-Version: 3.9.2 X-Python-Version: >= 2.5 Homepage: http://www.pygtk.org/ -Vcs-Browser: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-python/?op=log -Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/unstable/gnome-python/ +Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/attic/gnome-python/ +Vcs-Svn: svn://anonscm.debian.org/svn/pkg-gnome/attic/gnome-python/ Package: python-gnome2 Architecture: any @@ -33,7 +33,7 @@ python-gconf (= ${binary:Version}), python-gtk2 (>= 2.10.3), python-pyorbit (>= 2.0.1-4), - python-gobject (>= 2.17.0) + python-gobject-2 (>= 2.17.0) Conflicts: python-gnomecanvas Replaces: python-gnomecanvas Suggests: python-gnome2-doc @@ -47,7 +47,7 @@ Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}, - python-gobject (>= 2.17.0) + python-gobject-2 (>= 2.17.0) Suggests: python-gnome2-doc Breaks: python-gnome2 (<< 2.22.3-3) Replaces: python-gnome2 (<< 2.22.3-3) @@ -60,7 +60,7 @@ Depends: ${python:Depends}, ${misc:Depends}, python-gnome2 (>= ${source:Version}), - python-gobject-dev (>= 2.17.0), + python-gobject-2-dev (>= 2.17.0), python-gtk2-dev (>= 2.10.3), python-pyorbit-dev (>= 2.0.1-4) Recommends: python-gnome2-doc diff -Nru gnome-python-2.28.1/debian/python-gnome2.install gnome-python-2.28.1+dfsg/debian/python-gnome2.install --- gnome-python-2.28.1/debian/python-gnome2.install 2011-04-19 23:20:23.000000000 +0000 +++ gnome-python-2.28.1+dfsg/debian/python-gnome2.install 2012-02-06 13:50:27.000000000 +0000 @@ -1,4 +1,5 @@ usr/lib/gnome-vfs-2.0/modules/*.so usr/lib/python*/*-packages/gtk-2.0/gnomecanvas.so -usr/lib/python*/*-packages/gtk-2.0/*/*.{py,so} +usr/lib/python*/*-packages/gtk-2.0/*/*.py +usr/lib/python*/*-packages/gtk-2.0/*/*.so ../python-gnome2.rtupdate /usr/share/python/runtime.d/ diff -Nru gnome-python-2.28.1/debian/watch gnome-python-2.28.1+dfsg/debian/watch --- gnome-python-2.28.1/debian/watch 2011-05-31 06:31:32.000000000 +0000 +++ gnome-python-2.28.1+dfsg/debian/watch 2012-02-06 13:49:00.000000000 +0000 @@ -1,3 +1,4 @@ version=3 +opts="dversionmangle=s/\+dfsg//" \ http://ftp.gnome.org/pub/GNOME/sources/gnome-python/([\d\.]+[02468])/ \ - gnome-python-(.*)\.tar\.bz2 debian uupdate + gnome-python-(.*)\.tar\.bz2 diff -Nru gnome-python-2.28.1/docs/gnomevfs/wscript gnome-python-2.28.1+dfsg/docs/gnomevfs/wscript --- gnome-python-2.28.1/docs/gnomevfs/wscript 2009-12-14 19:10:26.000000000 +0000 +++ gnome-python-2.28.1+dfsg/docs/gnomevfs/wscript 1970-01-01 00:00:00.000000000 +0000 @@ -1,40 +0,0 @@ -# -*- python -*- -import os -import glob - -def configure(conf): - conf.find_program('xsltproc', var='XSLTPROC') - -def build(bld): - env = bld.env - reference_doc_name = 'pygnomevfs' - - d = bld.path.find_dir('html').abspath() - if env['XSLTPROC'] and not os.path.exists(os.path.join(d, 'index.html')): - doc_module = 'pygnomevfs' - html_dir = os.path.join(bld.env['DATADIR'], 'gtk-doc', 'html') - target_dir = os.path.join('html_dir', reference_doc_name) - - reference_main_file = 'gnomevfs-classes.xml' - - cmd = bld.new_task_gen('command', - target='html/index.html', - source='../ref-html-style.xsl gnomevfs-classes.xml', - command=( - '${XSLTPROC} --nonet --xinclude -o ${TGT[0].parent}/' - ' --stringparam gtkdoc.bookname pygnomevfs' - ' --stringparam gtkdoc.version ${VERSION}' - ' --stringparam chunker.output.encoding UTF-8' - ' ${SRC[0]} ${SRC[1]}')) - - #cmd = bld.new_task_gen('command', - # target='html/gnomevfs-class-reference.html', - # source='html/index.html', - # command='gtkdoc-fixxref --module-dir=${TGT[0].parent} --html-dir=${HTMLDIR}', - # variables=dict(HTMLDIR=html_dir)) - - # install html files from either the build dir or the source dir, whichever is found - html_files = glob.glob(os.path.join(bld.path.find_dir('html').abspath(env), '*')) - html_files += glob.glob(os.path.join(bld.path.find_dir('html').abspath(), '*')) - bld.install_files('${DATADIR}/gtk-doc/html/%s' % reference_doc_name, - html_files) diff -Nru gnome-python-2.28.1/gconf/wscript gnome-python-2.28.1+dfsg/gconf/wscript --- gnome-python-2.28.1/gconf/wscript 2009-05-04 10:24:35.000000000 +0000 +++ gnome-python-2.28.1+dfsg/gconf/wscript 1970-01-01 00:00:00.000000000 +0000 @@ -1,29 +0,0 @@ -# -*- python -*- -# encoding: utf-8 - -import os - -def configure(conf): - conf.env.append_value('MODULES_AVAILABLE', 'gconf') - if 'gconf' in conf.env['ENABLE_MODULES'] or 'all' in conf.env['ENABLE_MODULES']: - if conf.pkg_check_modules('GCONF', 'gconf-2.0 >= 2.12 pygobject-2.0', - mandatory=False): - conf.env.append_value('MODULES_TO_BUILD', 'gconf') - - -def build(bld): - - if 'gconf' in bld.env['MODULES_TO_BUILD']: - bld.codegen('gconf', local_load_types=['gconf-arg-types.py']) - pyext = bld.create_pyext() - pyext.source = 'gconfmodule.c gconf.c gconf-fixes.c gconf-types.c' - pyext.target = 'gconf' - pyext.uselib = 'GCONF' - pyext.includes = '.' - pyext.install_path = '${PYTHONDIR}/gtk-2.0' - - bld.install_files('${DATADIR}/pygtk/2.0/defs', - ['gconf.defs']) - - bld.install_files('${DATADIR}/pygtk/2.0/argtypes', - 'gconf-arg-types.py') diff -Nru gnome-python-2.28.1/gnome/wscript gnome-python-2.28.1+dfsg/gnome/wscript --- gnome-python-2.28.1/gnome/wscript 2009-05-04 10:24:36.000000000 +0000 +++ gnome-python-2.28.1+dfsg/gnome/wscript 1970-01-01 00:00:00.000000000 +0000 @@ -1,68 +0,0 @@ -# -*- python -*- -# encoding: utf-8 - -import os - -def configure(conf): - conf.env.append_value('MODULES_AVAILABLE', 'gnome') - conf.env.append_value('MODULES_AVAILABLE', 'gnome.ui') - - if 'gnome' in conf.env['ENABLE_MODULES'] or 'all' in conf.env['ENABLE_MODULES']: - if conf.pkg_check_modules('GNOME', - 'libgnome-2.0 >= 2.8.0 pygobject-2.0', - mandatory=False): - conf.env.append_value('MODULES_TO_BUILD', 'gnome') - - if 'gnome.ui' in conf.env['ENABLE_MODULES'] or 'all' in conf.env['ENABLE_MODULES']: - if conf.pkg_check_modules('GNOMEUI', - 'libgnomeui-2.0 >= 2.8.0 pygobject-2.0', - mandatory=False): - conf.env.append_value('MODULES_TO_BUILD', 'gnome.ui') - -def build(bld): - env = bld.env - - if 'gnome' in bld.env['MODULES_TO_BUILD']: - py = bld.new_task_gen('py') - py.install_path = '${PYTHONDIR}/gtk-2.0/gnome' - py.source = "__init__.py canvas.py vfs.py" - - bld.codegen('gnome', local_load_types=['../bonobo/bonobo-arg-types.py'], - local_register=['gnome-types.defs', - '../gnomecanvas/canvas.defs', - '../bonobo/bonobo-types.defs'], - register=[os.path.join(env['PYGTK_DEFSDIR'], 'pango-types.defs'), - os.path.join(env['PYGTK_DEFSDIR'], 'gdk-types.defs'), - os.path.join(env['PYGTK_DEFSDIR'], 'gtk-types.defs')], - prefix='pygnome') - - pyext = bld.create_pyext() - pyext.source = 'gnomemodule.c gnome.c' - pyext.target = '_gnome' - pyext.uselib = 'GNOME' - pyext.install_path = '${PYTHONDIR}/gtk-2.0/gnome' - - bld.install_files('${DATADIR}/pygtk/2.0/defs', - ['gnome.defs', - 'gnome-types.defs', - ]) - - - if 'gnome.ui' in bld.env['MODULES_TO_BUILD']: - bld.codegen('ui', local_load_types=['../bonobo/bonobo-arg-types.py'], - local_register=['gnome-types.defs', - '../gnomecanvas/canvas.defs', - '../bonobo/bonobo-types.defs'], - register=[os.path.join(env['PYGTK_DEFSDIR'], 'pango-types.defs'), - os.path.join(env['PYGTK_DEFSDIR'], 'gdk-types.defs'), - os.path.join(env['PYGTK_DEFSDIR'], 'gtk-types.defs')], - prefix='pyui') - - pyext = bld.create_pyext() - pyext.source = 'uimodule.c ui.c' - pyext.target = 'ui' - pyext.uselib = 'GNOMEUI' - pyext.includes = '. ../gnomevfs' - pyext.install_path = '${PYTHONDIR}/gtk-2.0/gnome' - - bld.install_files('${DATADIR}/pygtk/2.0/defs', 'ui.defs') diff -Nru gnome-python-2.28.1/gnomecanvas/wscript gnome-python-2.28.1+dfsg/gnomecanvas/wscript --- gnome-python-2.28.1/gnomecanvas/wscript 2009-05-04 10:24:36.000000000 +0000 +++ gnome-python-2.28.1+dfsg/gnomecanvas/wscript 1970-01-01 00:00:00.000000000 +0000 @@ -1,34 +0,0 @@ -# -*- python -*- -# encoding: utf-8 - -import os - -def configure(conf): - conf.env.append_value('MODULES_AVAILABLE', 'gnomecanvas') - - if 'gnomecanvas' in conf.env['ENABLE_MODULES'] or 'all' in conf.env['ENABLE_MODULES']: - if conf.pkg_check_modules('GNOMECANVAS', 'libgnomecanvas-2.0 >= 2.8.0 pygobject-2.0 ', - mandatory=False): - conf.env.append_value('MODULES_TO_BUILD', 'gnomecanvas') - - -def build(bld): - env = bld.env - if 'gnomecanvas' in env['MODULES_TO_BUILD']: - bld.codegen('canvas', local_load_types=['../bonobo/bonobo-arg-types.py'], - local_register=['../gnome/gnome-types.defs', - 'canvas.defs', - '../bonobo/bonobo-types.defs'], - register=[os.path.join(env['PYGTK_DEFSDIR'], 'pango-types.defs'), - os.path.join(env['PYGTK_DEFSDIR'], 'gdk-types.defs'), - os.path.join(env['PYGTK_DEFSDIR'], 'gtk-types.defs')]) - - pyext = bld.create_pyext() - pyext.source = 'canvasmodule.c canvas.c' - pyext.target = 'gnomecanvas' - pyext.uselib = 'GNOMECANVAS' - pyext.install_path = '${PYTHONDIR}/gtk-2.0' - - bld.install_files('${DATADIR}/pygtk/2.0/defs', - ['canvas.defs']) - diff -Nru gnome-python-2.28.1/gnomevfs/wscript gnome-python-2.28.1+dfsg/gnomevfs/wscript --- gnome-python-2.28.1/gnomevfs/wscript 2009-05-04 10:24:36.000000000 +0000 +++ gnome-python-2.28.1+dfsg/gnomevfs/wscript 1970-01-01 00:00:00.000000000 +0000 @@ -1,69 +0,0 @@ -# -*- python -*- -# encoding: utf-8 - -import os - -def configure(conf): - conf.env.append_value('MODULES_AVAILABLE', 'gnomevfs') - conf.env.append_value('MODULES_AVAILABLE', 'gnomevfs.bonobo') - conf.env.append_value('MODULES_AVAILABLE', 'gnomevfs.module') - - if 'gnomevfs' in conf.env['ENABLE_MODULES'] or 'all' in conf.env['ENABLE_MODULES']: - if conf.pkg_check_modules('GNOMEVFS', 'gnome-vfs-2.0 >= 2.14 pygobject-2.0', - mandatory=False): - conf.env.append_value('MODULES_TO_BUILD', 'gnomevfs') - - if 'gnomevfs.bonobo' in conf.env['ENABLE_MODULES'] or 'all' in conf.env['ENABLE_MODULES']: - if conf.pkg_check_modules('GNOMEVFSBONOBO', 'gnome-vfs-2.0 >= 2.14 bonobo-activation-2.0 >= 2.8.0' - ' pyorbit-2 >= 2.0.1 pygobject-2.0', - mandatory=False): - conf.env.append_value('MODULES_TO_BUILD', 'gnomevfs.bonobo') - - if 'gnomevfs.module' in conf.env['ENABLE_MODULES'] or 'all' in conf.env['ENABLE_MODULES']: - if conf.pkg_check_modules('GNOMEVFSMODULE', 'gnome-vfs-module-2.0 >= 2.14 bonobo-activation-2.0 >= 2.8.0' - ' pyorbit-2 >= 2.0.1 pygobject-2.0', - mandatory=False): - conf.env.append_value('MODULES_TO_BUILD', 'gnomevfs.module') - - -def build(bld): - - if 'gnomevfs' in bld.env['MODULES_TO_BUILD']: - vfsdir = '${PYTHONDIR}/gtk-2.0/gnomevfs' - py = bld.new_task_gen('py') - py.install_path = vfsdir - py.source = "__init__.py" - - pyext = bld.create_pyext() - pyext.source = ''' -vfsmodule.c vfs-uri.c vfs-file-info.c vfs-dir-handle.c -vfs-handle.c vfs-xfer-progress-info.c vfs-context.c -vfs-async-handle.c vfs-volume.c vfs-drive.c vfs-volume-monitor.c -''' - pyext.target = '_gnomevfs' - pyext.uselib = 'GNOMEVFS' - pyext.includes = '.' - pyext.install_path = vfsdir - - if 'gnomevfs.bonobo' in bld.env['MODULES_TO_BUILD']: - pyext = bld.create_pyext() - pyext.source = 'vfsbonobomodule.c' - pyext.target = 'gnomevfsbonobo' - pyext.uselib = 'GNOMEVFSBONOBO' - pyext.includes = '.' - pyext.install_path = vfsdir - - if 'gnomevfs.module' in bld.env['MODULES_TO_BUILD']: - pyembed = bld.new_task_gen('cc', 'shlib', 'pyembed') - pyembed.mac_bundle = True - pyembed.source = 'gnome-vfs-python-method.c' - pyembed.target = 'pythonmethod' - pyembed.uselib = 'GNOMEVFSMODULE' - pyembed.includes = '.' - pyembed.install_path = '${LIBDIR}/gnome-vfs-2.0/modules' - - vfsmethoddir = os.path.join(pyembed.env['LIBDIR'], 'gnome-vfs-2.0', 'modules') - pyembed.env.append_value('CCDEFINES', 'GNOME_VFS_PYTHON_DIR="\\"%s\\""' % vfsmethoddir) - - bld.install_files('${PREFIX}/include/gnome-python-2.0', - ['pygnomevfs.h', 'pygnomevfsbonobo.h']) Binary files /tmp/zbQiaRldLz/gnome-python-2.28.1/waf and /tmp/xZk1WDRo89/gnome-python-2.28.1+dfsg/waf differ diff -Nru gnome-python-2.28.1/wscript gnome-python-2.28.1+dfsg/wscript --- gnome-python-2.28.1/wscript 2010-03-30 23:32:25.000000000 +0000 +++ gnome-python-2.28.1+dfsg/wscript 1970-01-01 00:00:00.000000000 +0000 @@ -1,222 +0,0 @@ -# -*- python -*- - -import Options - -import Configure -Configure.autoconfig = True - -import ccroot -ccroot.USE_TOP_LEVEL = True - -import Task -Task.file_deps = Task.extract_deps - -import Build - -VERSION = '2.28.1' -APPNAME = 'gnome-python' -srcdir = '.' -blddir = 'build' - -import misc -import os -import shutil -import glob -import sys -import types - -def dist_hook(): - for html_file in glob.glob(os.path.join('..', 'build', 'default', 'docs', 'gnomevfs', 'html', '*')): - shutil.copy2(html_file, os.path.join('docs', 'gnomevfs', 'html')) - ## Copy WAF to the distdir - assert os.path.basename(sys.argv[0]) == 'waf' - shutil.copy(os.path.join('..', sys.argv[0]), '.') - - subprocess.Popen([os.path.join(srcdir, "generate-ChangeLog")], shell=True).wait() - try: - os.chmod(os.path.join(srcdir, "ChangeLog"), 0644) - except OSError: - pass - shutil.copy(os.path.join(srcdir, "ChangeLog"), '.') - - -def set_options(opt): - opt.tool_options('compiler_cc') - opt.tool_options('gnome') - opt.tool_options('gnu_dirs') - opt.tool_options('cflags') - - opt.add_option('--enable-modules', - help=('Enable only the specified modules.'), - type="string", default='all', metavar="MODULES_LIST (comma separated)", - dest='enable_modules') - - -def configure(conf): - conf.check_tool('misc') - conf.check_tool('compiler_cc') - conf.check_tool('gnome') - conf.check_tool('python') - conf.check_tool('command') - conf.check_tool('pkgconfig') - conf.check_tool('gnu_dirs') - conf.check_tool('cflags') - - if sys.platform == 'darwin': - conf.check_tool('osx') - - conf.check_python_version((2,4)) - conf.check_python_headers() - conf.define('VERSION', VERSION) - - version = [int(s) for s in VERSION.split('.')] - conf.define('GNOME_PYTHON_MAJOR_VERSION', version[0]) - conf.define('GNOME_PYTHON_MINOR_VERSION', version[1]) - conf.define('GNOME_PYTHON_MICRO_VERSION', version[2]) - - # Define pygtk required version, for runtime check - pygtk_version = [2, 10, 3] - conf.define('PYGTK_REQUIRED_MAJOR_VERSION', pygtk_version[0]) - conf.define('PYGTK_REQUIRED_MINOR_VERSION', pygtk_version[1]) - conf.define('PYGTK_REQUIRED_MICRO_VERSION', pygtk_version[2]) - - conf.pkg_check_modules('PYGTK', 'pygtk-2.0 >= %s' % ('.'.join([str(x) for x in pygtk_version]),)) - conf.env['PYGTK_DEFSDIR'] = conf.pkg_check_module_variable('pygtk-2.0', 'defsdir') - - conf.pkg_check_modules('PYGOBJECT', 'pygobject-2.0 >= 2.17.0', mandatory=True) - - if not conf.find_program('pygobject-codegen-2.0', var='CODEGEN'): - if not conf.find_program('pygtk-codegen-2.0', var='CODEGEN'): - Params.fatal("Could not find pygobject/pygtk codegen") - - conf.env.append_value('CCDEFINES', 'HAVE_CONFIG_H') - - conf.env['ENABLE_MODULES'] = Options.options.enable_modules.split(',') - - conf.sub_config('bonobo') - conf.sub_config('gnome') - conf.sub_config('gnomecanvas') - conf.sub_config('gconf') - conf.sub_config('gnomevfs') - conf.sub_config('docs/gnomevfs') - - for module in conf.env['ENABLE_MODULES']: - if module == 'all': - continue - if module not in conf.env['MODULES_AVAILABLE']: - Logs.warn("Requested module %r is not available in this source tree." % module) - if conf.env['MODULES_TO_BUILD']: - print "** The following modules will be built:" - for m in conf.env['MODULES_TO_BUILD']: - print "\t%s" % m - - not_built = list(conf.env['MODULES_AVAILABLE']) - for mod in conf.env['MODULES_TO_BUILD']: - not_built.remove(mod) - if not_built: - print "** The following modules will NOT be built:" - for m in not_built: - print "\t%s" % m - - conf.write_config_header('config.h') - - for docs_module in ['gnomevfs']: - d = os.path.join('docs', docs_module, 'html') - try: - os.mkdir(d) - except OSError: - pass - # print "* Directory %r already exists." % (d,) - #else: - # print "* Creating directory %r." % (d,) - - -def codegen(bld, module, local_load_types=(), register=(), local_register=(), prefix=None): - cmd = bld.new_task_gen('command', - source=['%s.defs' % module, '%s.override' % module], - target=['%s.c' % module]) - cmd.command = ['${CODEGEN}'] - cmd.command.append('--py_ssize_t-clean') - - for load in local_load_types: - cmd.source.append(load) - cmd.command.extend(['--load-types', '${SRC[%i]}' % (len(cmd.source)-1)]) - - for reg in local_register: - cmd.source.append(reg) - cmd.command.extend(['--register', '${SRC[%i]}' % (len(cmd.source)-1)]) - - for reg in register: - cmd.command.extend(['--register', reg]) - - if prefix: - cmd.command.extend(['--prefix', prefix]) - else: - cmd.command.extend(['--prefix', 'py'+module]) - - cmd.command.extend(['--override', "${SRC[1]}", - '${SRC[0]}', - '>', '${TGT[0]}']) - - return cmd - - -def build(bld): - - # Attach the 'codegen' method to the build context - bld.codegen = types.MethodType(codegen, bld) - - def create_pyext(bld): - return bld.new_task_gen('cc', 'shlib', 'pyext') - bld.create_pyext = types.MethodType(create_pyext, bld) - - ## generate and install the .pc file - obj = bld.new_task_gen('subst') - obj.source = 'gnome-python-2.0.pc.in' - obj.target = 'gnome-python-2.0.pc' - obj.dict = { - 'VERSION': VERSION, - 'prefix': bld.env['PREFIX'], - 'exec_prefix': bld.env['PREFIX'], - 'libdir': bld.env['LIBDIR'], - 'includedir': os.path.join(bld.env['PREFIX'], 'include'), - 'datadir': bld.env['DATADIR'], - 'datarootdir': bld.env['DATADIR'], - } - obj.fun = misc.subst_func - obj.install_path = '${LIBDIR}/pkgconfig' - - ## subdirs - bld.add_subdirs('bonobo') - bld.add_subdirs('gnome') - bld.add_subdirs('gnomecanvas') - bld.add_subdirs('gconf') - bld.add_subdirs('gnomevfs') - bld.add_subdirs('docs/gnomevfs') - - -def shutdown(): - env = Build.bld.env - if Options.commands['check']: - _run_tests(env) - - -def _run_tests(env): - import pproc as subprocess - import shutil - builddir = os.path.join(blddir, env.variant()) - # copy the __init__.py files - for subdir in ["bonobo", "gnome", "gnomevfs"]: - src = os.path.join(subdir, "__init__.py") - dst = os.path.join(builddir, subdir) - shutil.copy(src, dst) - os_env = dict(os.environ) - if 'PYTHONPATH' in os_env: - os_env['PYTHONPATH'] = os.pathsep.join([builddir, os_env['PYTHONPATH']]) - else: - os_env['PYTHONPATH'] = builddir - cmd = [#'gdb', '--args', - env['PYTHON'], os.path.join('tests', 'runtests.py'), builddir] - retval = subprocess.Popen(cmd, env=os_env).wait() - if retval: - sys.exit(retval)