[med-svn] r2900 - in trunk/packages/gwyddion/trunk/debian: . patches

[beathovn-guest at alioth.debian.org]

Author: beathovn-guest
Date: 2009-01-05 22:17:14 +0000 (Mon, 05 Jan 2009)
New Revision: 2900

Removed:
   trunk/packages/gwyddion/trunk/debian/patches/fix-crash-on-no-mask-present_svn8911.patch
Modified:
   trunk/packages/gwyddion/trunk/debian/README.Debian
   trunk/packages/gwyddion/trunk/debian/changelog
   trunk/packages/gwyddion/trunk/debian/control
   trunk/packages/gwyddion/trunk/debian/gwyddion.install
   trunk/packages/gwyddion/trunk/debian/patches/series
   trunk/packages/gwyddion/trunk/debian/rules
Log:
New upstream release - already...
Packaging not finished yet. gywddion-thumbnailer.1 needs polishing. Have to check, that thumbnailing actually works. Maybe something more?


Modified: trunk/packages/gwyddion/trunk/debian/README.Debian
===================================================================
--- trunk/packages/gwyddion/trunk/debian/README.Debian	2009-01-05 00:10:30 UTC (rev 2899)
+++ trunk/packages/gwyddion/trunk/debian/README.Debian	2009-01-05 22:17:14 UTC (rev 2900)
@@ -1,6 +1,11 @@
 Gwyddion for Debian
 -------------------
 
+Gwyddion 2.12 thumbnailer
+The thumbnailer for KDE4 is not enabled, as it has not been tested yet.
+
+  -- Jan Beyer <jan at beathovn.de> Mon, 05 Jan 2009 23:03:50 +0100
+
 dpkg-shlibdeps emits currently some warnings like:
 
 dpkg-shlibdeps: warning: symbol gwy_layer_basic_set_gradient_key used by

Modified: trunk/packages/gwyddion/trunk/debian/changelog
===================================================================
--- trunk/packages/gwyddion/trunk/debian/changelog	2009-01-05 00:10:30 UTC (rev 2899)
+++ trunk/packages/gwyddion/trunk/debian/changelog	2009-01-05 22:17:14 UTC (rev 2900)
@@ -1,3 +1,15 @@
+gwyddion (2.12-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+  * Removed patch fix-crash-on-no-mask-present_svn8911.patch, as this is now
+    in upstream's sources.
+  * Added Build-Dependency on libgconf2-dev for thumbnail creation in
+    TMS-compliant desktop environments.
+  * gwyddion-thumbnailer also needs a chrpath-call in debian/rules to remove its
+    RPATH.
+
+ -- Jan Beyer <jan at beathovn.de>  Mon, 05 Jan 2009 21:53:33 +0100
+
 gwyddion (2.11-1) unstable; urgency=low
 
   * New upstream release.

Modified: trunk/packages/gwyddion/trunk/debian/control
===================================================================
--- trunk/packages/gwyddion/trunk/debian/control	2009-01-05 00:10:30 UTC (rev 2899)
+++ trunk/packages/gwyddion/trunk/debian/control	2009-01-05 22:17:14 UTC (rev 2900)
@@ -4,7 +4,7 @@
 Maintainer: Debian-Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
 DM-Upload-Allowed: yes
 Uploaders: Jan Beyer <jan at beathovn.de>
-Build-Depends: cdbs, debhelper (>= 5), autotools-dev, pkg-config (>= 0.16), libgtk2.0-dev (>= 2.8), libgtkglext1-dev, libtiff4-dev, libfftw3-dev, libxmu6, python, ruby, chrpath, quilt
+Build-Depends: cdbs, debhelper (>= 5), autotools-dev, pkg-config (>= 0.16), libgtk2.0-dev (>= 2.8), libgtkglext1-dev, libtiff4-dev, libfftw3-dev, libxmu6, python, ruby, libgconf2-dev, chrpath, quilt
 Standards-Version: 3.8.0
 Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/gwyddion/trunk/?rev=0&sc=0
 Vcs-Svn: svn://svn.debian.org/svn/debian-med/trunk/packages/gwyddion/trunk/

Modified: trunk/packages/gwyddion/trunk/debian/gwyddion.install
===================================================================
--- trunk/packages/gwyddion/trunk/debian/gwyddion.install	2009-01-05 00:10:30 UTC (rev 2899)
+++ trunk/packages/gwyddion/trunk/debian/gwyddion.install	2009-01-05 22:17:14 UTC (rev 2900)
@@ -4,6 +4,7 @@
 usr/lib/gwyddion/perl/
 usr/lib/gwyddion/python/
 usr/lib/gwyddion/ruby/
+usr/share/man/man1/
 usr/share/man/man3/
 usr/share/applications/
 ../gwyddion.xpm usr/share/pixmaps

Deleted: trunk/packages/gwyddion/trunk/debian/patches/fix-crash-on-no-mask-present_svn8911.patch
===================================================================
--- trunk/packages/gwyddion/trunk/debian/patches/fix-crash-on-no-mask-present_svn8911.patch	2009-01-05 00:10:30 UTC (rev 2899)
+++ trunk/packages/gwyddion/trunk/debian/patches/fix-crash-on-no-mask-present_svn8911.patch	2009-01-05 22:17:14 UTC (rev 2900)
@@ -1,24 +0,0 @@
-Author: David Necas
-Source: upstream's SVN commit 8911
-Description: Fixes a possible crash when no mask is present due to 
-missing initialization.
---- gwyddion/modules/process/polylevel.c
-+++ gwyddion/modules/process/polylevel.c
-@@ -122,7 +122,7 @@
-     &module_register,
-     N_("Subtracts polynomial background."),
-     "Yeti <yeti at gwyddion.net>",
--    "2.4",
-+    "2.5",
-     "David Nečas (Yeti) & Petr Klapetek",
-     "2004",
- };
-@@ -721,7 +721,7 @@
- poly_level_update_preview(PolyLevelControls *controls,
-                           PolyLevelArgs *args)
- {
--    GwyDataField *source, *leveled, *bg, *mask;
-+    GwyDataField *source, *leveled, *bg, *mask = NULL;
- 
-     gwy_container_gis_object_by_name(controls->data, "/source", &source);
-     gwy_container_gis_object_by_name(controls->data, "/mask", &mask);

Modified: trunk/packages/gwyddion/trunk/debian/patches/series
===================================================================
--- trunk/packages/gwyddion/trunk/debian/patches/series	2009-01-05 00:10:30 UTC (rev 2899)
+++ trunk/packages/gwyddion/trunk/debian/patches/series	2009-01-05 22:17:14 UTC (rev 2900)
@@ -1,3 +1,2 @@
 fix-manpage-section-for-debian.diff
 fix-rpath-issue.patch
-fix-crash-on-no-mask-present_svn8911.patch

Modified: trunk/packages/gwyddion/trunk/debian/rules
===================================================================
--- trunk/packages/gwyddion/trunk/debian/rules	2009-01-05 00:10:30 UTC (rev 2899)
+++ trunk/packages/gwyddion/trunk/debian/rules	2009-01-05 22:17:14 UTC (rev 2900)
@@ -14,6 +14,7 @@
 
 install/gwyddion::
 	chrpath -d debian/tmp/usr/bin/gwyddion
+	chrpath -d debian/tmp/usr/bin/gwyddion-thumbnailer
 
 get-orig-source::
 	if [ -x /usr/bin/uscan ]; then \