improved the debian packaging based on suggestions from Benoît Knecht...

improved the debian packaging based on suggestions from Benoît Knecht <benoit.knecht@fsfe.org> on the debian-mentors mailing list


git-svn-id: https://pycam.svn.sourceforge.net/svnroot/pycam/trunk@834 bbaffbd6-741e-11dd-a85d-61de82d9cad9

debian/copyright

-This package was debianized by:
+Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
+Name: PyCAM
+Maintainer: Lars Kruse <devel@sumpfralle.de>
+Source: http://pycam.sourceforge.net
+
+Files: *
+Copyright: 2010, Lars Kruse <devel@sumpfralle.de>
+           2006-2010, Lode Leroy
+License: GPL-3+
+
+Files: debian/*
+Copyright: 2010, Lars Kruse <devel@sumpfralle.de>
+           2010, Sebastian Kuzminsky <seb@highlab.com>
+License: GPL-3+
+
+License: GPL-3+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the full text of the GNU General Public License
+ version 3 can be found in the file `/usr/share/common-licenses/GPL-3'.
 
-    Sebastian Kuzminsky <seb@highlab.com> on Tue, 16 Mar 2010 22:14:56 -0600
-
-It was downloaded from:
-
-    <https://sourceforge.net/projects/pycam/>
-
-Upstream Authors:
-
-    Lode Leroy
-    Lars (sumpfralle)
-
-Copyright:
-
-    Copyright (C) 2010 lode_leroy
-    Copyright (C) 2010 sumpfralle
-
-License:
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This package is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-On Debian systems, the complete text of the GNU General
-Public License version 3 can be found in `/usr/share/common-licenses/GPL-3'.
-
-The Debian packaging is:
-
-    Copyright (C) 2010 Sebastian Kuzminsky <Sebastian Kuzminsky <seb@highlab.com>>
-
-and is licensed under the GPL version 3, see above.

debian/patches/00.remove_windows_install_script.patch

+Description: Remove windows-only file from the Debian package
+ The respective file is a helper script for packaging the windows installer
+ of PyCAM.
+Forwarded: not-needed
+Author: Lars Kruse <devel@sumpfralle.de>
+
 diff -Nur -x '*.orig' -x '*~' pycam-0.2.2//setup.py pycam-0.2.2.new//setup.py
 --- pycam-0.2.2//setup.py	2010-03-20 12:57:16.000000000 +0100
 +++ pycam-0.2.2.new//setup.py	2010-03-20 13:07:53.026518970 +0100

debian/patches/01.remove-superfluous-files-from-doc.patch

+Subject: Remove documentation files that are not useful for the package.
+Forwarded: not-needed
+Author: Lars Kruse <devel@sumpfralle.de>
+
 diff --git a/setup.py b/setup.py
 index 3046304..9f66f6d 100755
 --- a/setup.py

debian/postinst

-#!/bin/sh
-# postinst script for pycam
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-#        * <postinst> `configure' <most-recently-configured-version>
-#        * <old-postinst> `abort-upgrade' <new version>
-#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
-#          <new-version>
-#        * <postinst> `abort-remove'
-#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
-#          <failed-install-package> <version> `removing'
-#          <conflicting-package> <version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-
-case "$1" in
-    configure)
-    ;;
-
-    abort-upgrade|abort-remove|abort-deconfigure)
-    ;;
-
-    *)
-        echo "postinst called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0

debian/prerm

-#!/bin/sh
-# prerm script for pycam
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-#        * <prerm> `remove'
-#        * <old-prerm> `upgrade' <new-version>
-#        * <new-prerm> `failed-upgrade' <old-version>
-#        * <conflictor's-prerm> `remove' `in-favour' <package> <new-version>
-#        * <deconfigured's-prerm> `deconfigure' `in-favour'
-#          <package-being-installed> <version> `removing'
-#          <conflicting-package> <version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-
-case "$1" in
-    remove|upgrade|deconfigure)
-    ;;
-
-    failed-upgrade)
-    ;;
-
-    *)
-        echo "prerm called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0

debian/watch

+version=3
+http://sf.net/pycam/pycam-(.+)\.tar\.gz

man/pycam.1.inc

@@ -4,7 +4,7 @@
 
 .fi
 Use the default settings to process the model \fBfoo.stl\fR with an adjusted
-lower margin (minx, miny, minz) of 10% (for x), 5% (for y) and -10% (for z).
+lower margin (minx, miny, minz) of 10% (for x), 5% (for y) and \-10% (for z).
 
 [ENVIRONMENT]
 .IP PYCAM_DATA_DIR
@@ -18,7 +18,7 @@ You may want to define this variable in case that you installed the
 See http://sourceforge.net/tracker/?group_id=237831&atid=1104176
 
 [SEE ALSO]
-Take a look at the output of \fBpycam --help\fR to get a slightly better
+Take a look at the output of \fBpycam \-\-help\fR to get a slightly better
 formatted list of options. The manual that you are reading right now is
 derived from this output.
 

pycam

@@ -32,7 +32,6 @@ if hasattr(sys, "frozen") and sys.frozen and "_MEIPASS2" in os.environ:
     from ctypes import windll
     windll[os.path.join(os.environ["_MEIPASS2"], "glut32.dll")]
 
-from pycam.Physics.ode_physics import override_ode_availability
 import pycam.Gui.common as GuiCommon
 import pycam.Gui.Settings
 import pycam.Gui.Console
@@ -425,7 +424,7 @@ if __name__ == "__main__":
             + "These options trigger the non-interactive mode. Thus the GUI " \
             + "is disabled.")
     group_tool = parser.add_option_group("Tool definition",
-            "Specify the tool paramters. The default tool is spherical and " \
+            "Specify the tool parameters. The default tool is spherical and " \
             + "has a diameter of 1 unit. The default speeds are 1000 " \
             + "units/minute (feedrate) and 250 (spindle rotations per minute)")
     group_process = parser.add_option_group("Process definition",