r36832 - in /packages/togl/trunk/debian: Makefile changelog control libtogl-dev.install rules watch
trophime-guest at users.alioth.debian.org
trophime-guest at users.alioth.debian.org
Wed Aug 18 14:38:19 UTC 2010
Author: trophime-guest
Date: Wed Aug 18 14:38:17 2010
New Revision: 36832
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=36832
Log:
fix missing symbols
Modified:
packages/togl/trunk/debian/Makefile
packages/togl/trunk/debian/changelog
packages/togl/trunk/debian/control
packages/togl/trunk/debian/libtogl-dev.install
packages/togl/trunk/debian/rules
packages/togl/trunk/debian/watch
Modified: packages/togl/trunk/debian/Makefile
URL: http://svn.debian.org/wsvn/debian-science/packages/togl/trunk/debian/Makefile?rev=36832&op=diff
==============================================================================
--- packages/togl/trunk/debian/Makefile (original)
+++ packages/togl/trunk/debian/Makefile Wed Aug 18 14:38:17 2010
@@ -57,14 +57,14 @@
RANLIB = :
RANLIB_STUB = ranlib
SHLIB_CFLAGS = -fPIC
-SHLIB_LD = cc -pipe -shared
-SHLIB_LD_LIBS = ${LIBS} -L/usr/lib -ltclstub8.4 -L/usr/lib -ltkstub8.4
+SHLIB_LD = ${CC} -shared ${CFLAGS} ${LDFLAGS_DEFAULT}
+SHLIB_LD_LIBS = ${LIBS} -L/usr/lib -ltcl8.5 -L/usr/lib -ltk8.5
STLIB_LD = ${AR} cr
-#TCL_DEFS = -DHAVE_LIMITS_H=1 -DHAVE_UNISTD_H=1 -DHAVE_SYS_PARAM_H=1 -DUSE_THREAD_ALLOC=1 -D_REENTRANT=1 -D_THREAD_SAFE=1 -DHAVE_PTHREAD_ATTR_SETSTACKSIZE=1 -DHAVE_PTHREAD_ATFORK=1 -DTCL_THREADS=1 -DPEEK_XCLOSEIM=1 -D_LARGEFILE64_SOURCE=1 -DTCL_WIDE_INT_TYPE=long\ long -DHAVE_STRUCT_STAT64=1 -DHAVE_OPEN64=1 -DHAVE_LSEEK64=1 -DHAVE_TYPE_OFF64_T=1 -DHAVE_GETCWD=1 -DHAVE_OPENDIR=1 -DHAVE_STRSTR=1 -DHAVE_STRTOL=1 -DHAVE_STRTOLL=1 -DHAVE_STRTOULL=1 -DHAVE_TMPNAM=1 -DHAVE_WAITPID=1 -DHAVE_GETPWUID_R_5=1 -DHAVE_GETPWUID_R=1 -DHAVE_GETPWNAM_R_5=1 -DHAVE_GETPWNAM_R=1 -DHAVE_GETGRGID_R_5=1 -DHAVE_GETGRGID_R=1 -DHAVE_GETGRNAM_R_5=1 -DHAVE_GETGRNAM_R=1 -DHAVE_GETHOSTBYNAME_R_6=1 -DHAVE_GETHOSTBYNAME_R=1 -DHAVE_GETHOSTBYADDR_R_8=1 -DHAVE_GETHOSTBYADDR_R=1 -DUSE_TERMIOS=1 -DHAVE_SYS_TIME_H=1 -DTIME_WITH_SYS_TIME=1 -DHAVE_TM_ZONE=1 -DHAVE_GMTIME_R=1 -DHAVE_LOCALTIME_R=1 -DHAVE_TM_GMTOFF=1 -DHAVE_TIMEZONE_VAR=1 -DHAVE_ST_BLKSIZE=1 -DSTDC_HEADERS=1 -DHAVE_SIGNED_CHAR=1 -DHAVE_LANGINFO=1 -DHAVE_SYS_IOCTL_H=1
-TCL_BIN_DIR = /usr/lib/tcl8.4
-TCL_SRC_DIR = /usr/include/tcl8.4/tcl-private
-#TK_BIN_DIR = /usr/lib/tk8.4
-#TK_SRC_DIR = /usr/include/tcl8.4/tk-private
+#TCL_DEFS = -DPACKAGE_NAME=\"tcl\" -DPACKAGE_TARNAME=\"tcl\" -DPACKAGE_VERSION=\"8.5\" -DPACKAGE_STRING=\"tcl\ 8.5\" -DPACKAGE_BUGREPORT=\"\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_LIMITS_H=1 -DHAVE_SYS_PARAM_H=1 -DUSE_THREAD_ALLOC=1 -D_REENTRANT=1 -D_THREAD_SAFE=1 -DHAVE_PTHREAD_ATTR_SETSTACKSIZE=1 -DHAVE_PTHREAD_GETATTR_NP=1 -DGETATTRNP_NOT_DECLARED=1 -DTCL_THREADS=1 -DTCL_CFGVAL_ENCODING=\"iso8859-1\" -DMODULE_SCOPE=extern\ __attribute__\(\(__visibility__\(\"hidden\"\)\)\) -DTCL_SHLIB_EXT=\".so\" -DTCL_CFG_OPTIMIZED=1 -DTCL_CFG_DEBUG=1 -DTCL_TOMMATH=1 -DMP_PREC=4 -D_LARGEFILE64_SOURCE=1 -DTCL_WIDE_INT_IS_LONG=1 -DHAVE_GETCWD=1 -DHAVE_OPENDIR=1 -DHAVE_STRTOL=1 -DHAVE_WAITPID=1 -DHAVE_GETADDRINFO=1 -DHAVE_GETPWUID_R_5=1 -DHAVE_GETPWUID_R=1 -DHAVE_GETPWNAM_R_5=1 -DHAVE_GETPWNAM_R=1 -DHAVE_GETGRGID_R_5=1 -DHAVE_GETGRGID_R=1 -DHAVE_GETGRNAM_R_5=1 -DHAVE_GETGRNAM_R=1 -DHAVE_GETHOSTBYNAME_R_6=1 -DHAVE_GETHOSTBYNAME_R=1 -DHAVE_GETHOSTBYADDR_R_8=1 -DHAVE_GETHOSTBYADDR_R=1 -DUSE_TERMIOS=1 -DHAVE_SYS_TIME_H=1 -DTIME_WITH_SYS_TIME=1 -DHAVE_STRUCT_TM_TM_ZONE=1 -DHAVE_TM_ZONE=1 -DHAVE_GMTIME_R=1 -DHAVE_LOCALTIME_R=1 -DHAVE_MKTIME=1 -DHAVE_TM_GMTOFF=1 -DHAVE_TIMEZONE_VAR=1 -DHAVE_STRUCT_STAT_ST_BLKSIZE=1 -DHAVE_ST_BLKSIZE=1 -DHAVE_INTPTR_T=1 -DHAVE_UINTPTR_T=1 -DHAVE_SIGNED_CHAR=1 -DHAVE_LANGINFO=1 -DHAVE_SYS_IOCTL_H=1 -DTCL_UNLOAD_DLLS=1
+TCL_BIN_DIR = /usr/lib/tcl8.5
+TCL_SRC_DIR = /usr/include/tcl8.5/tcl-private
+#TK_BIN_DIR = /usr/lib/tk8.5
+#TK_SRC_DIR = /usr/include/tcl8.5/tk-private
# Not used, but retained for reference of what libs Tcl required
#TCL_LIBS = ${DL_LIBS} ${LIBS} ${MATH_LIBS}
@@ -85,19 +85,17 @@
TCLLIBPATH="$(TCLLIBPATH)"
# TK_LIBRARY=`echo $(TK_SRC_DIR)/library`
-TCLSH_PROG = /usr/bin/tclsh8.4
+TCLSH_PROG = /usr/bin/tclsh8.5
TCLSH = $(TCLSH_ENV) $(TCLSH_PROG)
-WISH_PROG = /usr/bin/wish8.4
+WISH_PROG = /usr/bin/wish8.5
WISH = $(TCLSH_ENV) $(WISH_PROG)
SHARED_BUILD = 1
-#INCLUDES = -I"/usr/include/tcl8.4"
-INCLUDES = -I"/usr/include/tcl8.4" \
- -I"/usr/include/tcl8.4/tk-private/generic" \
- -I"/usr/include/tcl8.4/tk-private/unix"
+#INCLUDES = -I"/usr/include/tcl8.5/tcl-private/generic" -I"/usr/include/tcl8.5/tcl-private/unix"
+INCLUDES = -I"/usr/include/tcl8.5/tcl-private/generic" -I"/usr/include/tcl8.5/tcl-private/unix" -I"/usr/include/tcl8.5/tk-private/generic" -I"/usr/include/tcl8.5/tk-private/unix" -I"/usr/include/tcl8.5/tk-private/generic/ttk"
PKG_CFLAGS =
@@ -106,13 +104,14 @@
# that your library may use. TCL_DEFS can actually be a problem if
# you do not compile with a similar machine setup as the Tcl core was
# compiled with.
-#DEFS = $(TCL_DEFS) -DPACKAGE_NAME=\"Togl\" -DPACKAGE_TARNAME=\"togl\" -DPACKAGE_VERSION=\"1.7\" -DPACKAGE_STRING=\"Togl\ 1.7\" -DPACKAGE_BUGREPORT=\"\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_LIMITS_H=1 -DHAVE_SYS_PARAM_H=1 -DUSE_THREAD_ALLOC=1 -D_REENTRANT=1 -D_THREAD_SAFE=1 -DTCL_THREADS=1 -D_LARGEFILE64_SOURCE=1 -DTCL_WIDE_INT_TYPE=long\ long -DHAVE_STRUCT_STAT64=1 -DHAVE_TYPE_OFF64_T=1 -DUSE_TCL_STUBS=1 -DUSE_TK_STUBS=1 $(PKG_CFLAGS)
-DEFS = -DPACKAGE_NAME=\"Togl\" -DPACKAGE_TARNAME=\"togl\" -DPACKAGE_VERSION=\"1.7\" -DPACKAGE_STRING=\"Togl\ 1.7\" -DPACKAGE_BUGREPORT=\"\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_LIMITS_H=1 -DHAVE_SYS_PARAM_H=1 -DUSE_THREAD_ALLOC=1 -D_REENTRANT=1 -D_THREAD_SAFE=1 -DTCL_THREADS=1 -D_LARGEFILE64_SOURCE=1 -DTCL_WIDE_INT_TYPE=long\ long -DHAVE_STRUCT_STAT64=1 -DHAVE_TYPE_OFF64_T=1 -DUSE_TCL_STUBS=1 -DUSE_TK_STUBS=1 $(PKG_CFLAGS)
+#DEFS = $(TCL_DEFS) -DPACKAGE_NAME=\"Togl\" -DPACKAGE_TARNAME=\"togl\" -DPACKAGE_VERSION=\"2.0\" -DPACKAGE_STRING=\"Togl\ 2.0\" -DPACKAGE_BUGREPORT=\"\" -DPACKAGE_URL=\"\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_LIMITS_H=1 -DHAVE_SYS_PARAM_H=1 -DUSE_THREAD_ALLOC=1 -D_REENTRANT=1 -D_THREAD_SAFE=1 -DTCL_THREADS=1 -DMODULE_SCOPE=extern\ __attribute__\(\(__visibility__\(\"hidden\"\)\)\) -D_LARGEFILE64_SOURCE=1 -DTCL_WIDE_INT_IS_LONG=1 $(PKG_CFLAGS)
+DEFS = -DPACKAGE_NAME=\"Togl\" -DPACKAGE_TARNAME=\"togl\" -DPACKAGE_VERSION=\"2.0\" -DPACKAGE_STRING=\"Togl\ 2.0\" -DPACKAGE_BUGREPORT=\"\" -DPACKAGE_URL=\"\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_LIMITS_H=1 -DHAVE_SYS_PARAM_H=1 -DUSE_THREAD_ALLOC=1 -D_REENTRANT=1 -D_THREAD_SAFE=1 -DTCL_THREADS=1 -DMODULE_SCOPE=extern\ __attribute__\(\(__visibility__\(\"hidden\"\)\)\) -D_LARGEFILE64_SOURCE=1 -DTCL_WIDE_INT_IS_LONG=1 -DAUTOSTEREOD=\"\" $(PKG_CFLAGS)
-CONFIG_CLEAN_FILES = Makefile
+CONFIG_CLEAN_FILES = Makefile pkgIndex.tcl togl_ws.h
+CLEANFILES = so_locations $(EXAMPLE_OBJS) $(EXAMPLE_SHLIBS)
CPPFLAGS =
-LIBS = -lX11 -lGL -lXmu
+LIBS = -lGL -lXmu -lX11
AR = ar
CFLAGS = -g -O2 -g -Wall -O2 ${CFLAGS_DEFAULT} ${CFLAGS_WARNING} ${SHLIB_CFLAGS}
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -140,23 +139,23 @@
demos: $(DEMO_SHLIBS)
double$(SHLIB_SUFFIX): double.$(OBJEXT)
- $(SHLIB_LD) -o $@ double.$(OBJEXT) -lTogl $(SHLIB_LD_LIBS)
+ $(SHLIB_LD) -o $@ double.$(OBJEXT) -lTogl -lToglstubs $(SHLIB_LD_LIBS)
gears$(SHLIB_SUFFIX): gears.$(OBJEXT)
- $(SHLIB_LD) -o $@ gears.$(OBJEXT) -lTogl $(SHLIB_LD_LIBS) $(MATH_LIBS)
+ $(SHLIB_LD) -o $@ gears.$(OBJEXT) -lTogl -lToglstubs $(SHLIB_LD_LIBS) $(MATH_LIBS)
index$(SHLIB_SUFFIX): index.$(OBJEXT)
- $(SHLIB_LD) -o $@ index.$(OBJEXT) -lTogl $(SHLIB_LD_LIBS)
+ $(SHLIB_LD) -o $@ index.$(OBJEXT) -lTogl -lToglstubs $(SHLIB_LD_LIBS)
overlay$(SHLIB_SUFFIX): overlay.$(OBJEXT)
- $(SHLIB_LD) -o $@ overlay.$(OBJEXT) -lTogl $(SHLIB_LD_LIBS)
+ $(SHLIB_LD) -o $@ overlay.$(OBJEXT) -lTogl -lToglstubs $(SHLIB_LD_LIBS)
stereo$(SHLIB_SUFFIX): stereo.$(OBJEXT)
- $(SHLIB_LD) -o $@ stereo.$(OBJEXT) -lTogl $(SHLIB_LD_LIBS)
+ $(SHLIB_LD) -o $@ stereo.$(OBJEXT) -lTogl -lToglstubs $(SHLIB_LD_LIBS)
texture$(SHLIB_SUFFIX): texture.$(OBJEXT) image.$(OBJEXT)
$(SHLIB_LD) -o $@ texture.$(OBJEXT) image.$(OBJEXT) \
- -lTogl $(LIBGLU) $(SHLIB_LD_LIBS)
+ -lTogl -lToglstubs $(LIBGLU) $(SHLIB_LD_LIBS)
#========================================================================
Modified: packages/togl/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/togl/trunk/debian/changelog?rev=36832&op=diff
==============================================================================
--- packages/togl/trunk/debian/changelog (original)
+++ packages/togl/trunk/debian/changelog Wed Aug 18 14:38:17 2010
@@ -1,11 +1,13 @@
togl (2.0-1) unstable; urgency=low
- * New upstream release (2.0-8.4)
+ * New upstream release (2.0-8.4) (Closes: #582236)
+ * debian/control: add Vcs-Svn and Vcs-Browser entries
* debian/docs : remove TODO file
* debian/docs : remove Togl.html file
* debian/watch : fix watch file
+ * Bumped Standards-Version.
- -- Christophe Trophime <christophe.trophime at grenoble.cnrs.fr> Mon, 28 Jun 2010 14:30:03 +0200
+ -- Christophe Trophime <christophe.trophime at grenoble.cnrs.fr> Tue, 17 Aug 2010 09:57:24 +0200
togl (1.7-12) unstable; urgency=low
Modified: packages/togl/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/togl/trunk/debian/control?rev=36832&op=diff
==============================================================================
--- packages/togl/trunk/debian/control (original)
+++ packages/togl/trunk/debian/control Wed Aug 18 14:38:17 2010
@@ -3,13 +3,15 @@
Priority: extra
Maintainer: Christophe Trophime <christophe.trophime at grenoble.cnrs.fr>
Build-Depends: cdbs, debhelper (>= 7), quilt, autotools-dev, autoconf (>= 2.65), automake (>= 1.11.1), tcl8.5-dev, tk8.5-dev, libgl1-mesa-dev|nvidia-glx-dev, libglu1-mesa-dev, libxmu-dev
-Standards-Version: 3.8.4
+Standards-Version: 3.9.1
Homepage: http://togl.sourceforge.net/
+Vcs-Svn: svn://svn.debian.org/svn/debian-science/packages/togl
+Vcs-Browser: http://svn.debian.org/viewsvn/debian-science/packages/togl
Package: libtogl-dev
Architecture: all
Section: libdevel
-Depends: libtogl2 (>= ${source:Upstream-Version}), libtogl2(<< ${source:Upstream-Version}+1~), ${misc:Depends}
+Depends: libtogl2 (>= ${source:Upstream-Version}), libtogl2(<< ${source:Upstream-Version}+1~), ${shlibs:Depends}, ${misc:Depends}
Description: a Tk OpenGL widget - development files
Togl is a Tk widget for OpenGL rendering. Togl was originally
based on OGLTK, written by Benjamin Bederson at the University
Modified: packages/togl/trunk/debian/libtogl-dev.install
URL: http://svn.debian.org/wsvn/debian-science/packages/togl/trunk/debian/libtogl-dev.install?rev=36832&op=diff
==============================================================================
--- packages/togl/trunk/debian/libtogl-dev.install (original)
+++ packages/togl/trunk/debian/libtogl-dev.install Wed Aug 18 14:38:17 2010
@@ -1,2 +1,3 @@
usr/lib/libTogl.so
+usr/lib/libToglstub.so
usr/include/togl*.h
Modified: packages/togl/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/togl/trunk/debian/rules?rev=36832&op=diff
==============================================================================
--- packages/togl/trunk/debian/rules (original)
+++ packages/togl/trunk/debian/rules Wed Aug 18 14:38:17 2010
@@ -8,17 +8,19 @@
DEB_AUTO_UPDATE_AUTOMAKE := 1.11.1
# no check for this software
-# DEB_MAKE_CHECK_TARGET := demos
+DEB_MAKE_CHECK_TARGET := examples
# Add here any variable or target overrides you need.
DEB_CONFIGURE_EXTRA_FLAGS := --with-tcl=/usr/lib/tcl8.5 --with-tk=/usr/lib/tk8.5
-#makebuilddir/libtogl1::
-# autoconf
+makebuilddir/libtogl2::
+ autoconf
build/libtogl2::
rm -f libTogl2.0.so
- $(CC) -shared -Wl,-soname,libTogl.so.2 -lX11 -lGL -lXmu -ltclstub8.5 -ltkstub8.5 -o libTogl.so.2.0 togl.o
+ #$(CC) -shared -Wl,-soname,libTogl.so.2 -lX11 -lGL -lXmu -ltclstub8.5 -ltkstub8.5 -o libTogl.so.2.0 togl.o
+ $(CC) -shared $(CXXFLAGS) -Wl,-soname,libTogl.so.2 -ldl -lX11 -lGL -lXmu -ltcl8.5 -ltk8.5 -o libTogl.so.2.0 togl.o toglProcAddr.o toglStubInit.o
+ $(CC) -shared $(CXXFLAGS) -Wl,-soname,libToglstub.so.2 -ldl -lX11 -lGL -lXmu -ltcl8.5 -ltk8.5 -o libToglstub.so.2.0 toglStubLib.o
install/libtogl2::
sed -i -e 's/libTogl2.0.so/libTogl.so.2.0/' debian/tmp/usr/lib/pkgIndex.tcl
@@ -27,11 +29,14 @@
mv debian/tmp/usr/lib/pkgIndex.tcl debian/tmp/usr/share/tcltk/tcl8.5/togl-2.0/
install -m644 libTogl.so.2.0 debian/tmp/usr/lib
(cd debian/tmp/usr/lib && ln -s libTogl.so.2.0 ./libTogl.so.2)
+ install -m644 libToglstub.so.2.0 debian/tmp/usr/lib
+ (cd debian/tmp/usr/lib && ln -s libToglstub.so.2.0 ./libToglstub.so.2)
install/libtogl-dev::
mkdir -p debian/tmp/usr/share/include
install -m644 togl*.h debian/tmp/usr/share/include
(cd debian/tmp/usr/lib && ln -s libTogl.so.2 ./libTogl.so)
+ (cd debian/tmp/usr/lib && ln -s libToglstub.so.2 ./libToglstub.so)
install/togl-demos::
mkdir -p debian/tmp/usr/share/togl/
@@ -51,5 +56,7 @@
clean::
- rm -f libTogl.so.2.0
+ rm -f libTogl*.so.2.0
rm -f togl_ws.h
+
+
Modified: packages/togl/trunk/debian/watch
URL: http://svn.debian.org/wsvn/debian-science/packages/togl/trunk/debian/watch?rev=36832&op=diff
==============================================================================
--- packages/togl/trunk/debian/watch (original)
+++ packages/togl/trunk/debian/watch Wed Aug 18 14:38:17 2010
@@ -1,3 +1,2 @@
version=3
-opts="uversionmangle=s/^/-src" \
-http://sf.net/Togl/Togl(.*)\.tar\.gz
+http://sf.net/togl/Togl(.*)-src\.tar\.gz
More information about the debian-science-commits
mailing list