--- inventor-2.1.5-10/debian/changelog +++ inventor-2.1.5-10/debian/changelog @@ -1,3 +1,11 @@ +inventor (2.1.5-10-12ubuntu1) intrepid; urgency=low + + * Merge from debian unstable (LP: #241585), remaining changes: + - Update build-depends + - Stop building componentTest, since it links against GLw. + - Hack libInventorWidget.a to not build MyColorEditor, as it also uses + GLw now. + * Modify Maintainer value to match Debian-Maintainer-Field Spec + + -- Tan Rui Boon Tue, 24 Jun 2008 17:58:48 +0800 + inventor (2.1.5-10-12) unstable; urgency=low * debian/control: Build-depend on libglw1-mesa-dev instead of @@ -6,6 +14,17 @@ -- Steve M. Robbins Sun, 26 Aug 2007 22:35:35 -0500 +inventor (2.1.5-10-11ubuntu1) gutsy; urgency=low + + * Merge from Debian unstable. + * Remaining Ubuntu changes: + - Stop building componentTest, since it links against GLw. + * Hack libInventorWidget.a to not build MyColorEditor, as it also uses GLw + now. + * Munge Maintainer field as per spec. + + -- Steve Kowalik Sun, 17 Jun 2007 15:58:56 +1000 + inventor (2.1.5-10-11) unstable; urgency=low * debian/link-fonts.sh: Don't try to link non-existent .pfa file. @@ -20,6 +39,13 @@ -- Steve M. Robbins Thu, 17 May 2007 00:10:20 -0500 +inventor (2.1.5-10-9ubuntu1) edgy; urgency=low + + * Merge from Debian unstable. + * Correct font path to /usr/share/X11/fonts/Type1. + + -- Steve Kowalik Wed, 5 Jul 2006 13:55:21 +1000 + inventor (2.1.5-10-9) unstable; urgency=low * debian/control: Build with lesstif2 instead of lesstif1. Closes: @@ -54,6 +80,19 @@ -- Steve M. Robbins Tue, 17 Jan 2006 00:38:31 -0500 +inventor (2.1.5-10-6ubuntu2) dapper; urgency=low + + * Correct order of changelog entries. + * Correct C++ bug in Inventor/nodekits/SoSubKit.h. (Malone: #5733) + + -- Steve Kowalik Sat, 6 May 2006 16:42:46 +1000 + +inventor (2.1.5-10-6ubuntu1) dapper; urgency=low + + * Resynchronise with Debian. + + -- Benjamin Montgomery Sun, 11 Dec 2005 18:27:55 -0600 + inventor (2.1.5-10-6) unstable; urgency=low * debian/rules: Remove s390 from list of arches on which the @@ -61,6 +100,17 @@ -- Steve M. Robbins Sat, 26 Nov 2005 22:27:13 -0500 +inventor (2.1.5-10-5ubuntu1) dapper; urgency=low + + * Resynchronise with Debian. + - Drop debian/patches/01_gcc4.patch. + * Added libgl1-mesa-swrast-dev | libgl-dev and libglu1-mesa-dev | + libglu-dev to Build-Depends, and removed xlibmesa-gl-dev and + libglu1-xorg-dev. + * Stop building componentTest, since it links against GLw. + + -- Steve Kowalik Mon, 28 Nov 2005 14:09:12 +1100 + inventor (2.1.5-10-5) unstable; urgency=low * lib/database/include/machine.h: Add __alpha__ to list that enables @@ -89,6 +139,13 @@ -- Steve M. Robbins Sun, 7 Aug 2005 21:25:40 -0400 +inventor (2.1.5-10-3ubuntu1) breezy; urgency=low + + * renaming libinventor0c102 to libinventor0 + * fixed gcc/g++-4.0 build issues (b.d.o closes: #286471) + + -- Stephan Hermann Sun, 05 Jun 2005 21:11:17 +0200 + inventor (2.1.5-10-3) unstable; urgency=low * lib/GNUmakefile: link libInventor with -ldl. Closes: #266040. @@ -261,0 +319 @@ + --- inventor-2.1.5-10/debian/control +++ inventor-2.1.5-10/debian/control @@ -1,9 +1,10 @@ Source: inventor Section: devel Priority: optional -Maintainer: Steve M. Robbins +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Steve M. Robbins +Build-Depends: debhelper (>= 5), libx11-dev, libxi-dev, libxt-dev, x-dev, lesstif2-dev, libgl1-mesa-swrast-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, libfreetype6-dev, libjpeg-dev, tcsh, bison Standards-Version: 3.6.2.0 -Build-Depends: debhelper (>= 5), libx11-dev, libxi-dev, libxt-dev, x-dev, lesstif2-dev, libglw1-mesa-dev, libglu1-xorg-dev, libfreetype6-dev, libjpeg-dev, tcsh, bison Package: libinventor0 Conflicts: libinventor0c102 --- inventor-2.1.5-10/debian/rules +++ inventor-2.1.5-10/debian/rules @@ -45,7 +45,6 @@ export BUILDMAN=true endif - build: build-stamp build-stamp: dh_testdir --- inventor-2.1.5-10.orig/lib/nodekits/include/Inventor/nodekits/SoSubKit.h +++ inventor-2.1.5-10/lib/nodekits/include/Inventor/nodekits/SoSubKit.h @@ -192,7 +192,7 @@ // #define SO_KIT_SOURCE(className) \ - SO_NODE_SOURCE(className); \ + SO_NODE_SOURCE(className) \ SO__KIT_CATALOG_VARS(className); \ SO__KIT_CATALOG_METHODS(className) --- inventor-2.1.5-10.orig/apps/samples/widgets/GNUmakefile +++ inventor-2.1.5-10/apps/samples/widgets/GNUmakefile @@ -1,7 +1,7 @@ IVDEPTH = ../../.. include $(IVDEPTH)/make/ivcommondefs -PROGRAMS_EXT = libInventorWidget.a componentTest +PROGRAMS_EXT = libInventorWidget.a all install $(COMMONTARGS): for i in $(PROGRAMS_EXT); do $(MAKE) -f GNUmakefile.$$i $@; done --- inventor-2.1.5-10.orig/apps/samples/widgets/GNUmakefile.libInventorWidget.a +++ inventor-2.1.5-10/apps/samples/widgets/GNUmakefile.libInventorWidget.a @@ -15,8 +15,7 @@ MyThumbWhl.c++ \ MyFloatCBList.c++ \ MySimpleMtlEditor.c++ \ - MyMtlPal.c++ \ - MyTextureEd.c++ + MyMtlPal.c++ all install: all_ivbin