[Pkg-octave-commit] [SCM] Debian packaging for octave branch, master, updated. debian/3.4.3-4-9-g0c77daa
Sébastien Villemot
sebastien.villemot at ens.fr
Fri Feb 24 10:18:39 UTC 2012
The following commit has been merged in the master branch:
commit a80770eb5b826646bb6d36d7a33f039c7264a269
Author: Sébastien Villemot <sebastien.villemot at ens.fr>
Date: Thu Feb 23 20:20:05 2012 +0100
Refresh the other patches
diff --git a/debian/patches/add_info_dir_categories b/debian/patches/add_info_dir_categories
index 70566a8..4bb55aa 100644
--- a/debian/patches/add_info_dir_categories
+++ b/debian/patches/add_info_dir_categories
@@ -13,7 +13,7 @@ Author: Thomas Weber <tweber at debian.org>
@end direntry
--- a/doc/interpreter/octave.texi
+++ b/doc/interpreter/octave.texi
-@@ -48,6 +48,7 @@
+@@ -62,6 +62,7 @@
@ifinfo
@format
diff --git a/debian/patches/correct_typos b/debian/patches/correct_typos
index a6ba10e..37f7a51 100644
--- a/debian/patches/correct_typos
+++ b/debian/patches/correct_typos
@@ -3,7 +3,7 @@ Forwarded: not yet
Author: Thomas Weber <tweber at debian.org>
--- a/scripts/io/dlmwrite.m
+++ b/scripts/io/dlmwrite.m
-@@ -81,7 +81,7 @@
+@@ -83,7 +83,7 @@
## 2002-03-08 Paul Kienzle <pkienzle at users.sf.net>
## * Initial revision
## 2005-11-27 Bill Denney <bill at givebillmoney.com>
@@ -12,23 +12,3 @@ Author: Thomas Weber <tweber at debian.org>
## functionality.
function dlmwrite (file, M, varargin)
-@@ -102,7 +102,7 @@
- endif
- opentype = "wt";
-
-- ## process the input arguements
-+ ## process the input arguments
- i = 0;
- while (i < length (varargin))
- i = i + 1;
---- a/src/debug.cc
-+++ b/src/debug.cc
-@@ -563,7 +563,7 @@
-
- if (nargin != 0 && nargin != 1)
- {
-- error ("dbstatus: only zero or one arguements accepted\n");
-+ error ("dbstatus: only zero or one arguments accepted\n");
- return octave_value ();
- }
-
diff --git a/debian/patches/drop_version_from_mkoctfile_function_call b/debian/patches/drop_version_from_mkoctfile_function_call
index cdfbd97..3310dd5 100644
--- a/debian/patches/drop_version_from_mkoctfile_function_call
+++ b/debian/patches/drop_version_from_mkoctfile_function_call
@@ -3,7 +3,7 @@ Forwarded: not-needed
Author: Sébastien Villemot <sebastien.villemot at ens.fr>
--- a/scripts/miscellaneous/mkoctfile.m
+++ b/scripts/miscellaneous/mkoctfile.m
-@@ -137,7 +137,7 @@
+@@ -144,7 +144,7 @@
bindir = octave_config_info ("bindir");
diff --git a/debian/patches/drop_version_from_pkg_function_calls b/debian/patches/drop_version_from_pkg_function_calls
index 6b95945..3d6392a 100644
--- a/debian/patches/drop_version_from_pkg_function_calls
+++ b/debian/patches/drop_version_from_pkg_function_calls
@@ -3,7 +3,7 @@ Forwarded: not-needed
Author: Thomas Weber <tweber at debian.org>
--- a/scripts/pkg/pkg.m
+++ b/scripts/pkg/pkg.m
-@@ -1295,10 +1295,9 @@
+@@ -1341,10 +1341,9 @@
if (exist (fullfile (packdir, "src"), "dir"))
src = fullfile (packdir, "src");
octave_bindir = octave_config_info ("bindir");
diff --git a/debian/patches/drop_versioned_binarys b/debian/patches/drop_versioned_binarys
index 75ccd16..51058c7 100644
--- a/debian/patches/drop_versioned_binarys
+++ b/debian/patches/drop_versioned_binarys
@@ -2,11 +2,9 @@ Description: Don't install binarys with a version in them
We don't need them.
Forwarded: not-needed
Author: Thomas Weber <tweber at debian.org>
-Index: octave-3.4.2-rc2/src/Makefile.am
-===================================================================
---- octave-3.4.2-rc2.orig/src/Makefile.am 2011-06-28 19:53:51.000000000 +0000
-+++ octave-3.4.2-rc2/src/Makefile.am 2011-06-28 19:54:25.000000000 +0000
-@@ -847,7 +847,7 @@
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -695,7 +695,7 @@
chmod a+rx $@
endif
diff --git a/debian/patches/enable_dirs_in_pkg b/debian/patches/enable_dirs_in_pkg
index 9c447bf..aa9869c 100644
--- a/debian/patches/enable_dirs_in_pkg
+++ b/debian/patches/enable_dirs_in_pkg
@@ -3,7 +3,7 @@ Forwarded: not-needed
Author: Thomas Weber <tweber at debian.org>
--- a/scripts/pkg/pkg.m
+++ b/scripts/pkg/pkg.m
-@@ -664,25 +664,32 @@
+@@ -701,25 +701,32 @@
endif
## Uncompress the package.
diff --git a/debian/patches/install_libraries_publically b/debian/patches/install_libraries_publically
index 463c415..dbb0efe 100644
--- a/debian/patches/install_libraries_publically
+++ b/debian/patches/install_libraries_publically
@@ -17,9 +17,9 @@ Author: Thomas Weber <tweber at debian.org>
libcruft_la_SOURCES =
-@@ -54,7 +55,7 @@
- $(LAPACK_LIBS) $(BLAS_LIBS) \
- $(FLIBS)
+@@ -56,7 +57,7 @@
+ -bindir $(bindir) \
+ $(LIBCRUFT_LINK_OPTS)
-libcruft_la_DEPENDENCIES = cruft.def
+libcruft_la_DEPENDENCIES = cruft.def libranlib.la
@@ -28,7 +28,7 @@ Author: Thomas Weber <tweber at debian.org>
--- a/liboctave/Makefile.am
+++ b/liboctave/Makefile.am
-@@ -408,7 +408,8 @@
+@@ -411,7 +411,8 @@
uint64NDArray.cc \
uint8NDArray.cc
diff --git a/debian/patches/use_system_gl2ps b/debian/patches/use_system_gl2ps
index 0417dd0..a1d9324 100644
--- a/debian/patches/use_system_gl2ps
+++ b/debian/patches/use_system_gl2ps
@@ -8,10 +8,10 @@ Forwarded: not-needed
Author: Thomas Weber <tweber at debian.org>
--- a/src/gl2ps.c
+++ /dev/null
-@@ -1,6077 +0,0 @@
+@@ -1,6078 +0,0 @@
-/*
- * GL2PS, an OpenGL to PostScript Printing Library
-- * Copyright (C) 1999-2009 C. Geuzaine
+- * Copyright (C) 1999-2011 C. Geuzaine
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of either:
@@ -316,10 +316,12 @@ Author: Thomas Weber <tweber at debian.org>
-
-static void *gl2psRealloc(void *ptr, size_t size)
-{
+- void *orig = ptr;
- if(!size) return NULL;
-- ptr = realloc(ptr, size);
+- ptr = realloc(orig, size);
- if(!ptr){
- gl2psMsg(GL2PS_ERROR, "Couldn't reallocate requested memory");
+- free(orig);
- return NULL;
- }
- return ptr;
@@ -331,12 +333,12 @@ Author: Thomas Weber <tweber at debian.org>
- free(ptr);
-}
-
--static size_t gl2psWriteBigEndian(unsigned long data, size_t bytes)
+-static int gl2psWriteBigEndian(unsigned long data, int bytes)
-{
-- size_t i;
-- size_t size = sizeof(unsigned long);
+- int i;
+- int size = sizeof(unsigned long);
- for(i = 1; i <= bytes; ++i){
-- fputc(0xff & (data >> (size-i) * 8), gl2ps->stream);
+- fputc(0xff & (data >> (size - i) * 8), gl2ps->stream);
- }
- return bytes;
-}
@@ -403,10 +405,10 @@ Author: Thomas Weber <tweber at debian.org>
- return gl2ps->compress->start;
-}
-
--static size_t gl2psWriteBigEndianCompress(unsigned long data, size_t bytes)
+-static int gl2psWriteBigEndianCompress(unsigned long data, int bytes)
-{
-- size_t i;
-- size_t size = sizeof(unsigned long);
+- int i;
+- int size = sizeof(unsigned long);
- for(i = 1; i <= bytes; ++i){
- *gl2ps->compress->src = (Bytef)(0xff & (data >> (size-i) * 8));
- ++gl2ps->compress->src;
@@ -452,7 +454,7 @@ Author: Thomas Weber <tweber at debian.org>
- return ret;
-}
-
--static void gl2psPrintGzipHeader()
+-static void gl2psPrintGzipHeader(void)
-{
-#if defined(GL2PS_HAVE_ZLIB)
- char tmp[10] = {'\x1f', '\x8b', /* magic numbers: 0x1f, 0x8b */
@@ -470,7 +472,7 @@ Author: Thomas Weber <tweber at debian.org>
-#endif
-}
-
--static void gl2psPrintGzipFooter()
+-static void gl2psPrintGzipFooter(void)
-{
-#if defined(GL2PS_HAVE_ZLIB)
- int n;
@@ -800,6 +802,7 @@ Author: Thomas Weber <tweber at debian.org>
-
-static void gl2psUserFlushPNG(png_structp png_ptr)
-{
+- (void) png_ptr; /* not used */
-}
-
-static void gl2psConvertPixmapToPNG(GL2PSimage *pixmap, GL2PSlist *png)
@@ -1369,17 +1372,17 @@ Author: Thomas Weber <tweber at debian.org>
- (*t2)->verts[0] = quad->verts[0];
- (*t2)->verts[1] = quad->verts[2];
- (*t2)->verts[2] = quad->verts[3];
-- (*t2)->boundary = ((quad->boundary & 4) ? 2 : 0) | ((quad->boundary & 4) ? 2 : 0);
+- (*t2)->boundary = ((quad->boundary & 4) ? 2 : 0) | ((quad->boundary & 8) ? 4 : 0);
-}
-
-static int gl2psCompareDepth(const void *a, const void *b)
-{
-- GL2PSprimitive *q, *w;
+- const GL2PSprimitive *q, *w;
- GLfloat dq = 0.0F, dw = 0.0F, diff;
- int i;
-
-- q = *(GL2PSprimitive**)a;
-- w = *(GL2PSprimitive**)b;
+- q = *(const GL2PSprimitive* const*)a;
+- w = *(const GL2PSprimitive* const*)b;
-
- for(i = 0; i < q->numverts; i++){
- dq += q->verts[i].xyz[2];
@@ -1405,10 +1408,10 @@ Author: Thomas Weber <tweber at debian.org>
-
-static int gl2psTrianglesFirst(const void *a, const void *b)
-{
-- GL2PSprimitive *q, *w;
+- const GL2PSprimitive *q, *w;
-
-- q = *(GL2PSprimitive**)a;
-- w = *(GL2PSprimitive**)b;
+- q = *(const GL2PSprimitive* const*)a;
+- w = *(const GL2PSprimitive* const*)b;
- return (q->type < w->type ? 1 : -1);
-}
-
@@ -1625,7 +1628,7 @@ Author: Thomas Weber <tweber at debian.org>
- }
-}
-
--static void gl2psRescaleAndOffset()
+-static void gl2psRescaleAndOffset(void)
-{
- GL2PSprimitive *prim;
- GLfloat minZ, maxZ, rangeZ, scaleZ;
@@ -3212,7 +3215,7 @@ Author: Thomas Weber <tweber at debian.org>
- int i;
-
- if(gl2ps->filename && strlen(gl2ps->filename) < 256){
-- for(i = strlen(gl2ps->filename)-1; i >= 0; i--){
+- for(i = (int)strlen(gl2ps->filename) - 1; i >= 0; i--){
- if(gl2ps->filename[i] == '.'){
- strncpy(name, gl2ps->filename, i);
- name[i] = '\0';
@@ -3317,6 +3320,7 @@ Author: Thomas Weber <tweber at debian.org>
-
-static void gl2psPrintTeXBeginViewport(GLint viewport[4])
-{
+- (void) viewport; /* not used */
- glRenderMode(GL_FEEDBACK);
-
- if(gl2ps->header){
@@ -3420,7 +3424,7 @@ Author: Thomas Weber <tweber at debian.org>
- cnt, text->fontsize, x, y, text->str);
- }
- else{
-- rad = (GLfloat)M_PI * text->angle / 180.0F;
+- rad = (GLfloat)(M_PI * text->angle / 180.0F);
- srad = (GLfloat)sin(rad);
- crad = (GLfloat)cos(rad);
- gl2ps->streamlength += gl2psPrintf
@@ -4181,8 +4185,7 @@ Author: Thomas Weber <tweber at debian.org>
-/* Put vertex' edge flag (8bit) and coordinates (32bit) in shader stream */
-
-static int gl2psPrintPDFShaderStreamDataCoord(GL2PSvertex *vertex,
-- size_t (*action)(unsigned long data,
-- size_t size),
+- int (*action)(unsigned long data, int size),
- GLfloat dx, GLfloat dy,
- GLfloat xmin, GLfloat ymin)
-{
@@ -4228,8 +4231,7 @@ Author: Thomas Weber <tweber at debian.org>
-/* Put vertex' rgb value (8bit for every component) in shader stream */
-
-static int gl2psPrintPDFShaderStreamDataRGB(GL2PSvertex *vertex,
-- size_t (*action)(unsigned long data,
-- size_t size))
+- int (*action)(unsigned long data, int size))
-{
- int offs = 0;
- unsigned long imap;
@@ -4253,8 +4255,7 @@ Author: Thomas Weber <tweber at debian.org>
-/* Put vertex' alpha (8/16bit) in shader stream */
-
-static int gl2psPrintPDFShaderStreamDataAlpha(GL2PSvertex *vertex,
-- size_t (*action)(unsigned long data,
-- size_t size),
+- int (*action)(unsigned long data, int size),
- int sigbyte)
-{
- int offs = 0;
@@ -4281,8 +4282,7 @@ Author: Thomas Weber <tweber at debian.org>
-static int gl2psPrintPDFShaderStreamData(GL2PStriangle *triangle,
- GLfloat dx, GLfloat dy,
- GLfloat xmin, GLfloat ymin,
-- size_t (*action)(unsigned long data,
-- size_t size),
+- int (*action)(unsigned long data, int size),
- int gray)
-{
- int i, offs = 0;
@@ -4500,8 +4500,7 @@ Author: Thomas Weber <tweber at debian.org>
-/* Similar groups of functions for pixmaps and text */
-
-static int gl2psPrintPDFPixmapStreamData(GL2PSimage *im,
-- size_t (*action)(unsigned long data,
-- size_t size),
+- int (*action)(unsigned long data, int size),
- int gray)
-{
- int x, y, shift;
@@ -5042,6 +5041,7 @@ Author: Thomas Weber <tweber at debian.org>
- gl2psPrintf("\"/>\n");
- gl2psListDelete(png);
-#else
+- (void) x; (void) y; (void) pixmap; /* not used */
- gl2psMsg(GL2PS_WARNING, "GL2PS must be compiled with PNG support in "
- "order to embed images in SVG streams");
-#endif
@@ -5853,7 +5853,8 @@ Author: Thomas Weber <tweber at debian.org>
- const void *pixels)
-{
- int size, i;
-- GLfloat pos[4], *piv, zoom_x, zoom_y;
+- const GLfloat *piv;
+- GLfloat pos[4], zoom_x, zoom_y;
- GL2PSprimitive *prim;
- GLboolean valid;
-
@@ -5905,7 +5906,7 @@ Author: Thomas Weber <tweber at debian.org>
- prim->data.image->format = GL_RGB;
- size = height * width * 3;
- prim->data.image->pixels = (GLfloat*)gl2psMalloc(size * sizeof(GLfloat));
-- piv = (GLfloat*)pixels;
+- piv = (const GLfloat*)pixels;
- for(i = 0; i < size; ++i, ++piv){
- prim->data.image->pixels[i] = *piv;
- if(!((i + 1) % 3))
@@ -5950,7 +5951,7 @@ Author: Thomas Weber <tweber at debian.org>
- glPassThrough((GLfloat)width);
- glPassThrough((GLfloat)height);
- for(i = 0; i < size; i += sizeoffloat){
-- float *value = (float*)imagemap;
+- const float *value = (const float*)imagemap;
- glPassThrough(*value);
- imagemap += sizeoffloat;
- }
@@ -6088,10 +6089,10 @@ Author: Thomas Weber <tweber at debian.org>
-}
--- a/src/gl2ps.h
+++ /dev/null
-@@ -1,199 +0,0 @@
+@@ -1,200 +0,0 @@
-/*
- * GL2PS, an OpenGL to PostScript Printing Library
-- * Copyright (C) 1999-2009 C. Geuzaine
+- * Copyright (C) 1999-2011 C. Geuzaine
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of either:
@@ -6137,6 +6138,7 @@ Author: Thomas Weber <tweber at debian.org>
-# pragma warning(disable:4115)
-# pragma warning(disable:4996)
-# endif
+-# define WIN32_LEAN_AND_MEAN
-# include <windows.h>
-# if defined(GL2PSDLL)
-# if defined(GL2PSDLL_EXPORTS)
@@ -6171,14 +6173,14 @@ Author: Thomas Weber <tweber at debian.org>
-
-#define GL2PS_MAJOR_VERSION 1
-#define GL2PS_MINOR_VERSION 3
--#define GL2PS_PATCH_VERSION 5
+-#define GL2PS_PATCH_VERSION 6
-#define GL2PS_EXTRA_VERSION ""
-
-#define GL2PS_VERSION (GL2PS_MAJOR_VERSION + \
- 0.01 * GL2PS_MINOR_VERSION + \
- 0.0001 * GL2PS_PATCH_VERSION)
-
--#define GL2PS_COPYRIGHT "(C) 1999-2009 C. Geuzaine"
+-#define GL2PS_COPYRIGHT "(C) 1999-2011 C. Geuzaine"
-
-/* Output file formats (the values and the ordering are important!) */
-
@@ -6330,7 +6332,7 @@ Author: Thomas Weber <tweber at debian.org>
graphics.h.in \
mk-errno-list \
mk-pkg-add \
-@@ -246,7 +245,6 @@
+@@ -247,7 +246,6 @@
error.h \
file-io.h \
gl-render.h \
@@ -6338,7 +6340,7 @@ Author: Thomas Weber <tweber at debian.org>
gl2ps-renderer.h \
graphics-props.cc \
gripes.h \
-@@ -463,7 +461,6 @@
+@@ -467,7 +465,6 @@
utils.cc \
variables.cc \
xdiv.cc \
@@ -6346,17 +6348,9 @@ Author: Thomas Weber <tweber at debian.org>
xnorm.cc \
xpow.cc \
zfstream.cc \
-@@ -570,6 +567,7 @@
- $(FT2_LDFLAGS) $(FT2_LIBS) \
- $(HDF5_LDFLAGS) $(HDF5_LIBS) $(Z_LDFLAGS) $(Z_LIBS) \
- $(OPENGL_LIBS) $(X11_LIBS) $(CARBON_LIBS) \
-+ $(GL2PS_LDFLAGS) $(GL2PS_LIBS)\
- $(READLINE_LIBS) $(TERM_LIBS) \
- $(LIBGLOB) \
- $(LAPACK_LIBS) $(BLAS_LIBS) \
--- a/configure.ac
+++ b/configure.ac
-@@ -920,6 +920,16 @@
+@@ -943,6 +943,16 @@
AC_SUBST(GRAPHICS_CFLAGS)
AC_SUBST(GRAPHICS_LIBS)
@@ -6471,3 +6465,24 @@ Author: Thomas Weber <tweber at debian.org>
+ m4_ifnblank([$4], [$4]),
+ m4_ifnblank([$5], [$5]))
+])
+--- a/src/link-deps.mk
++++ b/src/link-deps.mk
+@@ -13,14 +13,16 @@
+ $(Z_LIBS) \
+ $(OPENGL_LIBS) \
+ $(X11_LIBS) \
+- $(CARBON_LIBS)
++ $(CARBON_LIBS) \
++ $(GL2PS_LIBS)
+
+ LIBOCTINTERP_LINK_OPTS = \
+ $(GRAPHICS_LDFLAGS) \
+ $(FT2_LDFLAGS) \
+ $(HDF5_LDFLAGS) \
+ $(Z_LDFLAGS) \
+- $(REGEX_LDFLAGS)
++ $(REGEX_LDFLAGS) \
++ $(GL2PS_LDFLAGS)
+
+ OCT_LINK_DEPS =
+
--
Debian packaging for octave
More information about the Pkg-octave-commit
mailing list