some more packaging updates

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

Changelog

-Version 0.3.0 - UNRELEASED
+Version 0.3.0 - 2010-08-16
  * added support for importing contour paths from SVG files (requires Inkscape and pstoedit)
  * added basic support for importing simple DXF contour files
  * added support for engravings (along the lines of a contour model)

debian/changelog

+pycam (0.3-1) unstable; urgency=low
+
+  * new upstream release
+  * Switch to dpkg-source 3.0 (quilt) format
+
+ -- Lars Kruse <devel@sumpfralle.de>  Mon, 16 Aug 2010 15:57:45 +0200
+
 pycam (0.2.3-1) unstable; urgency=low
 
   * new upstream release

debian/control

@@ -10,7 +10,7 @@ Homepage: http://sourceforge.net/projects/pycam/
 Package: pycam
 Architecture: all
 Depends: python-gtk2, python-opengl (>>3.0.0~b6-3), python-gtkglext1,
- ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}
+ ${misc:Depends}, ${python:Depends}
 Recommends: python-pyode (>>1.2.0-3), python-psyco
 Description: CAM program & library written in Python
  This is a set of Python modules for toolpath generation for 3-Axis
@@ -24,5 +24,5 @@ Description: CAM program & library written in Python
       operations)
     * scale, move, rotate, flip and transform the model
     * interactive 3D model view
-    * non-interactive 'STL to GCode' processing via commandline
+    * non-interactive generation of GCode via commandline
 

debian/docs

 Changelog
-HOWTO.TXT
+technical_details.txt
 README.TXT
 

debian/patches/00.remove_windows_install_script.patch

 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
-@@ -43,7 +43,7 @@
+@@ -76,7 +76,7 @@
          "pycam.Toolpath",
          "pycam.Physics",
      ],
 -    scripts = ['pycam', 'pycam_win32_postinstall.py'],
 +    scripts = ['pycam'],
-     data_files=[("share/doc/pycam",[
+     data_files=[("share/pycam/doc",[
              "COPYING.TXT",
+             "technical_details.txt",

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

@@ -2,11 +2,12 @@ diff --git a/setup.py b/setup.py
 index 3046304..9f66f6d 100755
 --- a/setup.py
 +++ b/setup.py
-@@ -45,13 +45,9 @@ setup(
+@@ -78,13 +78,9 @@ setup(
      ],
      scripts = ['pycam', 'pycam_win32_postinstall.py'],
      data_files=[("share/pycam/doc",[
 -            "COPYING.TXT",
+             "technical_details.txt",
 -            "INSTALL.TXT",
 -            "LICENSE.TXT",
              "README.TXT",

debian/rules

@@ -19,7 +19,7 @@ include /usr/share/cdbs/1/class/python-distutils.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
 # clean the manpage
-clean:
+clean::
 	make -C man clean
 
 # build the manpage

debian/source/format

+3.0 (quilt)

pycam_win32_postinstall.py

@@ -45,7 +45,7 @@ START_MENU_SUBDIR = os.path.join(START_MENU_BASEDIR, "PyCAM")
 # create a start menu item for pycam
 PYTHON_EXE = os.path.join(distutils.sysconfig.EXEC_PREFIX, "pythonw.exe")
 # surround the start script with quotes to avoid space-issues
-START_SCRIPT = "'%s'" % os.path.join(distutils.sysconfig.EXEC_PREFIX, "Scripts", "pycam")
+START_SCRIPT = '"%s"' % os.path.join(distutils.sysconfig.EXEC_PREFIX, "Scripts", "pycam")
 
 PYTHON_DOC_DIR = os.path.join(distutils.sysconfig.PREFIX, "share", "pycam", "doc")
 
@@ -57,7 +57,7 @@ WEB_LINKS = [
         (r"http://sourceforge.net/projects/pycam/", "Project's Website"),
         (r"http://sourceforge.net/tracker/?group_id=237831&atid=1104176", "Report a Bug"),
         (r"http://sourceforge.net/projects/pycam/forums", "Forum Discussions"),
-        (r"http://sourceforge.net/apps/mediawiki/pycam/", "Wiki")]
+        (r"http://sourceforge.net/apps/mediawiki/pycam/", "Wiki Documentation")]
 
 MENU_ITEMS = map(lambda v: (os.path.join(PYTHON_DOC_DIR, v[0]), v[1]), DOC_FILES)
 MENU_ITEMS.extend(WEB_LINKS)

setup.py

@@ -76,15 +76,11 @@ Basically you will need Python, GTK and OpenGL.
         "pycam.Toolpath",
         "pycam.Physics",
     ],
-    scripts = ['pycam', 'pycam_win32_postinstall.py'],
+    scripts = ['pycam'],
     data_files=[("share/pycam/doc",[
-            "COPYING.TXT",
             "technical_details.txt",
-            "INSTALL.TXT",
-            "LICENSE.TXT",
             "README.TXT",
-            "Changelog",
-            "release_info.txt"]),
+            "Changelog"]),
         ("share/pycam/ui", [
             os.path.join("share", "gtk-interface", "pycam-project.ui"),
             os.path.join("share", "gtk-interface", "menubar.xml"),