The following commit has been merged in the master branch: commit daaf4a56f43b3ca115c2d69e3ea216be143d0fb5 Author: M. Hamish Bowman <hamis...@yahoo.com> Date: Tue May 29 00:23:21 2012 +1200
Support for dh_python2, byte-compile .py at postinst. see `man dh_python2` and http://wiki.debian.org/Python/TransitionToDHPython2 Clean up TODO list. diff --git a/debian/TODO b/debian/TODO index 2e4106d..9d13370 100644 --- a/debian/TODO +++ b/debian/TODO @@ -1,73 +1,50 @@ Maintainers TODO list --------------------- -The grass 'etc' directory contains a mixed arch/non-arch depending mess of -files. They should be automatically classified in the install target and -moved to /var/lib/grass or /usr/lib/grass, leaving symlinks so to not -break things. - FIXME: - -E: grass-core: package-installs-python-bytecode usr/lib/grass64/etc/.../*.pyc -( -> removed in rules, but still need to generate anew in postinst ) - see /usr/share/debhelper/autoscripts/postinst-python - /var/lib/dpkg/info/python-numpy.* - update-python-modules(8) - dh_python2 - - -grass-core.prerm[.in]: (adapted from debian/rules) ---------------------- -# delete python compiled bytecode files -for DIR in python/grass \ - python/grass/lib \ - python/grass/script \ - do - rm -f /usr/lib/grass@VERSION@/etc/$DIR/*.pyc -done - - -grass-gui.prerm[.in]: (adapted from debian/rules) --------------------- -# delete python compiled bytecode files -for DIR in wxpython \ - wxpython/compat \ - wxpython/gui_modules \ - wxpython/icons ; \ - do - rm -f /usr/lib/grass@VERSION@/etc/$DIR/*.pyc -done - - -... but how to do *.postinst with update-python-modules or dh_python2? - - - - -* put Tcl/Tk NVIZ back into grass-core so that qgis users can use it? - (that seems to be a popular use of the qgis-grass toolbox) - +====== Lintian: -W: grass-dev: copyright-without-copyright-notice -W: grass-dev-doc: copyright-without-copyright-notice -W: grass-core: copyright-without-copyright-notice -W: grass-doc: copyright-without-copyright-notice -W: grass: copyright-without-copyright-notice -W: grass-gui: copyright-without-copyright-notice - + (some will be false positives) + +$ grep '^W: ' grass_6.4.2-1_amd64.build | cut -f1,3 -d' ' | sort | uniq +W: copyright-without-copyright-notice +W: executable-not-elf-or-script +W: extra-license-file +W: hardening-no-fortify-functions +W: hardening-no-relro +W: hardening-no-stackprotector +W: image-file-in-usr-lib +W: manpage-has-bad-whatis-entry +W: manpage-has-errors-from-man +W: script-not-executable +W: unusual-interpreter TODO: +===== + +* The grass 'etc' directory contains a mixed arch/non-arch depending mess of + files. They should be automatically classified in the install target and + moved to /var/lib/grass or /usr/lib/grass, leaving symlinks so to not + break things. + -* allow parallel builds by adding something like this to debian/rules: +* Allow parallel builds by adding something like this to debian/rules: {{{ %: dh $@ --parallel }}} +* Put Tcl/Tk NVIZ back into grass-core so that qgis users can use it? + (that seems to be a popular use of the qgis-grass toolbox) + ... but that makes grass-core depend on Tcl/Tk deps. + Or to split it off into a new grass-nviz package? + ... but that adds to the clutter. + ? + * link Programmers' Manual to a listing in the wxGUI Help menu, if installed? (launch using GRASS_HTML_BROWSER) diff --git a/debian/changelog b/debian/changelog index 854ff34..d078b1a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,11 +15,13 @@ grass (6.4.2-1) unstable; urgency=low * Fix g.extension.sh test for the grass-dev package. * Add patch to fix C++ FTBFS for gcc 4.7.0. (closes: #671991) + * Support for dh_python2, byte-compile .py at postinst. + * Clean up TODO list. [ Francesco Paolo Lovergine ] * Moved to use TIFF 4.0.1 instead of the legacy flavor. - -- M. Hamish Bowman <hamis...@yahoo.com> Thu, 17 May 2012 20:09:15 +1200 + -- M. Hamish Bowman <hamis...@yahoo.com> Mon, 28 May 2012 21:47:12 +1200 grass (6.4.1-2) unstable; urgency=low diff --git a/debian/control b/debian/control index 6a162f9..2a00888 100644 --- a/debian/control +++ b/debian/control @@ -27,7 +27,7 @@ Build-depends: libxmu-dev, #install optipng if compressing the PNG images in the programmers' manual # optipng, - python-dev (>= 2.5), python-support (>= 0.7.1), + python (>= 2.6.6-3~), python-wxgtk2.8, libwxgtk2.8-dev, tcl-dev (>= 8.5), tk-dev (>= 8.5), unixodbc-dev @@ -58,7 +58,7 @@ Section: science Architecture: any Depends: ${shlibs:Depends}, - python (>= 2.5), + ${python:Depends}, # numpy used by the GRASS Python Library python-numpy, ${misc:Depends} @@ -99,7 +99,7 @@ Section: science Architecture: any Depends: ${shlibs:Depends}, grass-core, - python, + ${python:Depends}, python-wxgtk2.8, # pyGL needed for wxNviz python-opengl, diff --git a/debian/control.in b/debian/control.in index 4742576..9c7d880 100644 --- a/debian/control.in +++ b/debian/control.in @@ -27,7 +27,7 @@ Build-depends: libxmu-dev, #install optipng if compressing the PNG images in the programmers' manual # optipng, - python-dev (>= 2.5), python-support (>= 0.7.1), + python (>= 2.6.6-3~), python-wxgtk2.8, libwxgtk2.8-dev, tcl-dev (>= 8.5), tk-dev (>= 8.5), unixodbc-dev @@ -58,7 +58,7 @@ Section: science Architecture: any Depends: ${shlibs:Depends}, - python (>= 2.5), + ${python:Depends}, # numpy used by the GRASS Python Library python-numpy, ${misc:Depends} @@ -99,7 +99,7 @@ Section: science Architecture: any Depends: ${shlibs:Depends}, grass-core, - python, + ${python:Depends}, python-wxgtk2.8, # pyGL needed for wxNviz python-opengl, diff --git a/debian/rules b/debian/rules index 1e9cf50..c717d65 100755 --- a/debian/rules +++ b/debian/rules @@ -167,7 +167,7 @@ install: build # delete extra license files rm -f debian/tmp/usr/lib/$(BASE_NAME)/bwidget/LICENSE.txt - # delete python compiled bytecode files + # delete python compiled bytecode files (maybe dh_python2 takes care of this for us?) for DIR in python/grass \ python/grass/lib \ python/grass/script \ @@ -178,7 +178,6 @@ install: build do \ rm -f debian/tmp/usr/lib/$(BASE_NAME)/etc/$$DIR/*.pyc ; \ done - # ..FIXME..: rebuild the .pyc anew in postinst # change section from 1 to .1grass mv debian/tmp/usr/lib/$(BASE_NAME)/man/man1/grass6.1 debian/$(BASE_NAME).1 @@ -275,7 +274,8 @@ binary-arch: install dh_installmenu -a dh_installman -p$(PKG_NAME) debian/$(BASE_NAME).1 -a dh_link -a - dh_pysupport -p$(PKG_NAME) /usr/lib/grass64/etc + dh_python2 + dh_python2 /usr/lib/grass64/etc dh_strip -a dh_compress -a -XAUTHORS dh_fixperms -a -- Geographic Resources Analysis Support System _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel