[Pkg-cli-libs-commits] [taoframework] 56/91: taoframework (2.1.svn20090731-1) UNRELEASED; urgency=low
Jo Shields
directhex at moszumanska.debian.org
Mon Sep 22 08:33:21 UTC 2014
This is an automated email from the git hooks/post-receive script.
directhex pushed a commit to branch master
in repository taoframework.
commit 66bea062c226f9324b4d85a8c0bd2ecaca9301fb
Author: Sam Hocevar <sam at zoy.org>
Date: Fri Jul 31 21:02:54 2009 +0000
taoframework (2.1.svn20090731-1) UNRELEASED; urgency=low
* New upstream snapshot.
* Removed all Debian patches, they have been merged upstream.
* debian/patches/200_libavcodec_update.diff:
+ New patch. Reference libavcodec.so.52 instead of 51 (Closes; #516921).
-- Sam Hocevar <sho at debian.org> Sun, 15 Feb 2009 12:05:23 +0000
---
debian/changelog | 10 ++
debian/control | 43 +----
debian/patches/100_new_mono_executables.diff | 239 ---------------------------
debian/patches/200_libavcodec_update.diff | 12 ++
debian/patches/300_proper_dll_config.diff | 30 ----
debian/patches/series | 3 +-
6 files changed, 28 insertions(+), 309 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 5cfa6cd..985a2be 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+taoframework (2.1.svn20090731-1) UNRELEASED; urgency=low
+
+ * New upstream snapshot.
+ * Removed all Debian patches, they have been merged upstream.
+
+ * debian/patches/200_libavcodec_update.diff:
+ + New patch. Reference libavcodec.so.52 instead of 51 (Closes; #516921).
+
+ -- Sam Hocevar <sho at debian.org> Sun, 15 Feb 2009 12:05:23 +0000
+
taoframework (2.1.svn20090213-1) UNRELEASED; urgency=low
[ Sam Hocevar ]
diff --git a/debian/control b/debian/control
index 5d57296..10e15a0 100644
--- a/debian/control
+++ b/debian/control
@@ -2,12 +2,13 @@ Source: taoframework
Section: libs
Priority: optional
Maintainer: Debian CLI Libraries Team <pkg-cli-libs-team at lists.alioth.debian.org>
-Uploaders: Sebastian Dröge <slomo at debian.org>, Dylan R. E. Moonfire <debian at mfgames.com>, Sam Hocevar (Debian packages) <sam+deb at zoy.org>
+Uploaders: Sebastian Dröge <slomo at debian.org>, Dylan R. E. Moonfire <debian at mfgames.com>, Sam Hocevar <sho at debian.org>
Build-Depends: debhelper (>= 5), quilt
-Build-Depends-Indep: cli-common-dev (>= 0.4.4), mono-gac, mono-gmcs, mono-2.0-devel, mono-utils, libmono-dev, libopenal-dev, libsdl-image1.2-dev, libsdl-mixer1.2-dev, libsdl-net1.2-dev, libsdl-ttf2.0-dev, libsdl1.2-dev, libsmpeg-dev, libode0-dev, libdevil-dev, libphysfs-dev, freeglut3-dev, libglu1-mesa-dev | libglu1-dev, libgl1-mesa-dev | libgl1-dev, monodoc-base, liblua5.1-0-dev, libavcodec-dev (>= 0.svn20080206-8), libavformat-dev (>= 0.svn20080206-8), libnunit2.4-cil, libftgl-dev, lib [...]
+Build-Depends-Indep: cli-common-dev (>= 0.4.4), mono-gac, mono-gmcs, mono-2.0-devel, mono-utils, libmono-dev, libopenal-dev, libsdl-image1.2-dev, libsdl-mixer1.2-dev, libsdl-net1.2-dev, libsdl-ttf2.0-dev, libsdl1.2-dev, libsmpeg-dev, libode0-dev, libdevil-dev, libphysfs-dev, freeglut3-dev, libglu1-mesa-dev | libglu1-dev, libgl1-mesa-dev | libgl1-dev, monodoc-base, liblua5.1-0-dev, libavcodec-dev (>= 3:0.svn20090303-1), libavformat-dev (>= 3:0.svn20090303-1), libnunit2.4-cil, libftgl-dev, [...]
Standards-Version: 3.8.0
Vcs-Svn: svn://svn.debian.org/svn/pkg-cli-libs/packages/taoframework/trunk
Vcs-Browser: http://svn.debian.org/wsvn/pkg-cli-libs/packages/taoframework/trunk?op=log
+Homepage: http://www.taoframework.com/
Package: taoframework-examples
Architecture: all
@@ -18,8 +19,6 @@ Description: examples for all Tao libraries
and .NET platforms.
.
This package contains some examples for all Tao libraries.
- .
- http://www.mono-project.com/Tao
Package: libtaoframework-opengl3.0-cil
Architecture: all
@@ -37,9 +36,6 @@ Description: Tao CLI binding for OpenGL and GLU
GLU is the OpenGL Utility Library. This is a set of functions to create
texture mipmaps from a base image, map coordinates between screen and
object space, and draw quadric surfaces and NURBS.
- .
- http://www.mono-project.com/Tao
- http://www.opengl.org
Package: libtaoframework-openal1.1-cil
Architecture: all
@@ -54,9 +50,6 @@ Description: Tao CLI binding for OpenAL
audio. OpenAL's primary audience are application developers and desktop
users that rely on portable standards like OpenGL, for games and other
multimedia applications.
- .
- http://www.mono-project.com/Tao
- http://www.openal.org
Package: libtaoframework-devil1.6-cil
Architecture: all
@@ -72,9 +65,6 @@ Description: Tao CLI binding for DevIL
the developer, so unnecessary conversions, etc. are not performed. DevIL
utilizes a simple, yet powerful, syntax. DevIL can load, save, convert,
manipulate, filter and display a wide variety of image formats.
- .
- http://www.mono-project.com/Tao
- http://openil.sourceforge.net
Package: libtaoframework-ode0.9-cil
Architecture: all
@@ -91,9 +81,6 @@ Description: Tao CLI binding for ODE
legged creatures, and moving objects in VR environments. It is fast,
flexible, robust and platform independent, with advanced joints,
contact with friction, and built-in collision detection.
- .
- http://www.mono-project.com/Tao
- http://ode.org
Package: libtaoframework-sdl1.2-cil
Architecture: all
@@ -106,9 +93,6 @@ Description: Tao CLI binding for SDL
Simple DirectMedia Layer (SDL) is a cross-platform multimedia library
designed to provide low level access to audio, keyboard, mouse, joystick,
3D hardware via OpenGL, and 2D video framebuffer.
- .
- http://www.mono-project.com/Tao
- http://www.libsdl.org
Package: libtaoframework-freeglut2.4-cil
Architecture: all
@@ -122,9 +106,6 @@ Description: Tao CLI binding for freeglut
Toolkit (GLUT) library. GLUT (and hence freeglut) allows the user to
create and manage windows containing OpenGL contexts on a wide range of
platforms and also read the mouse, keyboard and joystick functions.
- .
- http://www.mono-project.com/Tao
- http://freeglut.sourceforge.net
Package: libtaoframework-physfs1.0-cil
Architecture: all
@@ -137,9 +118,6 @@ Description: Tao CLI binding for PhysicsFS
The PhysicsFS filesystem abstraction library provides a simple C
interface to aid game programmers in utilizing game assets packaged in
many different types of archive files.
- .
- http://www.mono-project.com/Tao
- http://icculus.org/physfs
Package: libtaoframework-ffmpeg0.4-cil
Architecture: all
@@ -151,9 +129,6 @@ Description: Tao CLI binding for FFmpeg
.
The FFmpeg libraries support most existing file formats (AVI, MPEG, OGG,
Matroska, ASF...) and encoding formats (MPEG, DivX, MPEG4, AC3, DV...).
- .
- http://www.mono-project.com/Tao
- http://ffmpeg.mplayerhq.hu/
Package: libtaoframework-freetype2.3-cil
Architecture: all
@@ -165,9 +140,6 @@ Description: Tao CLI binding for FreeType
.
The FreeType 2 library is a software font engine. It supports high quality,
anti-aliased rendering of TTF and other font formats.
- .
- http://www.mono-project.com/Tao
- http://www.freetype.org/
Package: libtaoframework-ftgl2.1-cil
Architecture: all
@@ -180,9 +152,6 @@ Description: Tao CLI binding for FTGL
The FTGL library binds OpenGL and FreeType together in order to offer an
easy to use and flexible text rendering library. It offers several
rendering modes: as polygons, outlines, bitmaps and textures.
- .
- http://www.mono-project.com/Tao
- http://ftgl.sf.net/
Package: libtaoframework-lua5.1-cil
Architecture: all
@@ -195,9 +164,6 @@ Description: Tao CLI binding for Lua
Lua is a programming language originally designed for extending
applications, but also frequently used as a general-purpose,
stand-alone language.
- .
- http://www.mono-project.com/Tao
- http://www.lua.org/
Package: monodoc-taoframework-manual
Architecture: all
@@ -208,4 +174,5 @@ Description: compiled XML documentation for all the Tao libraries
provides detailed API documentation for all Mono components and the Mono CLI
implementation.
.
- This packages contains the compiled XML documentation for Tao.
+ This package contains the compiled XML documentation for Tao.
+
diff --git a/debian/patches/100_new_mono_executables.diff b/debian/patches/100_new_mono_executables.diff
deleted file mode 100644
index 8c8bb3c..0000000
--- a/debian/patches/100_new_mono_executables.diff
+++ /dev/null
@@ -1,239 +0,0 @@
-Index: taoframework-2.1.svn20090213/configure
-===================================================================
---- taoframework-2.1.svn20090213.orig/configure 2009-02-14 10:13:52.000000000 +0100
-+++ taoframework-2.1.svn20090213/configure 2009-02-14 10:13:57.000000000 +0100
-@@ -673,10 +673,12 @@
- MONO_DEPENDENCY_LIBS
- RUNTIME
- CSC
-+GMCS
- LIB_PREFIX
- LIB_SUFFIX
- GACUTIL
- RESGEN
-+RESGEN1
- MONODOC_REQUIRED_VERSION
- MONODOC_DEPENDENCY_CFLAGS
- MONODOC_DEPENDENCY_LIBS
-@@ -2681,8 +2683,8 @@
- fi
-
-
-- # Extract the first word of "gmcs", so it can be a program name with args.
--set dummy gmcs; ac_word=$2
-+ # Extract the first word of "csc", so it can be a program name with args.
-+set dummy csc; ac_word=$2
- { echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_path_CSC+set}" = set; then
-@@ -2722,6 +2724,50 @@
- fi
-
-
-+ if test "$CSC" = "no"; then
-+ # Extract the first word of "gmcs", so it can be a program name with args.
-+set dummy gmcs; ac_word=$2
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+if test "${ac_cv_path_GMCS+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ case $GMCS in
-+ [\\/]* | ?:[\\/]*)
-+ ac_cv_path_GMCS="$GMCS" # Let the user override the test with a path.
-+ ;;
-+ *)
-+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ for ac_exec_ext in '' $ac_executable_extensions; do
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ ac_cv_path_GMCS="$as_dir/$ac_word$ac_exec_ext"
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
-+done
-+done
-+IFS=$as_save_IFS
-+
-+ test -z "$ac_cv_path_GMCS" && ac_cv_path_GMCS="no"
-+ ;;
-+esac
-+fi
-+GMCS=$ac_cv_path_GMCS
-+if test -n "$GMCS"; then
-+ { echo "$as_me:$LINENO: result: $GMCS" >&5
-+echo "${ECHO_T}$GMCS" >&6; }
-+else
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+fi
-+
-+
-+ CSC="$GMCS"
-+ fi
- if test `uname -s` = "Darwin"; then
- LIB_PREFIX=
- LIB_SUFFIX=.dylib
-@@ -2771,15 +2817,14 @@
- fi
-
-
-- if test x$CSC = "xno"; then
-- { { echo "$as_me:$LINENO: error: You need to install either mono or .Net" >&5
-+ RUNTIME=
-+ LIB_PREFIX=
-+ LIB_SUFFIX=
-+fi
-+if test x$CSC = "xno"; then
-+ { { echo "$as_me:$LINENO: error: You need to install either mono or .Net" >&5
- echo "$as_me: error: You need to install either mono or .Net" >&2;}
- { (exit 1); exit 1; }; }
-- else
-- RUNTIME=
-- LIB_PREFIX=
-- LIB_SUFFIX=
-- fi
- fi
-
-
-@@ -2834,8 +2879,8 @@
- fi
-
-
--# Extract the first word of "resgen", so it can be a program name with args.
--set dummy resgen; ac_word=$2
-+# Extract the first word of "resgen2", so it can be a program name with args.
-+set dummy resgen2; ac_word=$2
- { echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_path_RESGEN+set}" = set; then
-@@ -2874,7 +2919,51 @@
- fi
-
-
--if test "x$RESGEN" = "xno" ; then
-+if test "$RESGEN" = "no"; then
-+ # Extract the first word of "resgen", so it can be a program name with args.
-+set dummy resgen; ac_word=$2
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+if test "${ac_cv_path_RESGEN1+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ case $RESGEN1 in
-+ [\\/]* | ?:[\\/]*)
-+ ac_cv_path_RESGEN1="$RESGEN1" # Let the user override the test with a path.
-+ ;;
-+ *)
-+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ for ac_exec_ext in '' $ac_executable_extensions; do
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ ac_cv_path_RESGEN1="$as_dir/$ac_word$ac_exec_ext"
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
-+done
-+done
-+IFS=$as_save_IFS
-+
-+ test -z "$ac_cv_path_RESGEN1" && ac_cv_path_RESGEN1="no"
-+ ;;
-+esac
-+fi
-+RESGEN1=$ac_cv_path_RESGEN1
-+if test -n "$RESGEN1"; then
-+ { echo "$as_me:$LINENO: result: $RESGEN1" >&5
-+echo "${ECHO_T}$RESGEN1" >&6; }
-+else
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+fi
-+
-+
-+ RESGEN="$RESGEN1"
-+fi
-+if test "$RESGEN" = "no" ; then
- { { echo "$as_me:$LINENO: error: No resgen tool found" >&5
- echo "$as_me: error: No resgen tool found" >&2;}
- { (exit 1); exit 1; }; }
-@@ -3882,10 +3971,12 @@
- ac_delim='%!_!# '
- for ac_last_try in false false false false false :; do
- cat >conf$$subs.sed <<_ACEOF
-+GMCS!$GMCS$ac_delim
- LIB_PREFIX!$LIB_PREFIX$ac_delim
- LIB_SUFFIX!$LIB_SUFFIX$ac_delim
- GACUTIL!$GACUTIL$ac_delim
- RESGEN!$RESGEN$ac_delim
-+RESGEN1!$RESGEN1$ac_delim
- MONODOC_REQUIRED_VERSION!$MONODOC_REQUIRED_VERSION$ac_delim
- MONODOC_DEPENDENCY_CFLAGS!$MONODOC_DEPENDENCY_CFLAGS$ac_delim
- MONODOC_DEPENDENCY_LIBS!$MONODOC_DEPENDENCY_LIBS$ac_delim
-@@ -3898,7 +3989,7 @@
- LTLIBOBJS!$LTLIBOBJS$ac_delim
- _ACEOF
-
-- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 14; then
-+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 16; then
- break
- elif $ac_last_try; then
- { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-Index: taoframework-2.1.svn20090213/configure.ac
-===================================================================
---- taoframework-2.1.svn20090213.orig/configure.ac 2009-02-14 10:13:52.000000000 +0100
-+++ taoframework-2.1.svn20090213/configure.ac 2009-02-14 10:13:59.000000000 +0100
-@@ -27,7 +27,11 @@
- has_mono=true, has_mono=false)
- if test "x$has_mono" = "xtrue"; then
- AC_PATH_PROG(RUNTIME, mono, no)
-- AC_PATH_PROG(CSC, gmcs, no)
-+ AC_PATH_PROG(CSC, csc, no)
-+ if test "$CSC" = "no"; then
-+ AC_PATH_PROG(GMCS, gmcs, no)
-+ CSC="$GMCS"
-+ fi
- if test `uname -s` = "Darwin"; then
- LIB_PREFIX=
- LIB_SUFFIX=.dylib
-@@ -37,13 +41,12 @@
- fi
- else
- AC_PATH_PROG(CSC, csc.exe, no)
-- if test x$CSC = "xno"; then
-- AC_MSG_ERROR([You need to install either mono or .Net])
-- else
-- RUNTIME=
-- LIB_PREFIX=
-- LIB_SUFFIX=
-- fi
-+ RUNTIME=
-+ LIB_PREFIX=
-+ LIB_SUFFIX=
-+fi
-+if test x$CSC = "xno"; then
-+ AC_MSG_ERROR([You need to install either mono or .Net])
- fi
-
- AC_SUBST(LIB_PREFIX)
-@@ -57,8 +60,12 @@
- fi
- AC_SUBST(GACUTIL)
-
--AC_PATH_PROG(RESGEN, resgen)
--if test "x$RESGEN" = "xno" ; then
-+AC_PATH_PROG(RESGEN, resgen2)
-+if test "$RESGEN" = "no"; then
-+ AC_PATH_PROG(RESGEN1, resgen, no)
-+ RESGEN="$RESGEN1"
-+fi
-+if test "$RESGEN" = "no" ; then
- AC_MSG_ERROR([No resgen tool found])
- fi
- AC_SUBST(RESGEN)
diff --git a/debian/patches/200_libavcodec_update.diff b/debian/patches/200_libavcodec_update.diff
new file mode 100644
index 0000000..c8eff6a
--- /dev/null
+++ b/debian/patches/200_libavcodec_update.diff
@@ -0,0 +1,12 @@
+Index: taoframework-2.1.svn20090215/src/Tao.FFmpeg/Tao.FFmpeg.dll.config
+===================================================================
+--- taoframework-2.1.svn20090215.orig/src/Tao.FFmpeg/Tao.FFmpeg.dll.config 2009-03-20 01:20:33.000000000 +0100
++++ taoframework-2.1.svn20090215/src/Tao.FFmpeg/Tao.FFmpeg.dll.config 2009-03-20 01:20:38.000000000 +0100
+@@ -1,6 +1,6 @@
+ <configuration>
+ <dllmap dll="avcodec-51.dll">
+- <dllentry os="linux" dll="libavcodec.so.51" />
++ <dllentry os="linux" dll="libavcodec.so.52" />
+ <dllentry os="windows" dll="avcodec-51.dll" />
+ <dllentry os="osx" dll="libavcodec.so.51" />
+ </dllmap>
diff --git a/debian/patches/300_proper_dll_config.diff b/debian/patches/300_proper_dll_config.diff
deleted file mode 100644
index 2873824..0000000
--- a/debian/patches/300_proper_dll_config.diff
+++ /dev/null
@@ -1,30 +0,0 @@
-Index: taoframework-2.1.0/src/Tao.FFmpeg/Tao.FFmpeg.dll.config
-===================================================================
---- taoframework-2.1.0.orig/src/Tao.FFmpeg/Tao.FFmpeg.dll.config
-+++ taoframework-2.1.0/src/Tao.FFmpeg/Tao.FFmpeg.dll.config
-@@ -1,21 +1,21 @@
- <configuration>
- <dllmap dll="avcodec-51.dll">
-- <dllentry os="linux" dll="libavcodec.so.1d" />
-+ <dllentry os="linux" dll="libavcodec.so.51" />
- <dllentry os="windows" dll="avcodec-51.dll" />
- <dllentry os="osx" dll="libavcodec.so.1d" />
- </dllmap>
- <dllmap dll="avformat-52.dll">
-- <dllentry os="linux" dll="libavformat.so.1d" />
-+ <dllentry os="linux" dll="libavformat.so.52" />
- <dllentry os="windows" dll="avformat-52.dll" />
- <dllentry os="osx" dll="libavformat.so.1d" />
- </dllmap>
- <dllmap dll="avutil-49.dll">
-- <dllentry os="linux" dll="libavutil.so.1d" />
-+ <dllentry os="linux" dll="libavutil.so.49" />
- <dllentry os="windows" dll="avutil-49.dll" />
- <dllentry os="osx" dll="libavutil.so.1d" />
- </dllmap>
- <dllmap dll="swscale-0.dll">
-- <dllentry os="linux" dll="libswscale.so.1d" />
-+ <dllentry os="linux" dll="libswscale.so.0" />
- <dllentry os="windows" dll="swscale-0.dll" />
- <dllentry os="osx" dll="libswscale.so.1d" />
- </dllmap>
diff --git a/debian/patches/series b/debian/patches/series
index 8755f4f..ff37eec 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-100_new_mono_executables.diff
-300_proper_dll_config.diff
+200_libavcodec_update.diff
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-cli-libs/packages/taoframework.git
More information about the Pkg-cli-libs-commits
mailing list