[gle-graphics] 08/23: Import Debian changes 4.2.3b-1

Christian T. Steigies cts at moszumanska.debian.org
Tue Oct 31 18:25:35 UTC 2017


This is an automated email from the git hooks/post-receive script.

cts pushed a commit to branch master
in repository gle-graphics.

commit 9f57f0852a017e0a01c6700026144ddf8baab1cc
Merge: 5ffe16c 7850d1c
Author: Christian T. Steigies <cts at debian.org>
Date:   Thu Oct 20 22:15:27 2011 +0200

    Import Debian changes 4.2.3b-1
    
    gle-graphics (4.2.3b-1) unstable; urgency=low
    
      * new upstream version
      * switch from cdbs to debhelper 8
      * update copyright file
      * do no rely on proc on non-linux systems (closes: #644588)
      * do not ship glebtool, which is a helper used only during build
      * add libqt4-opengl-dev to build-depends
    
    gle-graphics (4.2.2-6) unstable; urgency=low
    
      * define PATH_MAX to fix building on gnu-hurd

 LICENSE.txt                                        |  130 +-
 Makefile.in                                        |  141 +-
 config.i                                           |    2 +-
 config.nocygwin                                    |   67 +
 configure                                          |  110 +-
 configure.ac                                       |   82 +-
 contrib/packagers/nsis/gle.nsi                     |   11 +-
 debian/changelog                                   |   17 +
 debian/compat                                      |    2 +-
 debian/control                                     |    3 +-
 debian/copyright                                   |  312 +-
 debian/create_orig_tar_gz.sh                       |    2 +-
 debian/patches/hurd_path_max                       |   18 +
 debian/patches/kfreebsd-buildd-has-no-proc         |   21 +
 debian/patches/qgle.pro.in                         |   19 +-
 debian/patches/series                              |    2 +
 debian/rules                                       |   40 +-
 debian/stamp-patched                               |    0
 gle-refman/appendix/appendix.tex                   |    1 +
 gle-refman/appendix/sym.tex                        |   61 +-
 gle-refman/bla.gle                                 |   16 -
 gle-refman/fonttest/Makefile.gcc                   |    5 +-
 gle-refman/gle-manual.tex                          |    4 +-
 gle-refman/graph/fig/Makefile.gcc                  |    2 +-
 gle-refman/graph/fig/gc_bargraph_3d.gle            |    2 +-
 gle-refman/graph/fig/gc_logsubticks.gle            |   10 +-
 .../fig/gaussian.gle => graph/fig/gridmode.gle}    |  120 +-
 gle-refman/graph/fig/noisysine.gle                 |   12 +-
 .../gaussian.gle => graph/fig/y2axis-scale.gle}    |   33 +-
 gle-refman/graph/graph.tex                         |   85 +-
 gle-refman/primitives/cmds.tex                     |   34 +-
 gle-refman/primitives/fig/gc_arc.gle               |    8 +-
 gle-refman/primitives/fig/gc_text.gle              |    6 +-
 gle-refman/prog/fig/axisformat.gle                 |   14 +-
 gle-refman/prog/prog.tex                           |   32 +-
 gle-refman/{gle-manual.tex => qgle/qgle.tex}       |   82 +-
 gle-refman/qgle/screenshot/qgle-windows1.png       |  Bin 0 -> 154227 bytes
 gle-refman/title/title.tex                         |    2 +-
 gle-refman/utilities/contour.tex                   |    2 +-
 gle-refman/utilities/fig/gaussian.gle              |    2 +-
 platform/autoconf/config.guess                     |  242 +-
 platform/autoconf/config.sub                       |  122 +-
 platform/mac/build-path.sh                         |   25 +
 platform/mac/conf-static.src                       |    9 +
 platform/script/killspace                          |    2 +-
 platform/script/srcfiles.csv                       |  118 +-
 src/doc/gle.1.in                                   |    2 +
 src/fonts/Makefile.gcc                             |   46 +-
 src/fonts/Makefile.os2                             |   10 +-
 src/fonts/Makefile.vc                              |   10 +-
 src/fonts/cyrillic/arial8.afm                      |  244 ++
 src/fonts/cyrillic/arialbd8.afm                    |  244 ++
 src/fonts/cyrillic/arialbi8.afm                    |  244 ++
 src/fonts/cyrillic/ariali8.afm                     |  244 ++
 src/fonts/cyrillic/cokoi8b.afm                     |  244 ++
 src/fonts/cyrillic/cokoi8bi.afm                    |  244 ++
 src/fonts/cyrillic/cokoi8i.afm                     |  244 ++
 src/fonts/cyrillic/cokoi8n.afm                     |  244 ++
 src/fonts/cyrillic/times8.afm                      |  244 ++
 src/fonts/cyrillic/timesbd8.afm                    |  244 ++
 src/fonts/cyrillic/timesbi8.afm                    |  244 ++
 src/fonts/cyrillic/timesi8.afm                     |  244 ++
 src/fonts/font.dat                                 |   18 +-
 src/fonts/koi8r.enc                                |  261 ++
 .../surface/Makefile.vc => fonts/mkencoding.pl}    |  111 +-
 src/fonts/plba.afm                                 |  116 +
 src/fonts/plba.gle                                 | 1646 ++++++++
 src/fonts/plcc.afm                                 |  115 +
 src/fonts/plcc.gle                                 | 2257 +++++++++++
 src/fonts/plcg.afm                                 |  115 +
 src/fonts/plcg.gle                                 | 1954 ++++++++++
 src/fonts/plci.afm                                 |  115 +
 src/fonts/plci.gle                                 | 2012 ++++++++++
 src/fonts/plcr.afm                                 |  115 +
 src/fonts/plcr.gle                                 | 1882 +++++++++
 src/fonts/plcs.afm                                 |  115 +
 src/fonts/plcs.gle                                 | 2702 +++++++++++++
 src/fonts/pldr.afm                                 |  115 +
 src/fonts/pldr.gle                                 | 2254 +++++++++++
 src/fonts/plge.afm                                 |  115 +
 src/fonts/plge.gle                                 | 3798 ++++++++++++++++++
 src/fonts/plgg.afm                                 |  115 +
 src/fonts/plgg.gle                                 | 4055 ++++++++++++++++++++
 src/fonts/plgi.afm                                 |  115 +
 src/fonts/plgi.gle                                 | 3252 ++++++++++++++++
 src/fonts/plsa.afm                                 |  116 +
 src/fonts/plsa.gle                                 | 1025 +++++
 src/fonts/plsg.afm                                 |  115 +
 src/fonts/plsg.gle                                 | 1492 +++++++
 src/fonts/plsr.afm                                 |  115 +
 src/fonts/plsr.gle                                 | 1304 +++++++
 src/fonts/plss.afm                                 |  115 +
 src/fonts/plss.gle                                 | 2068 ++++++++++
 src/fonts/plsym1.afm                               |  174 +
 src/fonts/plsym1.gle                               | 2868 ++++++++++++++
 src/fonts/plsym2.afm                               |  162 +
 src/fonts/plsym2.gle                               | 3802 ++++++++++++++++++
 src/fonts/plti.afm                                 |  115 +
 src/fonts/plti.gle                                 | 2636 +++++++++++++
 src/fonts/pltr.afm                                 |  115 +
 src/fonts/pltr.gle                                 | 3368 ++++++++++++++++
 src/fonts/psfont.dat                               |   12 +
 src/fonts/pshc.afm                                 |  446 +++
 src/fonts/pshcb.afm                                |  446 +++
 src/fonts/pshcbo.afm                               |  446 +++
 src/fonts/pshcdo.afm                               |  446 +++
 src/gle/Makefile.in                                |   16 +-
 src/gle/axis.cpp                                   |  102 +-
 src/gle/axis.h                                     |   14 +-
 src/gle/bitmap/Makefile.vc                         |    2 +-
 src/gle/builtin-double.cpp                         |   25 +
 src/gle/builtin-double.h                           |   19 +
 src/gle/cmdline.cpp                                |   10 +
 src/gle/cmdline.h                                  |    2 +
 src/gle/color.cpp                                  |    6 +
 src/gle/config.cpp                                 |   27 +-
 src/gle/config.h                                   |    3 +
 src/gle/core.cpp                                   |  313 +-
 src/gle/core.h                                     |    5 +-
 src/gle/cutils.cpp                                 |    2 +-
 src/gle/cutils.h                                   |    2 +-
 src/gle/d_cairo.cpp                                |  422 +-
 src/gle/d_interface.h                              |   50 +-
 src/gle/d_ps.cpp                                   |   17 +-
 src/gle/drawit.cpp                                 |   25 +-
 src/gle/eval.cpp                                   |    9 +
 src/gle/file_io.cpp                                |   27 +-
 src/gle/file_io.h                                  |    2 +
 src/gle/files.txt                                  |    4 +-
 src/gle/fn.cpp                                     |    3 +-
 src/gle/fn.h                                       |    2 +-
 src/gle/gle-interface.cpp                          |   59 +-
 src/gle/gle-interface/gle-const.h                  |    7 +-
 src/gle/gle-interface/gle-datatype.h               |    4 +
 src/gle/gle-interface/gle-interface.h              |   76 +-
 src/gle/gle-sourcefile.cpp                         |    2 +-
 src/gle/gle.cpp                                    |  148 +-
 src/gle/glearray.cpp                               |  229 +-
 src/gle/glearray.h                                 |   45 +
 src/gle/{setrelpath.cpp => glebtool.cpp}           |   40 +-
 src/gle/glec.cpp                                   |   58 +-
 src/gle/glepro.h                                   |    3 +-
 src/gle/gprint.cpp                                 |   30 +-
 src/gle/graph.cpp                                  |  763 ++--
 src/gle/graph.h                                    |   24 +-
 src/gle/graph2.cpp                                 |  680 ++--
 src/gle/key.cpp                                    |    5 +-
 src/gle/letzfitz/Makefile.vc                       |    2 +-
 src/gle/letzfitz/fit.cpp                           |   14 +-
 src/gle/letzfitz/let.cpp                           |    7 +-
 src/gle/numberformat.cpp                           |   22 +-
 src/gle/pass.cpp                                   |   44 +-
 src/gle/pass.h                                     |    2 +
 src/gle/polish.cpp                                 |   19 +-
 src/gle/polish.h                                   |    1 +
 src/gle/run.cpp                                    |   16 +-
 src/gle/sub.cpp                                    |  103 +-
 src/gle/sub.h                                      |   82 +
 src/gle/surface/Makefile.vc                        |    2 +-
 src/gle/surface/gcontour.cpp                       |    8 +-
 src/gle/surface/gsurface.cpp                       |   35 +-
 src/gle/surface/gsurface.h                         |   12 +-
 src/gle/surface/hide.cpp                           |  137 +-
 src/gle/tex.cpp                                    |    5 +-
 src/gle/texinterface.cpp                           |  146 +-
 src/gle/texinterface.h                             |   10 +-
 src/gle/tokens/Makefile.vc                         |    2 +-
 src/gle/tokens/Tokenizer.cpp                       |   89 +-
 src/gle/tokens/Tokenizer.h                         |    6 +
 src/gui/3dviewer.cpp                               |  324 ++
 src/gui/{about.h => 3dviewer.h}                    |   79 +-
 src/gui/about.cpp                                  |  153 +-
 src/gui/about.h                                    |   23 +-
 src/gui/about.html                                 |   24 +
 src/gui/dialogues.cpp                              |   46 +-
 src/gui/dialogues.h                                |    4 +-
 src/gui/gledrawing.cpp                             |    1 +
 src/gui/images/gle_shadow.png                      |  Bin 0 -> 17246 bytes
 src/gui/main.cpp                                   |   34 +-
 src/gui/mainwindow.cpp                             |  105 +-
 src/gui/mainwindow.h                               |   15 +-
 src/gui/qgle.pro.in                                |    8 +-
 src/gui/qgle.qrc                                   |    2 +
 src/gui/qgle_definitions.h                         |    3 -
 src/gui/qgs.cpp                                    |   48 +-
 src/gui/qgs.h                                      |    4 +
 src/gui/serverthread.cpp                           |  193 +-
 src/gui/serverthread.h                             |   13 +-
 src/gui/settings_dialogue.cpp                      |   21 +-
 src/gui/settings_dialogue.h                        |    3 +-
 src/lib/color.gle                                  |   10 +-
 src/lib/contour.gle                                |    4 +-
 src/lib/electronics.gle                            |   68 +-
 src/lib/graphutil.gle                              |    1 +
 src/lib/polarplot.gle                              |   30 +
 src/makefmt/Makefile.gcc                           |    2 +-
 src/makefmt/Makefile.os2                           |    2 +-
 src/makefmt/Makefile.vc                            |    2 +-
 src/makefmt/parseAFM.cpp                           |   21 +-
 src/manip/Makefile.dj                              |  150 +-
 src/manip/polish.cpp                               |    2 +-
 src/samples/Makefile.gcc                           |    8 +-
 src/samples/Makefile.vc                            |    4 +-
 203 files changed, 56902 insertions(+), 2316 deletions(-)

diff --cc debian/changelog
index c45f972,0000000..1093cf3
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,101 -1,0 +1,118 @@@
++gle-graphics (4.2.3b-1) unstable; urgency=low
++
++  * new upstream version
++  * switch from cdbs to debhelper 8
++  * update copyright file
++  * do no rely on proc on non-linux systems (closes: #644588)
++  * do not ship glebtool, which is a helper used only during build
++  * add libqt4-opengl-dev to build-depends
++
++ -- Christian T. Steigies <cts at debian.org>  Thu, 20 Oct 2011 22:15:27 +0200
++
++gle-graphics (4.2.2-6) unstable; urgency=low
++
++  * define PATH_MAX to fix building on gnu-hurd
++
++ -- Christian T. Steigies <cts at debian.org>  Fri, 07 Oct 2011 21:20:44 +0200
++
 +gle-graphics (4.2.2-5) unstable; urgency=low
 +
 +  * Switch to dpkg-source 3.0 (quilt) format
 +  * qgle: link with -ldl for all unix targets (closes: #554556)
 +  * recommend libgs9 instead of libgs8
 +  * Updated Standards-Version to 3.9.2 (no changes)
 +  * do not ignore make clean errors
 +
 + -- Christian T. Steigies <cts at debian.org>  Thu, 06 Oct 2011 23:10:58 +0200
 +
 +gle-graphics (4.2.2-4) unstable; urgency=low
 +
 +  * add libtool and pkg-config to build-depends
 +
 + -- Christian T. Steigies <cts at debian.org>  Tue, 06 Apr 2010 22:52:09 +0200
 +
 +gle-graphics (4.2.2-3) unstable; urgency=low
 +
 +  * run "autoreconf -vfi" as pre-configure action instead of 
 +    "aclocal && autoconf" as configure action (closes: #571296)
 +  * remove autogenerated aclocal.m4 and configure in clean target
 +  
 + -- Christian T. Steigies <cts at debian.org>  Mon, 05 Apr 2010 21:36:40 +0200
 +
 +gle-graphics (4.2.2-2) unstable; urgency=low
 +
 +  * upload to unstable
 +  * Updated Standards-Version to 3.8.4 (no changes)
 +
 + -- Christian T. Steigies <cts at debian.org>  Wed, 24 Feb 2010 23:21:37 +0100
 +
 +gle-graphics (4.2.2-1) experimental; urgency=low
 +
 +  * new upstream version
 +  * 001-kfreebsd-support patch is included upstream
 +  * configure --with-rpath=no
 +
 + -- Christian T. Steigies <cts at debian.org>  Wed, 20 Jan 2010 22:59:32 +0100
 +
 +gle-graphics (4.2.1-2) experimental; urgency=low
 +
 +  * add patch to allow building on kfreebsd
 +  * Updated Standards-Version to 3.8.3 (no changes)
 +
 + -- Christian T. Steigies <cts at debian.org>  Wed, 09 Sep 2009 00:56:21 +0200
 +
 +gle-graphics (4.2.1-1) experimental; urgency=low
 +
 +  * new upstream version
 +  * added automake and ghostscript to Build-Depends
 +
 + -- Christian T. Steigies <cts at debian.org>  Sat, 05 Sep 2009 22:33:51 +0200
 +
 +gle-graphics (4.2.0-1) experimental; urgency=low
 +
 +  * new upstream version
 +  * rename package to gle-graphics
 +
 + -- Christian T. Steigies <cts at debian.org>  Fri, 17 Apr 2009 00:36:23 +0200
 +
 +glx (4.2.0-1) experimental; urgency=low
 +
 +  * new upstream version
 +  * Updated Standards-Version to 3.8.0 (no changes)
 +  * do not ship LICENSE.txt, this is included in debian/copyright
 +  * addeded simple man and qgle manpages
 +  * build and ship gle-manual.pdf
 +
 + -- Christian T. Steigies <cts at debian.org>  Mon, 13 Apr 2009 14:04:59 +0200
 +
 +glx (4.1.1) experimental; urgency=low
 +
 +  * new upstream version
 +
 + -- Christian T. Steigies <cts at debian.org>  Tue, 26 Feb 2008 23:58:04 +0100
 +
 +glx (4.1.0-rc2-1) experimental; urgency=low
 +
 +  * new upstream version
 +
 + -- Christian T. Steigies <cts at debian.org>  Thu, 22 Nov 2007 22:52:11 +0100
 +
 +glx (4.1.0-rc1-1) experimental; urgency=low
 +
 +  * new upstream version
 +
 + -- Christian T. Steigies <cts at debian.org>  Thu,  4 Oct 2007 00:46:10 +0200
 +
 +glx (4.0.12-1) experimental; urgency=low
 +
 +  * new upstream version
 +  * switch to cdbs, build from upstream "tarball"
 +
 + -- Christian T. Steigies <cts at debian.org>  Wed,  3 Oct 2007 12:08:52 +0200
 +
 +glx (4.0.7-1) unstable; urgency=low
 +
 +  * Initial Release.
 +
 + -- Christian T. Steigies <cts at debian.org>  Sat,  8 Jan 2005 11:31:38 +0100
 +
diff --cc debian/compat
index 7ed6ff8,0000000..45a4fb7
mode 100644,000000..100644
--- a/debian/compat
+++ b/debian/compat
@@@ -1,1 -1,0 +1,1 @@@
- 5
++8
diff --cc debian/control
index ef4d431,0000000..613287b
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,33 -1,0 +1,32 @@@
 +Source: gle-graphics
 +Section: graphics
 +Priority: optional
 +Maintainer: Christian T. Steigies <cts at debian.org>
- Build-Depends: debhelper (>= 5.0.0), cdbs, libtiff-dev, libboost-dev, libqt4-dev, libjpeg-dev, libpng-dev, ncurses-dev, texlive, texlive-latex-extra, automake, ghostscript, libtool, pkg-config
- X-Build-Depends: docbook-to-man
++Build-Depends: debhelper (>= 8.0.0), libtiff-dev, libboost-dev, libqt4-dev, libqt4-opengl-dev, libjpeg-dev, libpng-dev, ncurses-dev, texlive, texlive-latex-extra, automake, ghostscript, libtool, pkg-config
 +Standards-Version: 3.9.2
 +
 +Package: gle-graphics
 +Architecture: any
 +Depends: ${shlibs:Depends}, ${misc:Depends}
 +Recommends: libgs9
 +Description: Interactive Graphics Language Editor
 + GLE  is  a  high  quality  graphics  package for scientists,
 + combining  a  user  friendly  interface with a full range of
 + facilities    for   producing  publication  quality  graphs,
 + diagrams, posters and slides.
 + .
 + GLE  provides LaTeX quality fonts together with a flexible
 + graphics  module  which  allows  the  user  to  specify  any
 + feature  of a graph (down to the line width of the subticks,
 + for example)
 + .
 + Complex  pictures can be drawn with user defined subroutines
 + and simple looping structures.
 + .
 + Current  device  drivers support DECWINDOWS, REGIS, TEK4010,
 + all  PC  graphics  cards,  VT100s,  HP-Plotters,  PostScript
 + Printers, EPSON Printers and LaserJet Printers.
 + .
 + GLE  runs  on  both  VAXes and PCs, giving an identical user
 + interface on both platforms.
 +
diff --cc debian/copyright
index 0bec7e5,0000000..8693373
mode 100644,000000..100644
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,84 -1,0 +1,284 @@@
 +This package was debianized by Christian T. Steigies <cts at debian.org> on
 +Sat,  8 Jan 2005 11:31:38 +0100.
 +
 +It was downloaded from glx.sf.net
 +
 +Files: debian/*
- Copyright: (c) 2005-2009, Christian T. Steigies <cts at debian.org>
++Copyright: (c) 2005-2011, Christian T. Steigies <cts at debian.org>
 +
 +Upstream Authors:
-  A. S. Budden: Programming (QGLE), Packager for Arch Linux.
-  Andrey G. Grozin: Packager for Gentoo Linux.
-  Axel Rohde: 3.3f-h versions. (These were 32 bit DOS and OS/2 ports.)
-  Bryn Jeffries: Programming (Linux).
-  Chris Pugmire: Original program creation and design.
-  Christoph Brendes: Programming.
-  David Parfitt: Documentation (GLE users guide).
-  Edd Edmondson: Packager for Mac OS/X.
-  Jan Struyf: Programming (and current 4.x series maintainer).
-  Laurence Abbott: Programming.
-  Stephen Blundell: Documentation (GLE users guide).
-  Steve Wilkinson: Programming (user interface).
-  Terje Røsten: Maintainer for Fedora Core.
-  Vincent LaBella: Resurrected 3.3h to GLE 4.0 C++ code base.
++ A. S. Budden: programming (QGLE), packager for Arch Linux
++ Andrey G. Grozin: packager for Gentoo Linux
++ Axel Rohde: 3.3f-h versions (these were 32 bit DOS and OS/2 ports)
++ Bryn Jeffries: programming (Linux)
++ Chris Pugmire: original program creation and design
++ Christoph Brendes: programming
++ David Parfitt: documentation (GLE users guide)
++ Edd Edmondson: packager for Mac OS/X
++ Jan Struyf: programming (and current 4.x series maintainer)
++ Laurence Abbott: programming
++ Michal Vyskocil: packager for OpenSUSE
++ Stephen Blundell: documentation (GLE users guide)
++ Steve Wilkinson: programming (user interface)
++ Terje Røsten: packager for Fedora Core
++ Vincent LaBella: resurrected 3.3h to GLE 4.0 C++ code base
++ Zbigniew Kisiel: testing
 +
 +Files: *
- Copyright: (c) 2004 Jan Struyf
- License: BSD
++Copyright: (c) 2009 Jan Struyf
++License: Modified BSD
++License for GLE (Modified BSD)
++------------------------------
 +
- Copyright (c).
- All rights reserved.
++Copyright (C) 2009 GLE.
 +
 +Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
- 
-     * Redistributions of source code must retain the above copyright
-     notice, this list of conditions and the following disclaimer. 
- 
-     * Redistributions in binary form must reproduce the above
-     copyright notice, this list of conditions and the following
-     disclaimer in the documentation and/or other materials provided
-     with the distribution.
- 
-     * Neither the name of GLE nor the names of its contributors may
-     be used to endorse or promote products derived from this software
-     without specific prior written permission.
- 
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
++modification, are permitted provided that the following conditions are met:
 +
- Files: contrib/editors/highlighting/gle-emacs.el
- Copyright: (c) 2009 Kai Nordlund
- License: GPL-2
++   1. Redistributions of source code must retain the above copyright notice,
++this list of conditions and the following disclaimer.
++
++   2. Redistributions in binary form must reproduce the above copyright
++notice, this list of conditions and the following disclaimer in the
++documentation and/or other materials provided with the distribution.
++
++   3. The name of the author may not be used to endorse or promote products
++derived from this software without specific prior written permission.
++
++THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
++WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
++MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
++EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
++SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
++PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
++BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
++IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
++ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
++POSSIBILITY OF SUCH DAMAGE.
 +
 +Files: src/gui/*
 +Copyright: (c) 2006 A. S. Budden & J. Struyf
- License: GPL-2
++License: GPL-2 or later
++
++Files: src/gui/qgs.[cpp|h]
++Copyright: (c) 2005 Piotr Szymanski
++License: LGPL-2.1 or later
++
++Files: contrib/editors/highlighting/gle-emacs.el
++Copyright: (c) 2009 Kai Nordlund
++License: GPL-2 or later
++
++Files: platform/autoconf/config.[guess|sub]
++Copyright: (c) 1992-2010 Free Software Foundation, Inc.
++License: GPL-2 or later
 +
 +Files: src/gui/ellipse.cpp
 +Copyright: (c) 2006 A. S. Budden, S. Wilkinson & J. Struyf
- License: GPL-2
++License: GPL-2 or later
 +
- Files: src/gui/qgs.*
- Copyright: (c) 2005 Piotr Szymanski
++Files: src/gui/gsinc/*
++Copyright: (c) 2001-2006 artofcode LLC
 +License: GPL-2
 +
 +Files: src/gui/qgslibloader.cpp
 +Copyright: (c) 2006 J. Struyf
 +License: GPL-2
-             
++
++Files: contrib/packagers/nsis/AddToPath.nsi
++Copyright: (c)
++License: ZLIB/LIBPNG License
++;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
++;;                                                                                        ;; 
++;; * All NSIS source code, plug-ins, documentation, examples, header files and graphics,  ;;
++;; with the exception of the compression modules and where otherwise noted, are licensed  ;;
++;; under the zlib/libpng license.                                                         ;;
++;;                                                                                        ;;
++;; ZLIB/LIBPNG LICENSE                                                                    ;;
++;; -------------------                                                                    ;;
++;;                                                                                        ;;
++;; This software is provided 'as-is', without any express or implied warranty. In no      ;;
++;; event will the authors be held liable for any damages arising from the use of this     ;;
++;; software.                                                                              ;;
++;;                                                                                        ;;
++;; Permission is granted to anyone to use this software for any purpose, including        ;;
++;; commercial applications, and to alter it and redistribute it freely, subject to the    ;;
++;; following restrictions:                                                                ;;
++;;                                                                                        ;;
++;; 1. The origin of this software must not be misrepresented; you must not claim that you ;;
++;; wrote the original software. If you use this software in a product, an acknowledgment  ;;
++;; in the product documentation would be appreciated but is not required.                 ;;
++;;                                                                                        ;;
++;; 2. Altered source versions must be plainly marked as such, and must not be             ;;
++;; misrepresented as being the original software.                                         ;;
++;;                                                                                        ;;
++;; 3. This notice may not be removed or altered from any source distribution.             ;;
++;;                                                                                        ;;
++;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
++
++Files: platform/autoconf/install-sh
++Copyright: (c) 1994 X Consortium
++License: X11 License
++# This originates from X11R5 (mit/util/scripts/install.sh), which was
++# later released in X11R6 (xc/config/util/install.sh) with the
++# following copyright and license.
++#
++# Copyright (C) 1994 X Consortium
++#
++# Permission is hereby granted, free of charge, to any person obtaining a copy
++# of this software and associated documentation files (the "Software"), to
++# deal in the Software without restriction, including without limitation the
++# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
++# sell copies of the Software, and to permit persons to whom the Software is
++# furnished to do so, subject to the following conditions:
++#
++# The above copyright notice and this permission notice shall be included in
++# all copies or substantial portions of the Software.
++#
++# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
++# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
++# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
++# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
++#
++# Except as contained in this notice, the name of the X Consortium shall not
++# be used in advertising or otherwise to promote the sale, use or other deal-
++# ings in this Software without prior written authorization from the X Consor-
++# tium.
++#
++# FSF changes to this file are in the public domain.
++#
++# Calling this script install-sh is preferred over install.sh, to prevent
++# `make' implicit rules from creating a file called install from it
++# when there is no Makefile.
++#
++# This script is compatible with the BSD install script, but was written
++# from scratch.
++
++
++Files: src/fonts/Adobe-Core35_AFMs-314/
++Copyright: (c) 1985-1997 Adobe Systems Incorporated
++License:
++# Adobe Core 35 AFM Files with 314 Glyph Entries - ReadMe
++#         
++# This file and the 35 PostScript(R) AFM files it
++# accompanies may be used, copied, and distributed for any purpose and
++# without charge, with or without modification, provided that all
++# copyright notices are retained; that the AFM files are not
++# distributed without this file; that all modifications to this file
++# or any of the AFM files are prominently noted in the modified
++# file(s); and that this paragraph is not modified. Adobe Systems has
++# no responsibility or obligation to support the use of the AFM
++# files.
++
++Files: src/makefmt/parseAFM.[cpp|h]
++Copyright: (c) 1988, 1989, 1990 Adobe Systems Incorporated
++License: Adobe License
++*** Adobe License for parseAFM.{c,h} ***
++
++* (C) 1988, 1989, 1990 by Adobe Systems Incorporated. All rights reserved.
++*
++* This file may be freely copied and redistributed as long as:
++*   1) This entire notice continues to be included in the file, 
++*   2) If the file has been modified in any way, a notice of such
++*      modification is conspicuously indicated.
++*
++* PostScript, Display PostScript, and Adobe are registered trademarks of
++* Adobe Systems Incorporated.
++* 
++* ************************************************************************
++* THE INFORMATION BELOW IS FURNISHED AS IS, IS SUBJECT TO CHANGE WITHOUT
++* NOTICE, AND SHOULD NOT BE CONSTRUED AS A COMMITMENT BY ADOBE SYSTEMS
++* INCORPORATED. ADOBE SYSTEMS INCORPORATED ASSUMES NO RESPONSIBILITY OR 
++* LIABILITY FOR ANY ERRORS OR INACCURACIES, MAKES NO WARRANTY OF ANY 
++* KIND (EXPRESS, IMPLIED OR STATUTORY) WITH RESPECT TO THIS INFORMATION, 
++* AND EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES OF MERCHANTABILITY, 
++* FITNESS FOR PARTICULAR PURPOSES AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.
++* ************************************************************************
++
++Files: Makefile.in
++Copyright: (c) 2006-2009 Remko Tronçon
++License: MIT
++* Copyright (c) 2006-2009 Remko Tronçon
++* 
++* Permission is hereby granted, free of charge, to any person
++* obtaining a copy of this software and associated documentation
++* files (the "Software"), to deal in the Software without
++* restriction, including without limitation the rights to use,
++* copy, modify, merge, publish, distribute, sublicense, and/or sell
++* copies of the Software, and to permit persons to whom the
++* Software is furnished to do so, subject to the following
++* conditions:
++* 
++* The above copyright notice and this permission notice shall be
++* included in all copies or substantial portions of the Software.
++* 
++* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
++* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
++* OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
++* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
++* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
++* WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
++* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
++* OTHER DEALINGS IN THE SOFTWARE.
++
++
++Files: src/gle/bitmap/lzwencode.cpp
++Copyright (c) 1985, 1986 The Regents of the University of California
++License:
++* Rev 5.0 Lempel-Ziv & Welch Compression Support
++* Based on the LZW compression code from libtiff <www.libtiff.org>
++*
++* Copyright (c) 1985, 1986 The Regents of the University of California.
++* All rights reserved.
++*
++* This code is derived from software contributed to Berkeley by
++* James A. Woods, derived from original work by Spencer Thomas
++* and Joseph Orost.
++*
++* Redistribution and use in source and binary forms are permitted
++* provided that the above copyright notice and this paragraph are
++* duplicated in all such forms and that any documentation,
++* advertising materials, and other materials related to such
++* distribution and use acknowledge that the software was developed
++* by the University of California, Berkeley.  The name of the
++* University may not be used to endorse or promote products derived
++* from this software without specific prior written permission.
++* THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
++* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
++* WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
++
++Files: src/lib/electronics.gle
++Copyright: (c) 2007 A. S. Budden
++License:
++! Electronic Circuit diagrams with GLE
++! Author: A. S. Budden <abudden at NOSPAMgataki.co.uk>
++!
++! Date: 17th August 2007
++! Version: 1.3
++!
++! Copyright:  Copyright (C) 2005 A. S. Budden
++!             Permission is hereby granted to use and distribute this code,
++!             with or without modifications, provided that this copyright
++!             notice is copied with it. Like anything else that's free,
++!             electronics.gle is provided *as is* and comes with no warranty
++!             of any kind, either expressed or implied. By using this
++!             plugin, you agree that in no event will the copyright
++!             holder be liable for any damages resulting from the use
++!             of this software.
++
++
++Files: src/fonts/texcm*.[afm|gle]
++Copyright:Prof. Donald E. Knuth
++License: Modified BSD license
++*** TeX Computer Modern Font AFM and GLE files ***
++
++The following files were automatically generated based on the TeX Computer
++Modern Font files, which were released by Prof. Donald E. Knuth into 
++the public domain.
++
 +                                                
 +On Debian GNU/Linux systems, the complete text of the GNU General
- Public License version 2 can be found in
- `/usr/share/common-licenses/GPL-2' and the complete text of the BSD
- License can be found in `/usr/share/common-licenses/BSD'.
++Public License version 2 can be found in `/usr/share/common-licenses/GPL-2',
++and the complete text of the GNU Lesser General Public License version 2.1
++can be found in `/usr/share/common-licenses/LGPL-2.1'.
diff --cc debian/create_orig_tar_gz.sh
index 2f38024,0000000..583d96a
mode 100644,000000..100644
--- a/debian/create_orig_tar_gz.sh
+++ b/debian/create_orig_tar_gz.sh
@@@ -1,15 -1,0 +1,15 @@@
 +#!/bin/bash
 +
- VERSION=4.2.0
++VERSION=4.2.3b
 +
 +cd .. 
 +if [ -d glx-$VERSION ] ; then
 +    rm -rf glx-$VERSION
 +fi
 +mkdir glx-$VERSION
 +cd glx-$VERSION
 +#wget http://dfn.dl.sourceforge.net/sourceforge/glx/GLE-$VERSION-src.zip 
 +wget http://prdownloads.sourceforge.net/glx/GLE-$VERSION-src.zip?download
 +cd ..
 +tar cvfz glx_$VERSION.orig.tar.gz glx-$VERSION/
 +rm -r glx-$VERSION
diff --cc debian/patches/hurd_path_max
index 0000000,0000000..e57c96d
new file mode 100644
--- /dev/null
+++ b/debian/patches/hurd_path_max
@@@ -1,0 -1,0 +1,18 @@@
++Description: make sure PATH_MAX is defined
++ On gnu-hurd the PATH length is not limited so PATH_MAX is not defined.
++Author: Christian T. Steigies <cts at debian.org>
++Last-Update: 2011-10-07
++--- a/src/gle/file_io.cpp
+++++ b/src/gle/file_io.cpp
++@@ -93,6 +93,11 @@
++ 	#endif
++ #endif
++ 
+++/* PATH_MAX is not defined on gnu-hurd */
+++#ifndef PATH_MAX
+++	#define PATH_MAX 8192
+++#endif
+++
++ using namespace std;
++ 
++ #include "tokens/stokenizer.h"
diff --cc debian/patches/kfreebsd-buildd-has-no-proc
index 0000000,0000000..3dbcc85
new file mode 100644
--- /dev/null
+++ b/debian/patches/kfreebsd-buildd-has-no-proc
@@@ -1,0 -1,0 +1,21 @@@
++Description: /proc/self/exe file system is a linuxism
++ On the kfreebsd buildds the proc filesystem does not seem to be
++ mounted, while it is mounted on the porterbox. Building gle-graphics
++ fails on these systems due to this linuxism:
++ GNU/kfreeBSD is __UNIX__ but GNU/kfreeBSD is not __linux__
++Forwarded: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=644588
++Author: Petr Salinger <Petr.Salinger at seznam.cz> 
++Author: Jan Struyf <jan.struyf at struyf-ye.org>
++Reviewed-by: Christian T. Steigies <cts at debian.org>
++Last-Update: 2011-10-18
++--- a/src/gle/file_io.cpp
+++++ b/src/gle/file_io.cpp
++@@ -1350,7 +1350,7 @@
++ 		return true;
++ 	}
++ #endif
++-#if defined(__UNIX__) && !defined(__MACOS__) && !defined(__FREEBSD__)
+++#if defined(__linux__)
++ 	/* try to read location from the /proc/self/exe file */
++ 	char path[PATH_MAX];
++ 	struct stat stat_buf;
diff --cc debian/patches/qgle.pro.in
index 8635550,0000000..346973c
mode 100644,000000..100644
--- a/debian/patches/qgle.pro.in
+++ b/debian/patches/qgle.pro.in
@@@ -1,24 -1,0 +1,23 @@@
- Description: Always link qgle with -ldl
++Description: Let qmake decide if it needs to link with -ldl
 + When building with binutils-gold on amd64,
 + qgle is not linked with -ldl.
 +Forwarded: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=554556
- Author: Christian T. Steigies <cts at debian.org>
- Last-Update: 2011-10-06
++Origin: http://glx.git.sourceforge.net/git/gitweb.cgi?p=glx/gle;a=commitdiff;h=d042c3cb181c5d8d3ecc503de4905616bf295980;
++Author: Michal Vyskocil <mvyskocil at suse.cz>
++Reviewed-by: Jan Struyf <jan.struyf at struyf-ye.org>
++Reviewed-by: Christian T. Steigies <cts at debian.org>
++Last-Update: 2011-10-08
 +
 +--- a/src/gui/qgle.pro.in
 ++++ b/src/gui/qgle.pro.in
- @@ -161,13 +161,9 @@
++@@ -161,9 +161,7 @@
 +              images/reload.png \
 +              images/reload_red.png
 + 
 +-linux-g++ {
 +-	LIBS += -ldl
 +-}
- -
+++LIBS += $$QMAKE_LIBS_DYNLOAD
++ 
 + # link against the GLE library (unix -> Linux and Mac OS/X)
 + unix {
- -	LIBS += -lgle-graphics- at GLE_VERSION@ -L../../build/lib/
- +	LIBS += -ldl -lgle-graphics- at GLE_VERSION@ -L../../build/lib/
-  }
-  win32 {
-  	LIBS += -lgle-graphics- at GLE_VERSION@ -L../../build/bin/
diff --cc debian/patches/series
index 9f36053,0000000..134fd2d
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,0 +1,3 @@@
 +qgle.pro.in
++hurd_path_max
++kfreebsd-buildd-has-no-proc
diff --cc debian/rules
index 7f582d4,0000000..fd124a1
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,34 -1,0 +1,28 @@@
 +#!/usr/bin/make -f
++# -*- makefile -*-
 +
- DEB_TAR_SRCDIR = gle4
++# Uncomment this to turn on verbose mode.
++#export DH_VERBOSE=1
 +
- #include /usr/share/cdbs/1/rules/tarball.mk
- include /usr/share/cdbs/1/rules/debhelper.mk
- include /usr/share/cdbs/1/class/autotools.mk
- #include /usr/share/cdbs/1/rules/simple-patchsys.mk
++%:
++	dh $@ 
 +
- # To add pre-configure actions (ignore warnings):
- makebuilddir/gle-graphics::
- 	-autoreconf -vfi
- 
- configure/gle-graphics::
- 	./configure --docdir=/usr/share/doc/gle-graphics/ --with-rpath=no
- 
- build/gle-graphics::
++override_dh_auto_build:
++	make	
 +	make doc
 +
- clean::
- 	[ ! -f Makefile ] || make clean
- 	-rm Makefile
- 	[ ! -f gle-refman/Makefile.gcc ] || make -C gle-refman -f Makefile.gcc clean
- 	[ ! -f gle-refman/Makefile.gcc ] || make -C gle-refman/fonttest -f Makefile.gcc clean
- 	-rm -r gle-refman/appendix/fig/.gle/
- 	-rm src/font/*.fmt
- 	-rm src/font/*.fve
- 	-rm src/font/movefonts
++override_dh_auto_clean:
++	[ ! -f Makefile ] || make distclean
 +# remove files which are updated by autoreconf:
 +	-rm aclocal.m4 configure
 +
- install/gle-graphics::
++override_dh_auto_configure:
++	-autoreconf -vfi
++	./configure --docdir=/usr/share/doc/gle-graphics/ --with-rpath=no
++
++override_dh_auto_install:
++	dh_auto_install
 +	cp debian/qgle.1 debian/gle-graphics/usr/share/man/man1/
 +	cp debian/manip.1 debian/gle-graphics/usr/share/man/man1/
++	# do not ship helper that is only used during build
++	rm debian/gle-graphics/usr/bin/glebtool

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/gle-graphics.git



More information about the debian-science-commits mailing list