[med-svn] r3037 - trunk/packages/gwyddion/trunk/debian

[beathovn-guest at alioth.debian.org]

Author: beathovn-guest
Date: 2009-01-22 20:33:45 +0000 (Thu, 22 Jan 2009)
New Revision: 3037

Removed:
   trunk/packages/gwyddion/trunk/debian/gwyddion-pygwy.install
Modified:
   trunk/packages/gwyddion/trunk/debian/changelog
   trunk/packages/gwyddion/trunk/debian/control
   trunk/packages/gwyddion/trunk/debian/gwyddion-common.install
   trunk/packages/gwyddion/trunk/debian/gwyddion.install
   trunk/packages/gwyddion/trunk/debian/rules
Log:
Enabled Python scripting interface Pygwy. Contained in gwyddion package, as additional dependencies aren't big enough to warrant a dedicated package.

Modified: trunk/packages/gwyddion/trunk/debian/changelog
===================================================================
--- trunk/packages/gwyddion/trunk/debian/changelog	2009-01-22 14:20:55 UTC (rev 3036)
+++ trunk/packages/gwyddion/trunk/debian/changelog	2009-01-22 20:33:45 UTC (rev 3037)
@@ -1,8 +1,15 @@
 gwyddion (2.12-2) UNRELEASED; urgency=low
 
-  * A new package gwyddion-pygwy contains the Python scripting interface.
+  * Gwyddion's Python scripting interface Pygwy is now enabled
+    debian/control:
+    - additional Build-Depends on python-gtk2-dev and libgtksourceview2.0-dev
+    - adapted long description of gwyddion
+    debian/gwyddion-common.install:
+    - simplified to contain all files in /usr/share/gwyddion
+    debian/rules:
+    - install also README.pygwy
 
- -- Jan Beyer <jan at beathovn.de>  Tue, 20 Jan 2009 21:24:16 +0100
+ -- Jan Beyer <jan at beathovn.de>  Thu, 22 Jan 2009 21:06:16 +0100
 
 gwyddion (2.12-1) unstable; urgency=low
 

Modified: trunk/packages/gwyddion/trunk/debian/control
===================================================================
--- trunk/packages/gwyddion/trunk/debian/control	2009-01-22 14:20:55 UTC (rev 3036)
+++ trunk/packages/gwyddion/trunk/debian/control	2009-01-22 20:33:45 UTC (rev 3037)
@@ -27,7 +27,11 @@
  and others. However, it can be used for arbitrary height field and
  image analysis.
  .
- This package contains the main application and its modules.
+ This package contains the main application and its modules. It also contains
+ a GNOME (and Xfce) thumbnailer which creates previews for all file types known
+ to Gwyddion.
+ .
+ Gwyddion's Python scripting interface Pygwy is also included.
 
 Package: gwyddion-common
 Architecture: all
@@ -39,17 +43,9 @@
  .
  You should install the package gwyddion if you are interested in this software.
 
-Package: gwyddion-pygwy
-Architecture: any
-Depends: gwyddion (>= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
-Description: Python scripting interface to Gwyddion SPM analysis tool
- This package contains the Python scripting interface to Gwyddion. Gwyddion is
- a modular program for Scanning Probe Microscopy data visualization and
- analysis.
- 
 Package: gwyddion-plugins
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, gwyddion, python (>= 2.2) | ruby (>= 1.8) | perl5 | gpc
+Depends: ${shlibs:Depends}, ${misc:Depends}, gwyddion, python (>= 2.2) | ruby (>= 1.8) | perl5
 Description: plugins for Gwyddion SPM analysis tool
  This package yet contains only sample plugins for Gwyddion in
  Python, Ruby and Perl. Gwyddion is a modular program for Scanning Probe

Modified: trunk/packages/gwyddion/trunk/debian/gwyddion-common.install
===================================================================
--- trunk/packages/gwyddion/trunk/debian/gwyddion-common.install	2009-01-22 14:20:55 UTC (rev 3036)
+++ trunk/packages/gwyddion/trunk/debian/gwyddion-common.install	2009-01-22 20:33:45 UTC (rev 3037)
@@ -1,9 +1,6 @@
 etc/gconf/schemas/
 usr/share/locale/
 usr/share/icons/
-usr/share/gwyddion/pixmaps/
-usr/share/gwyddion/glmaterials/
-usr/share/gwyddion/gradients/
-usr/share/gwyddion/ui/
+usr/share/gwyddion/
 usr/share/mime/packages/
 ../gwyddion-thumbnailer.schemas etc/gconf/schemas

Deleted: trunk/packages/gwyddion/trunk/debian/gwyddion-pygwy.install
===================================================================
--- trunk/packages/gwyddion/trunk/debian/gwyddion-pygwy.install	2009-01-22 14:20:55 UTC (rev 3036)
+++ trunk/packages/gwyddion/trunk/debian/gwyddion-pygwy.install	2009-01-22 20:33:45 UTC (rev 3037)
@@ -1,3 +0,0 @@
-usr/lib/gwyddion/modules/pygwy.*
-usr/share/gwyddion/pygwy/
-

Modified: trunk/packages/gwyddion/trunk/debian/gwyddion.install
===================================================================
--- trunk/packages/gwyddion/trunk/debian/gwyddion.install	2009-01-22 14:20:55 UTC (rev 3036)
+++ trunk/packages/gwyddion/trunk/debian/gwyddion.install	2009-01-22 20:33:45 UTC (rev 3037)
@@ -1,10 +1,5 @@
 usr/bin/
-usr/lib/gwyddion/modules/file/
-usr/lib/gwyddion/modules/graph/
-usr/lib/gwyddion/modules/layer/
-usr/lib/gwyddion/modules/plugin-proxy*
-usr/lib/gwyddion/modules/process/
-usr/lib/gwyddion/modules/tool/
+usr/lib/gwyddion/modules/
 usr/share/man/man1/
 usr/lib/gwyddion/perl/
 usr/lib/gwyddion/python/

Modified: trunk/packages/gwyddion/trunk/debian/rules
===================================================================
--- trunk/packages/gwyddion/trunk/debian/rules	2009-01-22 14:20:55 UTC (rev 3036)
+++ trunk/packages/gwyddion/trunk/debian/rules	2009-01-22 20:33:45 UTC (rev 3037)
@@ -8,6 +8,7 @@
 #DEB_BUILDDIR := $(DEB_SRCDIR)/debian/tmp
 DEB_DH_INSTALL_SOURCEDIR := $(DEB_SRCDIR)/debian/tmp
 DEB_INSTALL_CHANGELOGS_ALL :=
+DEB_INSTALL_DOCS_gwyddion := modules/pygwy/README.pygwy
 DEB_INSTALL_DOCS_gwyddion-plugins := plugins/process/README
 version=$(shell dpkg-parsechangelog | grep '^Version: ' | sed -e 's/^Version: //')
 DEB_DH_MAKESHLIBS_ARGS_gwyddion := -n -Xgwyddion