Javier Fernández-Sanguino Peña 提到: > > Thank you for fixing these issues. But could you please file a proper bug > with the NMU patch? > > Regards > > Javier
Sorry,
I'm attaching the NMU interdiff for you.
It is generated by "interdiff -p 1"
Regards,
Paul
--
PaulLiu(劉穎駿)
E-mail address: [EMAIL PROTECTED]
reverted: --- openuniverse-1.0beta3.1/src/log.txt +++ openuniverse-1.0beta3.1.orig/src/log.txt @@ -1,51 +0,0 @@ -Initializing GLUT ... OK -Initializing display mode ... OK -Initializing window ... OK -Parsing command line ... OK -Creating window ... OK -Initializing Sun ... OK -Mercury ... OK -Venus ... OK -Earth ... OK -Atmosphere ... OK -Moon ... OK -Apollo13 ... OK -HST ... OK -StationV ... OK -Endeavour ... OK -Mars ... OK -Phobos ... OK -Deimos ... OK -Discovery ... OK -Bacchus ... OK -Castalia ... OK -Geographos ... OK -Vesta ... OK -Ida ... OK -Gaspra ... OK -Toutatis ... OK -Ky ... OK -Jupiter ... OK -Amalthea ... OK -Io ... OK -Europa ... OK -Ganymede ... OK -Callisto ... OK -Saturn ... OK -Ring ... OK -Prometheus ... OK -Epimetheus ... OK -Janus ... OK -Tethys ... OK -Dione ... OK -Rhea ... OK -Titan ... OK -Hyperion ... OK -Uranus ... OK -Ring ... OK -Neptune ... OK -Proteus ... OK -Triton ... OK -Pluto ... OK -Charon ... OK -Initializing GUI ... OK diff -u openuniverse-1.0beta3.1/debian/changelog openuniverse-1.0beta3.1+dfsg/debian/changelog --- openuniverse-1.0beta3.1/debian/changelog +++ openuniverse-1.0beta3.1+dfsg/debian/changelog @@ -1,3 +1,20 @@ +openuniverse (1.0beta3.1+dfsg-0.1) unstable; urgency=low + + * Non-maintainer upload. + * Re-encode debian/copyright from iso-8859-1 to utf-8 + * Delete texfont.cpp and texfont.h from the upstream. (Closes: #467125) + * Add comments to debian/copyright for repackaging. + * Add new texfont.cpp and texfont.h which uses plib + * Add Build-Depends on plib1.8.4-dev + * Adjust debian/rules to use plib + * Fix menu to Applications/Science/Astronomy (Closes: #402371, #410748) + * Build-Depends on freeglut3-dev instead of libglut3-dev (Closes: #394498) + * Use Homepage field instead of the pseudo field in long description + * Add debian/compat instead of using DH_COMPAT + * Fix debian-rules-ignores-make-clean-error + + -- Ying-Chun Liu (PaulLiu) <[EMAIL PROTECTED]> Sun, 14 Apr 2008 00:12:35 +0800 + openuniverse (1.0beta3.1-6) unstable; urgency=high * Build-Depend on libglu1-mesa-dev (Closes: #366669) diff -u openuniverse-1.0beta3.1/debian/control openuniverse-1.0beta3.1+dfsg/debian/control --- openuniverse-1.0beta3.1/debian/control +++ openuniverse-1.0beta3.1+dfsg/debian/control @@ -2,12 +2,13 @@ Section: science Priority: optional Maintainer: Javier Fernandez-Sanguino Pen~a <[EMAIL PROTECTED]> -Build-Depends: libglut3-dev, debhelper (>= 1.1.17), flex, bison, libgl1-mesa-dev | libgl-dev | xlibmesa-gl-dev, libglu1-mesa-dev | libglu-dev | xlibmesa-glu-dev, libjpeg62-dev, libsm-dev, libice-dev, libxmu-dev, libxi-dev, libxext-dev, libx11-dev +Build-Depends: freeglut3-dev, debhelper (>= 1.1.17), flex, bison, libgl1-mesa-dev | libgl-dev | xlibmesa-gl-dev, libglu1-mesa-dev | libglu-dev | xlibmesa-glu-dev, libjpeg62-dev, libsm-dev, libice-dev, libxmu-dev, libxi-dev, libxext-dev, libx11-dev, plib1.8.4-dev Standards-Version: 3.5.6 +Homepage: http://www.openuniverse.org Package: openuniverse Architecture: any -Depends: ${shlibs:Depends}, openuniverse-common +Depends: ${shlibs:Depends}, ${misc:Depends}, openuniverse-common Suggests: celestia Conflicts: openuniverse-common ( <= 1.0beta3.1-3 ) Description: 3D Universe Simulator @@ -21,8 +22,6 @@ . Notice that OpenUniverse is not actively being maintained anymore and that users are recommended to use Celestia instead. - . - Homepage: http://www.openuniverse.org Package: openuniverse-common Architecture: all @@ -42,3 +40,0 @@ - . - Homepage: http://www.openuniverse.org - diff -u openuniverse-1.0beta3.1/debian/menu openuniverse-1.0beta3.1+dfsg/debian/menu --- openuniverse-1.0beta3.1/debian/menu +++ openuniverse-1.0beta3.1+dfsg/debian/menu @@ -1,2 +1,2 @@ -?package(openuniverse):needs="X11" section="Apps/Math"\ +?package(openuniverse):needs="X11" section="Applications/Science/Astronomy"\ title="openuniverse" command="/usr/bin/openuniverse" diff -u openuniverse-1.0beta3.1/debian/copyright openuniverse-1.0beta3.1+dfsg/debian/copyright --- openuniverse-1.0beta3.1/debian/copyright +++ openuniverse-1.0beta3.1+dfsg/debian/copyright @@ -1,14 +1,14 @@ This package was debianized by -Javier Fernandez-Sanguino Peña <[EMAIL PROTECTED]> on +Javier Fernandez-Sanguino Peña <[EMAIL PROTECTED]> on Sun, 1 Apr 2001 19:58:43 +0200. It was downloaded from http://www.openuniverse.org -Upstream Author: Raúl Alonso <[EMAIL PROTECTED]> +Upstream Author: Raúl Alonso <[EMAIL PROTECTED]> This program is -Copyright: (c) 2000,2001 Raúl Alonso +Copyright: (c) 2000,2001 Raúl Alonso This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -56,0 +57,5 @@ +texfont.cpp and texfont.h is licensed by: + This program is freely distributable without licensing fees and is + provided without guarantee or warrantee expressed or implied. This + program is -not- in the public domain. +This license is non-free thus it is removed from the tarball. diff -u openuniverse-1.0beta3.1/debian/rules openuniverse-1.0beta3.1+dfsg/debian/rules --- openuniverse-1.0beta3.1/debian/rules +++ openuniverse-1.0beta3.1+dfsg/debian/rules @@ -9,9 +9,6 @@ # Uncomment this to turn on verbose mode. export DH_VERBOSE=1 -# This is the debhelper compatibility version to use. -export DH_COMPAT=4 - # This has to be exported to make some magic below work. export DH_OPTIONS @@ -19,7 +16,7 @@ build-stamp: dh_testdir - ./configure --prefix= --exec_prefix=/usr --mandir=\$${exec_prefix}/share/man --infodir=\$${exec_prefix}/share/info --sysconfdir=\$${prefix}/etc/ --includedir=\$${exec_prefix}/include --datadir=\$${exec_prefix}/share + CXXFLAGS="-I/usr/include/plib/" LIBS="-lplibfnt -lplibul -lglut" ./configure --prefix= --exec_prefix=/usr --mandir=\$${exec_prefix}/share/man --infodir=\$${exec_prefix}/share/info --sysconfdir=\$${prefix}/etc/ --includedir=\$${exec_prefix}/include --datadir=\$${exec_prefix}/share # Add here commands to compile the package. $(MAKE) @@ -31,7 +28,7 @@ rm -f build-stamp # Add here commands to clean up after the build process. - -$(MAKE) distclean + [ ! -f Makefile ] || $(MAKE) distclean dh_clean diff -u openuniverse-1.0beta3.1/config.h.in openuniverse-1.0beta3.1+dfsg/config.h.in --- openuniverse-1.0beta3.1/config.h.in +++ openuniverse-1.0beta3.1+dfsg/config.h.in @@ -1,14 +1,4 @@ -/* config.h.in. Generated automatically from configure.in by autoheader 2.13. */ - -/* Define if you have the ANSI C header files. */ -#undef STDC_HEADERS - -/* Define if the X Window System is missing or not being used. */ -#undef X_DISPLAY_MISSING - -/* Define if lex declares yytext as a char * by default, not a char[]. */ -#undef YYTEXT_POINTER - +/* config.h.in. Generated from configure.in by autoheader. */ #undef JOYSTICK_IS_PRESENT #undef LINUX_JOYSTICK_IS_PRESENT #undef TEXTURE_DIR @@ -22,31 +12,82 @@ + +/* Define to 1 if you have the <GL/glut.h> header file. */ +#undef HAVE_GL_GLUT_H -/* Define if you have the <GL/gl.h> header file. */ +/* Define to 1 if you have the <GL/gl.h> header file. */ #undef HAVE_GL_GL_H -/* Define if you have the <GL/glut.h> header file. */ -#undef HAVE_GL_GLUT_H +/* Define to 1 if you have the <inttypes.h> header file. */ +#undef HAVE_INTTYPES_H -/* Define if you have the GL library (-lGL). */ +/* Define to 1 if you have the `GL' library (-lGL). */ #undef HAVE_LIBGL -/* Define if you have the GLU library (-lGLU). */ +/* Define to 1 if you have the `GLU' library (-lGLU). */ #undef HAVE_LIBGLU -/* Define if you have the MesaGL library (-lMesaGL). */ +/* Define to 1 if you have the `glut' library (-lglut). */ +#undef HAVE_LIBGLUT + +/* Define to 1 if you have the `jpeg' library (-ljpeg). */ +#undef HAVE_LIBJPEG + +/* Define to 1 if you have the `MesaGL' library (-lMesaGL). */ #undef HAVE_LIBMESAGL -/* Define if you have the MesaGLU library (-lMesaGLU). */ +/* Define to 1 if you have the `MesaGLU' library (-lMesaGLU). */ #undef HAVE_LIBMESAGLU -/* Define if you have the glut library (-lglut). */ -#undef HAVE_LIBGLUT +/* Define to 1 if you have the <memory.h> header file. */ +#undef HAVE_MEMORY_H -/* Define if you have the jpeg library (-ljpeg). */ -#undef HAVE_LIBJPEG +/* Define to 1 if you have the <stdint.h> header file. */ +#undef HAVE_STDINT_H + +/* Define to 1 if you have the <stdlib.h> header file. */ +#undef HAVE_STDLIB_H + +/* Define to 1 if you have the <strings.h> header file. */ +#undef HAVE_STRINGS_H + +/* Define to 1 if you have the <string.h> header file. */ +#undef HAVE_STRING_H + +/* Define to 1 if you have the <sys/stat.h> header file. */ +#undef HAVE_SYS_STAT_H + +/* Define to 1 if you have the <sys/types.h> header file. */ +#undef HAVE_SYS_TYPES_H + +/* Define to 1 if you have the <unistd.h> header file. */ +#undef HAVE_UNISTD_H /* Name of package */ #undef PACKAGE +/* Define to the address where bug reports for this package should be sent. */ +#undef PACKAGE_BUGREPORT + +/* Define to the full name of this package. */ +#undef PACKAGE_NAME + +/* Define to the full name and version of this package. */ +#undef PACKAGE_STRING + +/* Define to the one symbol short name of this package. */ +#undef PACKAGE_TARNAME + +/* Define to the version of this package. */ +#undef PACKAGE_VERSION + +/* Define to 1 if you have the ANSI C header files. */ +#undef STDC_HEADERS + /* Version number of package */ #undef VERSION +/* Define to 1 if the X Window System is missing or not being used. */ +#undef X_DISPLAY_MISSING + +/* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a + `char[]'. */ +#undef YYTEXT_POINTER only in patch2: unchanged: --- openuniverse-1.0beta3.1+dfsg.orig/src/texfont.cpp +++ openuniverse-1.0beta3.1+dfsg/src/texfont.cpp @@ -0,0 +1,97 @@ +/* + replacement for non-free texfont.cpp for openuniverse + Copyright (C) 2008 PaulLiu(Ying-Chun Liu). + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +*/ + +#include <cstdio> +#include <cstring> +#include <cstdlib> +#include <cctype> +#include "texfont.h" +#include "ou.h" + +static int plib_init_flag=(1==0); + +static void init_plib() { + if (!plib_init_flag) { + fntInit(); + plib_init_flag=(1==1); + } +} + + +TexFont* txfLoadFont (char* filename) { + TexFont* ret=NULL; + char newfilename[1024]; + + init_plib(); + + ret = (TexFont*)malloc (sizeof(TexFont)); + memset(ret,0,sizeof(TexFont)); + + memset(newfilename,0,sizeof(newfilename)); + snprintf(newfilename,sizeof(newfilename)-1,"%s/%s",fontpath,filename); + ret->plibtexfont = new fntTexFont(newfilename); + + ret->tgi = (TexGlyphInfo*)malloc(sizeof(TexGlyphInfo)); + memset(ret->tgi,0,sizeof(TexGlyphInfo)); + ret->tgi->width = 3; + ret->tgi->advance = 3; + ret->tgi->height = 12; + + ret->plibrenderer = new fntRenderer(); + ret->plibrenderer->setFont(ret->plibtexfont); + return ret; +} + +GLuint txfEstablishTexture(TexFont* f,GLuint b,GLboolean c) +{ + init_plib(); + return 0; +} + +void txfBindFontTexture(TexFont* f) +{ + init_plib(); +} + +void txfUnloadFont(TexFont* f) +{ + init_plib(); + if (f!=NULL) { + if (f->plibrenderer!=NULL) { + delete f->plibrenderer; + f->plibrenderer=NULL; + } + if (f->tgi != NULL) { + free(f->tgi); + f->tgi=NULL; + } + if (f->plibtexfont!=NULL) { + delete f->plibtexfont; + f->plibtexfont=NULL; + } + free(f); + } +} + +void txfRenderString(TexFont* f,char* string,int string_len) { + init_plib(); + f->plibrenderer->begin(); + f->plibrenderer->puts(string); + f->plibrenderer->end(); +} only in patch2: unchanged: --- openuniverse-1.0beta3.1+dfsg.orig/src/texfont.h +++ openuniverse-1.0beta3.1+dfsg/src/texfont.h @@ -0,0 +1,44 @@ +/* + replacement for non-free texfont.cpp for openuniverse + Copyright (C) 2008 PaulLiu(Ying-Chun Liu). + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +*/ + +#ifndef __AVYGDJMW_TEXFONT_H__ +#define __AVYGDJMW_TEXFONT_H__ + +#include <fnt.h> +#include <GL/gl.h> + +typedef struct { + unsigned char width; + unsigned char height; + signed char advance; +} TexGlyphInfo; + +typedef struct { + TexGlyphInfo* tgi; + fntTexFont* plibtexfont; + fntRenderer* plibrenderer; +} TexFont; + +extern TexFont* txfLoadFont(char*); +extern void txfUnloadFont(TexFont*); +extern GLuint txfEstablishTexture(TexFont*,GLuint,GLboolean); +extern void txfBindFontTexture(TexFont*); +extern void txfRenderString(TexFont*,char*,int); + +#endif only in patch2: unchanged: --- openuniverse-1.0beta3.1+dfsg.orig/debian/compat +++ openuniverse-1.0beta3.1+dfsg/debian/compat @@ -0,0 +1 @@ +4
signature.asc
Description: OpenPGP digital signature
