[med-svn] r9195 - in trunk/packages/gwyddion/trunk/debian: . patches
Jan Beyer
beathovn-guest at alioth.debian.org
Sat Jan 7 21:37:57 UTC 2012
Author: beathovn-guest
Date: 2012-01-07 21:37:56 +0000 (Sat, 07 Jan 2012)
New Revision: 9195
Removed:
trunk/packages/gwyddion/trunk/debian/patches/gwyddion-2.25-get-rid-of-gwy_byteswaped_copy.patch
Modified:
trunk/packages/gwyddion/trunk/debian/changelog
trunk/packages/gwyddion/trunk/debian/copyright
trunk/packages/gwyddion/trunk/debian/patches/fix-manpage-section-for-debian.diff
trunk/packages/gwyddion/trunk/debian/patches/series
trunk/packages/gwyddion/trunk/debian/watch
Log:
Preparing new upstream version 2.26 - changing to .tar.xz-tarball
Modified: trunk/packages/gwyddion/trunk/debian/changelog
===================================================================
--- trunk/packages/gwyddion/trunk/debian/changelog 2012-01-07 13:18:45 UTC (rev 9194)
+++ trunk/packages/gwyddion/trunk/debian/changelog 2012-01-07 21:37:56 UTC (rev 9195)
@@ -1,3 +1,12 @@
+gwyddion (2.26-1) unstable; urgency=low
+
+ * New upstream release
+ * Changed to .tar.xz upstream tarball
+ * Removed patch gwyddion-2.25-get-rid-of-gwy_byteswaped_copy.patch
+ as it is applied upstream
+
+ -- Jan Beyer <jan at beathovn.de> Sat, 07 Jan 2012 21:59:38 +0100
+
gwyddion (2.25-2) unstable; urgency=low
* Adding patch gwyddion-2.25-get-rid-of-gwy_byteswaped_copy.patch
Modified: trunk/packages/gwyddion/trunk/debian/copyright
===================================================================
--- trunk/packages/gwyddion/trunk/debian/copyright 2012-01-07 13:18:45 UTC (rev 9194)
+++ trunk/packages/gwyddion/trunk/debian/copyright 2012-01-07 21:37:56 UTC (rev 9195)
@@ -59,7 +59,7 @@
Copyright: Copyright 2007 Petr Klapetek <klapetek at gwyddion.net>
License: GPL-2+
-Files: app/remote-unique.c, app/validate.[c,h], libgwyddion/gwymathfallback.h, libgwydgets/gwygrainvaluemenu.[c,h], libprocess/gwygrainvalue.[c,h], libprocess/triangulation.[c,h], modules/file/aistfile.c, modules/file/anfatec.c, modules/file/attocube.c, modules/file/burleigh_exp.c, modules/file/csmfile.c, modules/file/dumbfile.c, modules/file/gdeffile.c, modules/file/gwytiff.h, modules/file/hdrimage.cc, modules/file/image-keys.h, modules/file/mapvue.c, modules/file/miffile.c, modules/file/nanoscan.c, modules/file/nrrdfile.c, modules/file/pltfile.c, modules/file/pt3file.c, modules/file/rawxyz.c, modules/file/robotics.c, modules/file/sensolytics.c, modules/file/shimadzu.c, modules/file/spip-asc.c, modules/process/acf2d.c, modules/process/fft_synth.c, modules/process/grain_cross.c, modules/process/mark_with.c, modules/tools/grainmeasure.c, modules/file/gsffile.c, modules/tools/pathlevel.c, modules/file/igorfile.c, modules/file/nanoeducator.c, modules/file/nanonics.c, modules/file/mulfile.c, modules/file/opdfile.c, modules/file/rawgraph.c, modules/file/rhk-sm4.c, modules/file/wsffile.c, modules/spmlabf.c, modules/process/curvature.c, modules/process/deposit_synth.c, modules/process/dimensions.h, modules/process/lno_synth.c, modules/process/noise_synth.c, modules/process/obj_synth.c, modules/process/pat_synth.c, modules/process/synth.h, modules/process/tilt.c, modules/process/threshold.c, modules/process/fft_profile.c, modules/tools/selectionmanager.c
+Files: app/remote-unique.c, app/validate.[c,h], libgwyddion/gwymathfallback.h, libgwydgets/gwygrainvaluemenu.[c,h], libprocess/gwygrainvalue.[c,h], libprocess/triangulation.[c,h], modules/file/aistfile.c, modules/file/alicona.c, modules/file/anfatec.c, modules/file/attocube.c, modules/file/burleigh_exp.c, modules/file/codevfile.c, modules/file/csmfile.c, modules/file/dumbfile.c, modules/file/gdeffile.c, modules/file/gwytiff.h, modules/file/hdrimage.cc, modules/file/hitachi-sem.c, modules/file/image-keys.h, modules/file/iso28600.c, modules/file/mapvue.c, modules/file/miffile.c, modules/file/nanoscan.c, modules/file/nrrdfile.c, modules/file/pltfile.c, modules/file/pt3file.c, modules/file/rawxyz.c, modules/file/robotics.c, modules/file/sensolytics.c, modules/file/shimadzu.c, modules/file/spip-asc.c, modules/process/acf2d.c, modules/process/fft_synth.c, modules/process/grain_cross.c, modules/process/mark_with.c, modules/tools/grainmeasure.c, modules/file/gsffile.c, modules/tools/pathlevel.c, modules/file/igorfile.c, modules/file/nanoeducator.c, modules/file/nanonics.c, modules/file/mulfile.c, modules/file/opdfile.c, modules/file/rawgraph.c, modules/file/rhk-sm4.c, modules/file/witec-asc.c, modules/file/wsffile.c, modules/file/zeiss.c, modules/spmlabf.c, modules/process/curvature.c, modules/process/deposit_synth.c, modules/process/dimensions.h, modules/process/lno_synth.c, modules/process/noise_synth.c, modules/process/obj_synth.c, modules/process/pat_synth.c, modules/process/synth.h, modules/process/tilt.c, modules/process/threshold.c, modules/process/fft_profile.c, modules/tools/selectionmanager.c
Copyright: Copyright 2007-2011 David Necas (Yeti) <yeti at gwyddion.net>
License: GPL-2+
@@ -234,7 +234,7 @@
Copyright: Copyright 2009 Francois Bianco (fbianco) <francois.bianco at unige.ch>
License: GPL-2+
-Files: modules/file/wipfile.c, modules/graph/graph_dos_spectrum.c, modules/process/grain_edge.c, modules/process/mcrop.c
+Files: modules/file/wipfile.c, modules/graph/graph_dos_spectrum.c, modules/process/averaging.c, modules/process/grain_edge.c, modules/process/mcrop.c
Copyright: Copyright 2010,2011 David Necas (Yeti) <yeti at gwyddion.net>
Copyright: Copyright 2010,2011 Petr Klapetek <klapetek at gwyddion.net>
Copyright: Copyright 2010,2011 Daniil Bratashov <dn2010 at gmail.com>
Modified: trunk/packages/gwyddion/trunk/debian/patches/fix-manpage-section-for-debian.diff
===================================================================
--- trunk/packages/gwyddion/trunk/debian/patches/fix-manpage-section-for-debian.diff 2012-01-07 13:18:45 UTC (rev 9194)
+++ trunk/packages/gwyddion/trunk/debian/patches/fix-manpage-section-for-debian.diff 2012-01-07 21:37:56 UTC (rev 9195)
@@ -8,9 +8,9 @@
Forwarded: not-needed
Author: Jan Beyer <jan at beathovn.de>
---- gwyddion-2.22.orig/perl/Makefile.in
-+++ gwyddion-2.22/perl/Makefile.in
-@@ -301,7 +301,7 @@
+--- gwyddion-2.26.orig/perl/Makefile.in
++++ gwyddion-2.26/perl/Makefile.in
+@@ -317,7 +317,7 @@
EXTRA_DIST = $(Gwyddion_PERL)
perllibdir = $(pkglibdir)/perl/Gwyddion
@HAVE_PERL_TRUE at man3dir = $(mandir)/man3
@@ -21,7 +21,7 @@
@HAVE_PERL_TRUE@ Gwyddion::dump.3pm
--- gwyddion-2.22.orig/perl/Makefile.am
+++ gwyddion-2.22/perl/Makefile.am
-@@ -9,7 +9,7 @@
+@@ -12,7 +12,7 @@
if HAVE_PERL
man3dir = $(mandir)/man3
Deleted: trunk/packages/gwyddion/trunk/debian/patches/gwyddion-2.25-get-rid-of-gwy_byteswaped_copy.patch
===================================================================
--- trunk/packages/gwyddion/trunk/debian/patches/gwyddion-2.25-get-rid-of-gwy_byteswaped_copy.patch 2012-01-07 13:18:45 UTC (rev 9194)
+++ trunk/packages/gwyddion/trunk/debian/patches/gwyddion-2.25-get-rid-of-gwy_byteswaped_copy.patch 2012-01-07 21:37:56 UTC (rev 9195)
@@ -1,88 +0,0 @@
-Description: fix build problem on big endian architectures
-Author: David Necas <yeti at gwyddion.net>
-
---- gwyddion-2.25/modules/file/dumbfile.c (revision 12726)
-+++ gwyddion-2.25/modules/file/dumbfile.c (revision 12727)
-@@ -69,7 +69,7 @@
- &module_register,
- N_("Reads and exports Gwyddion dumb dump files."),
- "Yeti <yeti at gwyddion.net>",
-- "1.0",
-+ "1.1",
- "David Nečas (Yeti)",
- "2011",
- };
-@@ -283,7 +283,7 @@
- #if (G_BYTE_ORDER == G_LITTLE_ENDIAN)
- memcpy(d, pos, n);
- #else
-- gwy_byteswapped_copy(pos, (guint8*)d,
-+ gwy_memcpy_byte_swap(pos, (guint8*)d,
- sizeof(gdouble), xres*yres, sizeof(gdouble)-1);
- #endif
- pos += n;
---- gwyddion-2.25/modules/plugin-proxy.c (revision 12726)
-+++ gwyddion-2.25/modules/plugin-proxy.c (revision 12727)
-@@ -51,6 +51,7 @@
- #include <sys/types.h>
- #include <glib/gstdio.h>
- #include <libgwyddion/gwymacros.h>
-+#include <libgwyddion/gwyutils.h>
- #include <libgwymodule/gwymodule.h>
- #include <libprocess/datafield.h>
- #include <app/gwyapp.h>
-@@ -144,7 +145,7 @@
- "running external programs (plug-ins) on data pretending they are "
- "data processing or file loading/saving modules."),
- "Yeti <yeti at gwyddion.net>",
-- "3.8",
-+ "3.9",
- "David Nečas (Yeti) & Petr Klapetek",
- "2004",
- };
-@@ -1116,27 +1117,6 @@
- return fh;
- }
-
--static inline void
--gwy_byteswapped_copy(const guint8 *source,
-- guint8 *dest,
-- gsize size,
-- gsize len,
-- gsize byteswap)
--{
-- gsize i, k;
--
-- if (!byteswap) {
-- memcpy(dest, source, size*len);
-- return;
-- }
--
-- for (i = 0; i < len; i++) {
-- guint8 *b = dest + i*size;
--
-- for (k = 0; k < size; k++)
-- b[k ^ byteswap] = *(source++);
-- }
--}
- /**
- * dump_export_data_field:
- * @dfield: A #GwyDataField.
-@@ -1180,7 +1160,7 @@
- guint8 *d;
-
- d = g_new(guint8, sizeof(gdouble)*xres*yres);
-- gwy_byteswapped_copy((const guint8*)data, d,
-+ gwy_memcpy_byte_swap((const guint8*)data, d,
- sizeof(gdouble), xres*yres, sizeof(gdouble) - 1);
- fwrite(data, sizeof(gdouble), xres*yres, fh);
- g_free(d);
-@@ -1397,7 +1377,7 @@
- #if (G_BYTE_ORDER == G_LITTLE_ENDIAN)
- memcpy(d, pos, n);
- #else
-- gwy_byteswapped_copy(pos, (guint8*)d,
-+ gwy_memcpy_byte_swap(pos, (guint8*)d,
- sizeof(gdouble), xres*yres, sizeof(gdouble)-1);
- #endif
- pos += n;
Modified: trunk/packages/gwyddion/trunk/debian/patches/series
===================================================================
--- trunk/packages/gwyddion/trunk/debian/patches/series 2012-01-07 13:18:45 UTC (rev 9194)
+++ trunk/packages/gwyddion/trunk/debian/patches/series 2012-01-07 21:37:56 UTC (rev 9195)
@@ -1,3 +1,2 @@
fix-manpage-section-for-debian.diff
fix-rpath-issue.patch
-gwyddion-2.25-get-rid-of-gwy_byteswaped_copy.patch
Modified: trunk/packages/gwyddion/trunk/debian/watch
===================================================================
--- trunk/packages/gwyddion/trunk/debian/watch 2012-01-07 13:18:45 UTC (rev 9194)
+++ trunk/packages/gwyddion/trunk/debian/watch 2012-01-07 21:37:56 UTC (rev 9195)
@@ -1,3 +1,3 @@
version=3
-http://sf.net/gwyddion/gwyddion-([0-9].[0-9]+\w*)\.tar\.gz
+http://sf.net/gwyddion/gwyddion-([0-9].[0-9]+\w*)\.tar\.xz
More information about the debian-med-commit
mailing list