r46607 - in /packages/geomview/trunk/debian: changelog control patches/05_math2oogl_mayhem.patch patches/06_oogl2rib_mayhem.patch patches/07_oogl2vrml_mayhem.patch patches/08_oogl2vrml2_mayhem.patch patches/09_anytoucd_mayhem.patch
smr at users.alioth.debian.org
smr at users.alioth.debian.org
Tue Apr 1 06:12:27 UTC 2014
Author: smr
Date: Tue Apr 1 06:12:27 2014
New Revision: 46607
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=46607
Log:
Commit the 1.9.4-4.1 NMU patch.
Added:
packages/geomview/trunk/debian/patches/05_math2oogl_mayhem.patch
packages/geomview/trunk/debian/patches/06_oogl2rib_mayhem.patch
packages/geomview/trunk/debian/patches/07_oogl2vrml_mayhem.patch
packages/geomview/trunk/debian/patches/08_oogl2vrml2_mayhem.patch
packages/geomview/trunk/debian/patches/09_anytoucd_mayhem.patch
Modified:
packages/geomview/trunk/debian/changelog
packages/geomview/trunk/debian/control
Modified: packages/geomview/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/geomview/trunk/debian/changelog?rev=46607&op=diff
==============================================================================
--- packages/geomview/trunk/debian/changelog (original)
+++ packages/geomview/trunk/debian/changelog Tue Apr 1 06:12:27 2014
@@ -1,3 +1,16 @@
+geomview (1.9.4-4.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * control: Add missing dependency for the dev package. (Closes: #715082)
+ * control: Depend on alternative pdf-viewer. (Closes: #567772)
+ * new patch 05_math2oogl_mayhem.patch (Closes: #716299)
+ * new patch 06_oogl2rib_mayhem.patch (Closes: #716186)
+ * new patch 07_oogl2vrml_mayhem.patch (Closes: #716183)
+ * new patch 08_oogl2vrml2_mayhem.patch (Closes: #716180)
+ * new patch 09_anytoucd_mayhem.patch (Closes: #715637)
+
+ -- Maximiliano Curia <maxy at debian.org> Sun, 11 Aug 2013 14:26:47 +0200
+
geomview (1.9.4-4) unstable; urgency=low
* control: Change lestif --> motif. Closes: #714659.
Modified: packages/geomview/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/geomview/trunk/debian/control?rev=46607&op=diff
==============================================================================
--- packages/geomview/trunk/debian/control (original)
+++ packages/geomview/trunk/debian/control Tue Apr 1 06:12:27 2014
@@ -12,7 +12,7 @@
Package: geomview
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, dpkg (>= 1.15.4) | install-info
-Recommends: xpdf
+Recommends: xpdf | pdf-viewer
Description: interactive geometry viewing program
Geomview is interactive geometry software which is
particularly appropriate for mathematics research and education.
@@ -45,7 +45,7 @@
Package: libgeomview-dev
Section: math
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, libgeomview-1.9.4 (= ${binary:Version})
Description: geomview library development package
Geomview is interactive geometry software which is
particularly appropriate for mathematics research and education.
Added: packages/geomview/trunk/debian/patches/05_math2oogl_mayhem.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/geomview/trunk/debian/patches/05_math2oogl_mayhem.patch?rev=46607&op=file
==============================================================================
--- packages/geomview/trunk/debian/patches/05_math2oogl_mayhem.patch (added)
+++ packages/geomview/trunk/debian/patches/05_math2oogl_mayhem.patch Tue Apr 1 06:12:27 2014
@@ -0,0 +1,12 @@
+diff -Naru geomview-1.9.4.old/src/bin/geomutil/math2oogl/math2oogl.c geomview-1.9.4/src/bin/geomutil/math2oogl/math2oogl.c
+--- geomview-1.9.4.old/src/bin/geomutil/math2oogl/math2oogl.c 2007-04-06 18:10:23.000000000 +0200
++++ geomview-1.9.4/src/bin/geomutil/math2oogl/math2oogl.c 2013-08-10 12:48:31.475464507 +0200
+@@ -331,7 +331,7 @@
+ if (!lastline)
+ lastline = lines = malloc(sizeof(struct line));
+ else {
+- if (toss) lastline = prev;
++ if (toss && prev) lastline = prev;
+ toss = 0;
+ prev = lastline;
+ lastline = lastline->next = malloc (sizeof(struct line));
Added: packages/geomview/trunk/debian/patches/06_oogl2rib_mayhem.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/geomview/trunk/debian/patches/06_oogl2rib_mayhem.patch?rev=46607&op=file
==============================================================================
--- packages/geomview/trunk/debian/patches/06_oogl2rib_mayhem.patch (added)
+++ packages/geomview/trunk/debian/patches/06_oogl2rib_mayhem.patch Tue Apr 1 06:12:27 2014
@@ -0,0 +1,39 @@
+diff -Naru geomview-1.9.4.old/src/bin/geomutil/oogl2rib/oogl2rib.c geomview-1.9.4/src/bin/geomutil/oogl2rib/oogl2rib.c
+--- geomview-1.9.4.old/src/bin/geomutil/oogl2rib/oogl2rib.c 2013-08-10 12:48:31.479464596 +0200
++++ geomview-1.9.4/src/bin/geomutil/oogl2rib/oogl2rib.c 2013-08-11 12:17:59.564486949 +0200
+@@ -215,7 +215,7 @@
+ if(framebuffer) display = MG_RIBFRAME;
+ else display = MG_RIBTIFF;
+
+- mgctxcreate(MG_RIBFILE, outfileFD,
++ if (! mgctxcreate(MG_RIBFILE, outfileFD,
+ MG_RIBFORMAT, MG_RIBASCII,
+ MG_RIBBACKING, MG_RIBNOBG,
+ MG_WINDOW, win,
+@@ -223,7 +223,9 @@
+ MG_APPEAR, ap,
+ MG_RIBDISPLAY, display,
+ MG_RIBDISPLAYNAME, name,
+- MG_END );
++ MG_END )) {
++ exit(2);
++ }
+
+ if(doback) {
+ mgctxset(
+@@ -242,11 +244,13 @@
+ MT_END,
+ AP_LGT, lighting,
+ AP_END);
+- mgctxcreate(MG_RIBFILE, outfileFD,
++ if (! mgctxcreate(MG_RIBFILE, outfileFD,
+ MG_SHOW, 0, /* overides Format & Display */
+ MG_RIBFORMAT, MG_RIBASCII,
+ MG_APPEAR, ap,
+- MG_END);
++ MG_END)) {
++ exit(2);
++ }
+ }
+
+ ageom = GeomFLoad(iobfileopen(infileFD), infile);
Added: packages/geomview/trunk/debian/patches/07_oogl2vrml_mayhem.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/geomview/trunk/debian/patches/07_oogl2vrml_mayhem.patch?rev=46607&op=file
==============================================================================
--- packages/geomview/trunk/debian/patches/07_oogl2vrml_mayhem.patch (added)
+++ packages/geomview/trunk/debian/patches/07_oogl2vrml_mayhem.patch Tue Apr 1 06:12:27 2014
@@ -0,0 +1,12 @@
+diff -Naru geomview-1.9.4.old/src/bin/geomutil/oogl2vrml/oogl2vrml.c geomview-1.9.4/src/bin/geomutil/oogl2vrml/oogl2vrml.c
+--- geomview-1.9.4.old/src/bin/geomutil/oogl2vrml/oogl2vrml.c 2013-08-11 13:38:46.013870505 +0200
++++ geomview-1.9.4/src/bin/geomutil/oogl2vrml/oogl2vrml.c 2013-08-11 13:47:26.097304281 +0200
+@@ -456,7 +456,7 @@
+ f = stdout;
+
+ while (argc > 1 && argv[1][0] == '-' && argv[1][1] != '\0') {
+- if (argv[1][1] == 'b') {
++ if (argc > 2 && argv[1][1] == 'b') {
+ bezdice = atoi(argv[2]); argc--; argv++;
+ } else if (argv[1][1] == 's') {
+ flat = 0;
Added: packages/geomview/trunk/debian/patches/08_oogl2vrml2_mayhem.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/geomview/trunk/debian/patches/08_oogl2vrml2_mayhem.patch?rev=46607&op=file
==============================================================================
--- packages/geomview/trunk/debian/patches/08_oogl2vrml2_mayhem.patch (added)
+++ packages/geomview/trunk/debian/patches/08_oogl2vrml2_mayhem.patch Tue Apr 1 06:12:27 2014
@@ -0,0 +1,12 @@
+diff -Naru geomview-1.9.4.old/src/bin/geomutil/oogl2vrml/oogl2vrml2.c geomview-1.9.4/src/bin/geomutil/oogl2vrml/oogl2vrml2.c
+--- geomview-1.9.4.old/src/bin/geomutil/oogl2vrml/oogl2vrml2.c 2013-08-11 13:38:46.013870505 +0200
++++ geomview-1.9.4/src/bin/geomutil/oogl2vrml/oogl2vrml2.c 2013-08-11 13:50:18.593109306 +0200
+@@ -664,7 +664,7 @@
+ f = stdout;
+
+ while (argc > 1 && argv[1][0] == '-' && argv[1][1] != '\0') {
+- if (argv[1][1] == 'b') {
++ if (argc > 2 && argv[1][1] == 'b') {
+ bezdice = atoi(argv[2]); argc--; argv++;
+ } else if (argv[1][1] == 's') {
+ flat = 0;
Added: packages/geomview/trunk/debian/patches/09_anytoucd_mayhem.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/geomview/trunk/debian/patches/09_anytoucd_mayhem.patch?rev=46607&op=file
==============================================================================
--- packages/geomview/trunk/debian/patches/09_anytoucd_mayhem.patch (added)
+++ packages/geomview/trunk/debian/patches/09_anytoucd_mayhem.patch Tue Apr 1 06:12:27 2014
@@ -0,0 +1,15 @@
+diff -Naru geomview-1.9.4.old/src/bin/geomutil/ucd/anytoucd.c geomview-1.9.4/src/bin/geomutil/ucd/anytoucd.c
+--- geomview-1.9.4.old/src/bin/geomutil/ucd/anytoucd.c 2013-08-11 14:16:28.659029232 +0200
++++ geomview-1.9.4/src/bin/geomutil/ucd/anytoucd.c 2013-08-11 14:21:09.613760179 +0200
+@@ -298,8 +298,10 @@
+ TmIdentity(id);
+ thisgeom = GeomFLoad(iobfileopen(stdin), NULL);
+ thispl = (PolyList *)AnyToPL(thisgeom, id);
+- if (initstack() == 0)
++ if (!thispl || (initstack() == 0)) {
+ OOGLError(1,"anytoucd: unable to init stack\n");
++ exit(1);
++ }
+
+ cp = OOGLNew(polygon);
+ CP = &thisPoly;
More information about the debian-science-commits
mailing list