r7303 - packages/trunk/teg/debian
Author: kibi Date: 2008-06-09 06:17:56 + (Mon, 09 Jun 2008) New Revision: 7303 Modified: packages/trunk/teg/debian/changelog Log: New (upstream) version: repack to get rid of debian/. Modified: packages/trunk/teg/debian/changelog === --- packages/trunk/teg/debian/changelog 2008-06-09 02:17:27 UTC (rev 7302) +++ packages/trunk/teg/debian/changelog 2008-06-09 06:17:56 UTC (rev 7303) @@ -1,4 +1,4 @@ -teg (0.11.2-3) UNRELEASED; urgency=low +teg (0.11.2+debian-1) UNRELEASED; urgency=low [ Eddy Petrișor ] * add missing Vcs-Svn headers @@ -6,6 +6,11 @@ [ Ansgar Burchardt ] * Remove Homepage semi-field from description + [ Cyril Brulebois ] + * Repack upstream tarball to get rid of the (outdated anyway) debian/ +directory. The only step is to remove that particular directory, and +rename the toplevel directory with a “.orig” suffix. + -- Eddy Petrișor [EMAIL PROTECTED] Wed, 05 Mar 2008 02:40:38 +0200 teg (0.11.2-2) unstable; urgency=low ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
r7304 - in packages/trunk/teg/debian: . patches
Author: kibi Date: 2008-06-09 06:25:30 + (Mon, 09 Jun 2008) New Revision: 7304 Modified: packages/trunk/teg/debian/changelog packages/trunk/teg/debian/patches/fix_xml-doc-for-yelp.diff Log: Fix FTBFS with new source package format (Closes: #485107). ! The diff was too big and was omitted from this mail ! The command svn diff -r 7303:7304 . typed in the updated working copy will allow you to see the diff Also this link should allow you to see the differences in a browser: http://svn.debian.org/wsvn/pkg-games?op=comp[EMAIL PROTECTED][EMAIL PROTECTED] ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
r7305 - packages/trunk/teg/debian
Author: kibi Date: 2008-06-09 06:29:38 + (Mon, 09 Jun 2008) New Revision: 7305 Modified: packages/trunk/teg/debian/changelog packages/trunk/teg/debian/control Log: Add myself to Uploaders. Modified: packages/trunk/teg/debian/changelog === --- packages/trunk/teg/debian/changelog 2008-06-09 06:25:30 UTC (rev 7304) +++ packages/trunk/teg/debian/changelog 2008-06-09 06:29:38 UTC (rev 7305) @@ -14,6 +14,7 @@ otherwise trigger an FTBFS with the new “3.0 (quilt)” source package format, as pointed out by Raphaël Hertzog (Closes: #485107): - fix_xml-doc-for-yelp.diff + * Add myself to Uploaders. -- Eddy Petrișor [EMAIL PROTECTED] Wed, 05 Mar 2008 02:40:38 +0200 Modified: packages/trunk/teg/debian/control === --- packages/trunk/teg/debian/control 2008-06-09 06:25:30 UTC (rev 7304) +++ packages/trunk/teg/debian/control 2008-06-09 06:29:38 UTC (rev 7305) @@ -2,7 +2,7 @@ Section: games Priority: optional Maintainer: Debian Games Team [EMAIL PROTECTED] -Uploaders: Gonéri Le Bouder [EMAIL PROTECTED] +Uploaders: Gonéri Le Bouder [EMAIL PROTECTED], Cyril Brulebois [EMAIL PROTECTED] Standards-Version: 3.7.2 Build-Depends: debhelper (= 5.0.0), gettext, intltool, libtool, librsvg2-dev, libart-2.0-dev, libatk1.0-dev, libbonobo2-dev, libbonoboui2-dev, libfreetype6-dev, libgconf2-dev, libglib2.0-dev, libgnome2-dev, libgnomecanvas2-dev, libgnomeui-dev (= 2.6.1.1-4), libgnomevfs2-dev (= 2.0.2-4), libgtk2.0-dev (= 2.0.6-1), liborbit2-dev, libpango1.0-dev, libpopt-dev, libxml2-dev, zlib1g-dev, libreadline5-dev, quilt Homepage: http://teg.sourceforge.net/ ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
r7306 - packages/trunk/teg/debian
Author: kibi Date: 2008-06-09 06:31:20 + (Mon, 09 Jun 2008) New Revision: 7306 Modified: packages/trunk/teg/debian/changelog packages/trunk/teg/debian/control Log: Remove “-1” from the version of libgtk2.0-dev in Build-Depends. Modified: packages/trunk/teg/debian/changelog === --- packages/trunk/teg/debian/changelog 2008-06-09 06:29:38 UTC (rev 7305) +++ packages/trunk/teg/debian/changelog 2008-06-09 06:31:20 UTC (rev 7306) @@ -15,6 +15,8 @@ format, as pointed out by Raphaël Hertzog (Closes: #485107): - fix_xml-doc-for-yelp.diff * Add myself to Uploaders. + * Remove “-1” from the version of libgtk2.0-dev in Build-Depends, which +might make the life of backporters easier. -- Eddy Petrișor [EMAIL PROTECTED] Wed, 05 Mar 2008 02:40:38 +0200 Modified: packages/trunk/teg/debian/control === --- packages/trunk/teg/debian/control 2008-06-09 06:29:38 UTC (rev 7305) +++ packages/trunk/teg/debian/control 2008-06-09 06:31:20 UTC (rev 7306) @@ -4,7 +4,7 @@ Maintainer: Debian Games Team [EMAIL PROTECTED] Uploaders: Gonéri Le Bouder [EMAIL PROTECTED], Cyril Brulebois [EMAIL PROTECTED] Standards-Version: 3.7.2 -Build-Depends: debhelper (= 5.0.0), gettext, intltool, libtool, librsvg2-dev, libart-2.0-dev, libatk1.0-dev, libbonobo2-dev, libbonoboui2-dev, libfreetype6-dev, libgconf2-dev, libglib2.0-dev, libgnome2-dev, libgnomecanvas2-dev, libgnomeui-dev (= 2.6.1.1-4), libgnomevfs2-dev (= 2.0.2-4), libgtk2.0-dev (= 2.0.6-1), liborbit2-dev, libpango1.0-dev, libpopt-dev, libxml2-dev, zlib1g-dev, libreadline5-dev, quilt +Build-Depends: debhelper (= 5.0.0), gettext, intltool, libtool, librsvg2-dev, libart-2.0-dev, libatk1.0-dev, libbonobo2-dev, libbonoboui2-dev, libfreetype6-dev, libgconf2-dev, libglib2.0-dev, libgnome2-dev, libgnomecanvas2-dev, libgnomeui-dev (= 2.6.1.1-4), libgnomevfs2-dev (= 2.0.2-4), libgtk2.0-dev (= 2.0.6), liborbit2-dev, libpango1.0-dev, libpopt-dev, libxml2-dev, zlib1g-dev, libreadline5-dev, quilt Homepage: http://teg.sourceforge.net/ Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/teg/ Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/teg/?op=log ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
r7307 - packages/trunk/teg/debian
Author: kibi Date: 2008-06-09 06:40:41 + (Mon, 09 Jun 2008) New Revision: 7307 Modified: packages/trunk/teg/debian/changelog packages/trunk/teg/debian/rules Log: Use a quilt.make include and appropriate targets. Keep .pc/* out of Debian diff. Modified: packages/trunk/teg/debian/changelog === --- packages/trunk/teg/debian/changelog 2008-06-09 06:31:20 UTC (rev 7306) +++ packages/trunk/teg/debian/changelog 2008-06-09 06:40:41 UTC (rev 7307) @@ -17,6 +17,9 @@ * Add myself to Uploaders. * Remove “-1” from the version of libgtk2.0-dev in Build-Depends, which might make the life of backporters easier. + * Use a quilt.make include, and patch/unpatch targets rather than +calling quilt directly. That also keeps .pc/* away from the Debian +diff. -- Eddy Petrișor [EMAIL PROTECTED] Wed, 05 Mar 2008 02:40:38 +0200 Modified: packages/trunk/teg/debian/rules === --- packages/trunk/teg/debian/rules 2008-06-09 06:31:20 UTC (rev 7306) +++ packages/trunk/teg/debian/rules 2008-06-09 06:40:41 UTC (rev 7307) @@ -4,6 +4,8 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +include /usr/share/quilt/quilt.make + export CFLAGS := -Wall -g ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) CFLAGS += -O0 @@ -14,8 +16,7 @@ configure: configure-stamp -configure-stamp: - QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2 +configure-stamp: patch dh_testdir ./configure --prefix=/usr \ --bindir=/usr/games \ @@ -32,12 +33,11 @@ $(MAKE) touch build-stamp -clean: +clean: realclean unpatch +realclean: dh_testdir dh_testroot [ ! -f Makefile ] || $(MAKE) distclean -# rm -f po/*.gmo configure-stamp build-stamp config.log config.status - QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2 dh_clean po/*.gmo configure-stamp build-stamp config.log config.status install: build ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
r7308 - packages/trunk/teg/debian
Author: kibi Date: 2008-06-09 06:42:37 + (Mon, 09 Jun 2008) New Revision: 7308 Modified: packages/trunk/teg/debian/changelog packages/trunk/teg/debian/control Log: Bump Standards-Version from 3.7.2 to 3.7.3, no changes required. Modified: packages/trunk/teg/debian/changelog === --- packages/trunk/teg/debian/changelog 2008-06-09 06:40:41 UTC (rev 7307) +++ packages/trunk/teg/debian/changelog 2008-06-09 06:42:37 UTC (rev 7308) @@ -20,6 +20,7 @@ * Use a quilt.make include, and patch/unpatch targets rather than calling quilt directly. That also keeps .pc/* away from the Debian diff. + * Bump Standards-Version from 3.7.2 to 3.7.3, no changes required. -- Eddy Petrișor [EMAIL PROTECTED] Wed, 05 Mar 2008 02:40:38 +0200 Modified: packages/trunk/teg/debian/control === --- packages/trunk/teg/debian/control 2008-06-09 06:40:41 UTC (rev 7307) +++ packages/trunk/teg/debian/control 2008-06-09 06:42:37 UTC (rev 7308) @@ -3,7 +3,7 @@ Priority: optional Maintainer: Debian Games Team [EMAIL PROTECTED] Uploaders: Gonéri Le Bouder [EMAIL PROTECTED], Cyril Brulebois [EMAIL PROTECTED] -Standards-Version: 3.7.2 +Standards-Version: 3.7.3 Build-Depends: debhelper (= 5.0.0), gettext, intltool, libtool, librsvg2-dev, libart-2.0-dev, libatk1.0-dev, libbonobo2-dev, libbonoboui2-dev, libfreetype6-dev, libgconf2-dev, libglib2.0-dev, libgnome2-dev, libgnomecanvas2-dev, libgnomeui-dev (= 2.6.1.1-4), libgnomevfs2-dev (= 2.0.2-4), libgtk2.0-dev (= 2.0.6), liborbit2-dev, libpango1.0-dev, libpopt-dev, libxml2-dev, zlib1g-dev, libreadline5-dev, quilt Homepage: http://teg.sourceforge.net/ Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/teg/ ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
r7309 - packages/trunk/teg/debian
Author: kibi Date: 2008-06-09 06:43:56 + (Mon, 09 Jun 2008) New Revision: 7309 Modified: packages/trunk/teg/debian/changelog Log: Target unstable (and ponctuation nitpick). Modified: packages/trunk/teg/debian/changelog === --- packages/trunk/teg/debian/changelog 2008-06-09 06:42:37 UTC (rev 7308) +++ packages/trunk/teg/debian/changelog 2008-06-09 06:43:56 UTC (rev 7309) @@ -1,10 +1,10 @@ -teg (0.11.2+debian-1) UNRELEASED; urgency=low +teg (0.11.2+debian-1) unstable; urgency=low [ Eddy Petrișor ] - * add missing Vcs-Svn headers + * Add missing Vcs-Svn headers. [ Ansgar Burchardt ] - * Remove Homepage semi-field from description + * Remove Homepage semi-field from description. [ Cyril Brulebois ] * Repack upstream tarball to get rid of the (outdated anyway) debian/ @@ -22,7 +22,7 @@ diff. * Bump Standards-Version from 3.7.2 to 3.7.3, no changes required. - -- Eddy Petrișor [EMAIL PROTECTED] Wed, 05 Mar 2008 02:40:38 +0200 + -- Cyril Brulebois [EMAIL PROTECTED] Mon, 09 Jun 2008 08:44:16 +0200 teg (0.11.2-2) unstable; urgency=low ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
r7310 - packages/tags
Author: caleb-guest Date: 2008-06-09 07:01:43 + (Mon, 09 Jun 2008) New Revision: 7310 Added: packages/tags/bullet/ Log: Creating bullet/ directory. ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
r7311 - packages/trunk
Author: caleb-guest Date: 2008-06-09 07:02:10 + (Mon, 09 Jun 2008) New Revision: 7311 Added: packages/trunk/bullet/ Log: Creating trunk directory ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
r7312 - in packages/trunk/bullet: . debian
Author: caleb-guest Date: 2008-06-09 07:02:40 + (Mon, 09 Jun 2008) New Revision: 7312 Added: packages/trunk/bullet/debian/ packages/trunk/bullet/debian/AllBulletDemos.6 packages/trunk/bullet/debian/changelog packages/trunk/bullet/debian/compat packages/trunk/bullet/debian/control packages/trunk/bullet/debian/copyright packages/trunk/bullet/debian/libbullet-demo.install packages/trunk/bullet/debian/libbullet-demo.links packages/trunk/bullet/debian/libbullet-demo.manpages packages/trunk/bullet/debian/libbullet-dev.docs packages/trunk/bullet/debian/rules packages/trunk/bullet/debian/watch Log: [svn-inject] Applying Debian modifications to trunk Property changes on: packages/trunk/bullet/debian ___ Name: mergeWithUpstream + 1 Added: packages/trunk/bullet/debian/AllBulletDemos.6 === --- packages/trunk/bullet/debian/AllBulletDemos.6 (rev 0) +++ packages/trunk/bullet/debian/AllBulletDemos.6 2008-06-09 07:02:40 UTC (rev 7312) @@ -0,0 +1,14 @@ +.TH BULLET 6 June 9, 2008 +.SH NAME +AllBulletDemos \- demo program of Bullet Physics Library +.SH SYNOPSIS +.B AllBulletDemos +.SH DESCRIPTION +Bullet is a professional open source multi-threaded 3D Collision Detection and Rigid Body Dynamics Library. +.PP +The library is being used by several professional game developers on PC, PlayStation 3, XBox 360 and Nintendo Wii. +.PP +Bullet is native part of Blender 3D modeler and it supports COLLADA Physics file format. +.SH AUTHOR +This manual page was written by Wen-Yen Chuang [EMAIL PROTECTED], +for the Debian project (but may be used by others). Added: packages/trunk/bullet/debian/changelog === --- packages/trunk/bullet/debian/changelog (rev 0) +++ packages/trunk/bullet/debian/changelog 2008-06-09 07:02:40 UTC (rev 7312) @@ -0,0 +1,5 @@ +bullet (2.69-1) unstable; urgency=low + + * Initial release (Closes: #476284) + + -- Wen-Yen Chuang [EMAIL PROTECTED] Mon, 09 Jun 2008 12:41:36 +0800 Added: packages/trunk/bullet/debian/compat === --- packages/trunk/bullet/debian/compat (rev 0) +++ packages/trunk/bullet/debian/compat 2008-06-09 07:02:40 UTC (rev 7312) @@ -0,0 +1 @@ +6 Added: packages/trunk/bullet/debian/control === --- packages/trunk/bullet/debian/control(rev 0) +++ packages/trunk/bullet/debian/control2008-06-09 07:02:40 UTC (rev 7312) @@ -0,0 +1,34 @@ +Source: bullet +Section: libdevel +Priority: optional +Maintainer: Wen-Yen Chuang [EMAIL PROTECTED] +Build-Depends: debhelper (= 6), jam, freeglut3-dev, zlib1g-dev +Standards-Version: 3.7.3 +Homepage: http://www.bulletphysics.com/ + +Package: libbullet-dev +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: a 3D physics library - development files + Bullet is a professional open source multi-threaded 3D Collision Detection and + Rigid Body Dynamics Library. + . + The library is being used by several professional game developers on PC, + PlayStation 3, XBox 360 and Nintendo Wii. + . + Bullet is native part of Blender 3D modeler and it supports COLLADA Physics + file format. + +Package: libbullet-demo +Section: games +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: a 3D physics library - demos + Bullet is a professional open source multi-threaded 3D Collision Detection and + Rigid Body Dynamics Library. + . + The library is being used by several professional game developers on PC, + PlayStation 3, XBox 360 and Nintendo Wii. + . + Bullet is native part of Blender 3D modeler and it supports COLLADA Physics + file format. Added: packages/trunk/bullet/debian/copyright === --- packages/trunk/bullet/debian/copyright (rev 0) +++ packages/trunk/bullet/debian/copyright 2008-06-09 07:02:40 UTC (rev 7312) @@ -0,0 +1,22 @@ +This package was debianized by Wen-Yen Chuang [EMAIL PROTECTED] on +Mon, 09 Jun 2008 12:41:36 +0800. + +It was downloaded from http://code.google.com/p/bullet/downloads/list + +Upstream Author: Erwin Coumans + +Copyright: 2003-2006 Erwin Coumans http://continuousphysics.com/Bullet/ + +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
r7313 - packages/trunk/bullet/debian
Author: caleb-guest Date: 2008-06-09 07:09:11 + (Mon, 09 Jun 2008) New Revision: 7313 Modified: packages/trunk/bullet/debian/changelog packages/trunk/bullet/debian/control Log: tag UNRELEASED Modified: packages/trunk/bullet/debian/changelog === --- packages/trunk/bullet/debian/changelog 2008-06-09 07:02:40 UTC (rev 7312) +++ packages/trunk/bullet/debian/changelog 2008-06-09 07:09:11 UTC (rev 7313) @@ -1,4 +1,4 @@ -bullet (2.69-1) unstable; urgency=low +bullet (2.69-1) UNRELEASED; urgency=low * Initial release (Closes: #476284) Modified: packages/trunk/bullet/debian/control === --- packages/trunk/bullet/debian/control2008-06-09 07:02:40 UTC (rev 7312) +++ packages/trunk/bullet/debian/control2008-06-09 07:09:11 UTC (rev 7313) @@ -1,7 +1,8 @@ Source: bullet Section: libdevel Priority: optional -Maintainer: Wen-Yen Chuang [EMAIL PROTECTED] +Maintainer: Debian Games Team [EMAIL PROTECTED] +Uploaders: Wen-Yen Chuang [EMAIL PROTECTED] Build-Depends: debhelper (= 6), jam, freeglut3-dev, zlib1g-dev Standards-Version: 3.7.3 Homepage: http://www.bulletphysics.com/ ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
r7314 - packages/trunk/teg/debian
Author: kibi Date: 2008-06-09 07:14:55 + (Mon, 09 Jun 2008) New Revision: 7314 Modified: packages/trunk/teg/debian/rules Log: Clean target dependencies, so that configure isn't run again. Modified: packages/trunk/teg/debian/rules === --- packages/trunk/teg/debian/rules 2008-06-09 07:09:11 UTC (rev 7313) +++ packages/trunk/teg/debian/rules 2008-06-09 07:14:55 UTC (rev 7314) @@ -15,8 +15,8 @@ -configure: configure-stamp -configure-stamp: patch +configure: patch configure-stamp +configure-stamp: dh_testdir ./configure --prefix=/usr \ --bindir=/usr/games \ @@ -26,7 +26,7 @@ touch configure-stamp -build: configure-stamp build-stamp +build: build-stamp build-stamp: configure-stamp dh_testdir ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
r7315 - packages/trunk/teg/debian
Author: kibi Date: 2008-06-09 07:27:52 + (Mon, 09 Jun 2008) New Revision: 7315 Modified: packages/trunk/teg/debian/changelog packages/trunk/teg/debian/rules Log: Silly “make distclean” doesn't do its job. Add workaround. Modified: packages/trunk/teg/debian/changelog === --- packages/trunk/teg/debian/changelog 2008-06-09 07:14:55 UTC (rev 7314) +++ packages/trunk/teg/debian/changelog 2008-06-09 07:27:52 UTC (rev 7315) @@ -21,6 +21,8 @@ calling quilt directly. That also keeps .pc/* away from the Debian diff. * Bump Standards-Version from 3.7.2 to 3.7.3, no changes required. + * Remove additional files in “clean” since “make distclean” doesn't do +its job: intltool-update and *.html under docs/gnome-help/. -- Cyril Brulebois [EMAIL PROTECTED] Mon, 09 Jun 2008 08:44:16 +0200 Modified: packages/trunk/teg/debian/rules === --- packages/trunk/teg/debian/rules 2008-06-09 07:14:55 UTC (rev 7314) +++ packages/trunk/teg/debian/rules 2008-06-09 07:27:52 UTC (rev 7315) @@ -38,6 +38,9 @@ dh_testdir dh_testroot [ ! -f Makefile ] || $(MAKE) distclean + # Make distclean doesn't do its job. + rm -f intltool-update + -find docs/gnome-help -name '*.html' -delete dh_clean po/*.gmo configure-stamp build-stamp config.log config.status install: build ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
r7316 - packages/trunk/teg/debian
Author: kibi Date: 2008-06-09 07:28:56 + (Mon, 09 Jun 2008) New Revision: 7316 Modified: packages/trunk/teg/debian/changelog Log: Update the timestamp again. Hopefully the real upload will follow. Modified: packages/trunk/teg/debian/changelog === --- packages/trunk/teg/debian/changelog 2008-06-09 07:27:52 UTC (rev 7315) +++ packages/trunk/teg/debian/changelog 2008-06-09 07:28:56 UTC (rev 7316) @@ -24,7 +24,7 @@ * Remove additional files in “clean” since “make distclean” doesn't do its job: intltool-update and *.html under docs/gnome-help/. - -- Cyril Brulebois [EMAIL PROTECTED] Mon, 09 Jun 2008 08:44:16 +0200 + -- Cyril Brulebois [EMAIL PROTECTED] Mon, 09 Jun 2008 09:29:18 +0200 teg (0.11.2-2) unstable; urgency=low ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
r7317 - packages/trunk/teg/debian
Author: kibi Date: 2008-06-09 07:38:57 + (Mon, 09 Jun 2008) New Revision: 7317 Modified: packages/trunk/teg/debian/changelog packages/trunk/teg/debian/rules Log: Almost. Use LDFLAGS to minimize dependencies. Modified: packages/trunk/teg/debian/changelog === --- packages/trunk/teg/debian/changelog 2008-06-09 07:28:56 UTC (rev 7316) +++ packages/trunk/teg/debian/changelog 2008-06-09 07:38:57 UTC (rev 7317) @@ -23,6 +23,8 @@ * Bump Standards-Version from 3.7.2 to 3.7.3, no changes required. * Remove additional files in “clean” since “make distclean” doesn't do its job: intltool-update and *.html under docs/gnome-help/. + * Add “LDFLAGS=-Wl,-z,defs -Wl,--as-needed” to the configure call, so +as to strip down the dependencies. -- Cyril Brulebois [EMAIL PROTECTED] Mon, 09 Jun 2008 09:29:18 +0200 Modified: packages/trunk/teg/debian/rules === --- packages/trunk/teg/debian/rules 2008-06-09 07:28:56 UTC (rev 7316) +++ packages/trunk/teg/debian/rules 2008-06-09 07:38:57 UTC (rev 7317) @@ -18,7 +18,7 @@ configure: patch configure-stamp configure-stamp: dh_testdir - ./configure --prefix=/usr \ + LDFLAGS=-Wl,-z,defs -Wl,--as-needed ./configure --prefix=/usr \ --bindir=/usr/games \ --sysconfdir=/etc \ --datadir=/usr/share/games/teg \ ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
r7318 - packages/tags/teg
Author: kibi Date: 2008-06-09 07:56:03 + (Mon, 09 Jun 2008) New Revision: 7318 Added: packages/tags/teg/0.11.2+debian-1/ Log: [svn-buildpackage] Tagging teg (0.11.2+debian-1) Copied: packages/tags/teg/0.11.2+debian-1 (from rev 7317, packages/trunk/teg) ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
[SCM] Simple and fast multimedia library for C++ branch, master, created. 202171ac967c0de3431da1c921b12d8d753175ad
The branch, master has been created at 202171ac967c0de3431da1c921b12d8d753175ad (commit) - Shortlog commit 202171ac967c0de3431da1c921b12d8d753175ad Author: Christoph Egger [EMAIL PROTECTED] Date: Tue May 20 13:58:13 2008 +0200 Imported Debian patch 1.2-1 commit ff2dd2d0218cea258446af2c781298192404aa68 Author: Christoph Egger [EMAIL PROTECTED] Date: Tue May 20 13:58:13 2008 +0200 Imported Upstream version 1.2 --- -- Simple and fast multimedia library for C++ ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
[SCM] Packaging for ogre-contrib branch, master, created. 90d28e4c3f863fb92787e518707265dabc29fc36
The branch, master has been created at 90d28e4c3f863fb92787e518707265dabc29fc36 (commit) - Shortlog commit 90d28e4c3f863fb92787e518707265dabc29fc36 Merge: aba190666d9d8eef49d6a562c9436be9ee59d973 a8c20d823bc28bb8f6d127e301390bed06e49169 Author: Andres Mejia [EMAIL PROTECTED] Date: Sat May 17 20:50:30 2008 -0400 Merge branch 'upstream' commit a8c20d823bc28bb8f6d127e301390bed06e49169 Author: Andres Mejia [EMAIL PROTECTED] Date: Sat May 17 20:50:25 2008 -0400 Imported upstream version 1.4.7 commit aba190666d9d8eef49d6a562c9436be9ee59d973 Merge: 2c5dce850f4832de965e1bf015ff8776380d8c51 adcf6449fcfd7b933dd15aa92d795f7c480eb1c8 Author: Andres Mejia [EMAIL PROTECTED] Date: Sat May 17 20:49:52 2008 -0400 Merge branch 'upstream' commit adcf6449fcfd7b933dd15aa92d795f7c480eb1c8 Author: Andres Mejia [EMAIL PROTECTED] Date: Sat May 17 20:49:37 2008 -0400 initial upstream branch for ogre-1.4.7 commit 2c5dce850f4832de965e1bf015ff8776380d8c51 Author: ceros-guest [EMAIL PROTECTED] Date: Fri Apr 4 04:17:14 2008 + Updated patch. commit b4f5a101deece96ea3eda7d432f63dbc777ab329 Author: ceros-guest [EMAIL PROTECTED] Date: Fri Apr 4 03:39:27 2008 + Update ogre-contrib to new upstream release. commit f5335a76ed829884e5b208e858972b0a4979d02f Author: ceros-guest [EMAIL PROTECTED] Date: Fri Feb 29 15:28:29 2008 + Updating changelog commit aec7d57bad71fc65a30aa930dbd1dc2fb5c9007b Author: ceros-guest [EMAIL PROTECTED] Date: Wed Jan 9 00:15:54 2008 + Specify Build-Depends on nvidia-cg-toolkit (= 2.0) commit 1bd2fcd0bd4fd3804beb23ef278e1a8f9d2c7dad Author: ceros-guest [EMAIL PROTECTED] Date: Wed Jan 9 00:13:18 2008 + Remove shlibs.local and place a Depends on nvidia-cg-toolkit instead commit 40cd62b7b408fb9ac17801576014850e53cc5a93 Author: ceros-guest [EMAIL PROTECTED] Date: Wed Jan 9 00:03:45 2008 + Write an shlibs.local file for nvidia-cg-toolkit commit fe041cb66bf362d7da55c725172b948e3d62f968 Author: ceros-guest [EMAIL PROTECTED] Date: Tue Jan 8 18:19:22 2008 + Took out hard coded dependency on nvidia-cg-toolkit, should now be autodetected commit 0882318c22a31ee75d0b1a874558d501546f8e5b Author: ceros-guest [EMAIL PROTECTED] Date: Sun Jan 6 06:05:05 2008 + Updated changelog commit f4418cc71d907570935adc2194c26d3f70de543b Author: ceros-guest [EMAIL PROTECTED] Date: Sun Jan 6 05:59:20 2008 + Modified ogre-contrib-get-orig-source. Modified some svn property values. commit 4400521f4fc75d31979cb71bf2e74b710e002d3d Author: ceros-guest [EMAIL PROTECTED] Date: Sun Jan 6 04:52:48 2008 + Fixed bad Vcs-SVN link commit 70407cae73f36a76c52a9f0ee8ab01f2a15aeff3 Author: ceros-guest [EMAIL PROTECTED] Date: Sun Jan 6 04:40:10 2008 + Renamed debian/ogre-contrib-tarball.sh to debian/ogre-contrib-get-orig-source commit 75636b11d380fc7bac315082e5e076d79c8194d9 Author: ceros-guest [EMAIL PROTECTED] Date: Mon Nov 26 01:19:53 2007 + origUrl property reset for ogre-contrib-1.4.5 commit fd73a43565f38e09c17ca54b8bc216c3bbc6d3a2 Author: ceros-guest [EMAIL PROTECTED] Date: Sun Oct 14 20:25:05 2007 + Checking packaging for ogre-contrib-1.4.5 commit d6520f06e75a9cff7fdd003de7db701cdc16791f Author: ceros-guest [EMAIL PROTECTED] Date: Tue Sep 4 05:36:07 2007 + origUrl property set for ogre-contrib-1.4.4 commit f3ae0d2ac94dde140425e484b9e8928c190a5aac Author: ceros-guest [EMAIL PROTECTED] Date: Mon Sep 3 16:32:31 2007 + Checking in ogre-contrib-1.4.4-1 packaging commit 3fd0dbc879934159498ffa17a4a6d8dd23cd4965 Author: ceros-guest [EMAIL PROTECTED] Date: Sun Aug 12 18:50:45 2007 + origUrl property reset for ogre-contrib-1.4.3 commit c688191b0d4d90ada490d1ed7a84c067b416139d Author: ceros-guest [EMAIL PROTECTED] Date: Mon Jul 16 02:32:04 2007 + Preparing ogre-contrib for release tag. commit f82608dd1585dfa5bb556f07a315a392c6fef3f8 Author: ceros-guest [EMAIL PROTECTED] Date: Tue Jul 10 06:23:36 2007 + origUrl property set for ogre-contrib-1.4.3 commit bd8148f01d8a8f5f5ab38c785d62caa010bb9051 Author: ceros-guest [EMAIL PROTECTED] Date: Tue Jul 10 06:21:17 2007 + new upstream release (ogre-1.4.3) commit 2f05874859cc435cc0730cb2698bab0905f77d47 Author: ceros-guest [EMAIL PROTECTED] Date: Tue Jun 26 22:49:33 2007 + Download link is from sourceforge.net, not ogre3d.org commit dd7a013170deabc414a6f97fda367ae91d9d31e3 Author: ceros-guest [EMAIL PROTECTED] Date: Tue Jun 26 22:45:57 2007 + Added watch file to ogre-contrib commit 11c1d636ff797c905e92a918c76ab4765843dcbb Author: ceros-guest [EMAIL PROTECTED] Date: Thu Jun 14 00:18:36 2007 + Adding some needed build dependencies. commit a94c1fff1151fdc1020ef271d20f537aaec0 Author: ceros-guest [EMAIL PROTECTED] Date: Tue Jun 12 05:53:44 2007 + Calling
[SCM] Packaging for ogre-contrib annotated tag, upstream/1.4.7, created. upstream/1.4.7
The annotated tag, upstream/1.4.7 has been created at b1e44e99e085252553a2478d47b89d9435bb28b4 (tag) tagging a8c20d823bc28bb8f6d127e301390bed06e49169 (commit) tagged by Andres Mejia on Sat May 17 20:50:26 2008 -0400 - Shortlog Upstream version 1.4.7 Andres Mejia (2): initial upstream branch for ogre-1.4.7 Imported upstream version 1.4.7 --- -- Packaging for ogre-contrib ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
[SCM] Packaging for ogre-contrib branch, pristine-tar, created. 739ff4586ad1117e283f41f2b9cde543cdcdf53e
The branch, pristine-tar has been created at 739ff4586ad1117e283f41f2b9cde543cdcdf53e (commit) - Shortlog commit 739ff4586ad1117e283f41f2b9cde543cdcdf53e Author: Andres Mejia [EMAIL PROTECTED] Date: Sat May 17 21:18:41 2008 -0400 pristine-tar data for ogre-contrib_1.4.7.orig.tar.gz --- -- Packaging for ogre-contrib ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
[SCM] Packaging for ogre-contrib branch, pristine-tar, updated. c64554db4115c13ae5d1fff33b1de9cd74fe01cc
The following commit has been merged in the pristine-tar branch: commit c64554db4115c13ae5d1fff33b1de9cd74fe01cc Author: Andres Mejia [EMAIL PROTECTED] Date: Sat May 17 21:19:52 2008 -0400 pristine-tar data for ogre-contrib_1.4.7.orig.tar.gz diff --git a/ogre-contrib_1.4.7.orig.tar.gz.delta b/ogre-contrib_1.4.7.orig.tar.gz.delta index 22b7f3b..1d84459 100644 Binary files a/ogre-contrib_1.4.7.orig.tar.gz.delta and b/ogre-contrib_1.4.7.orig.tar.gz.delta differ diff --git a/ogre-contrib_1.4.7.orig.tar.gz.id b/ogre-contrib_1.4.7.orig.tar.gz.id index 2f0398a..7b5c504 100644 --- a/ogre-contrib_1.4.7.orig.tar.gz.id +++ b/ogre-contrib_1.4.7.orig.tar.gz.id @@ -1 +1 @@ -a8c20d823bc28bb8f6d127e301390bed06e49169 +b1e44e99e085252553a2478d47b89d9435bb28b4 -- Packaging for ogre-contrib ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
[SCM] Packaging for ogre branch, pristine-tar, created. 70efc79c2b06cf510fee6fa91f1fd52192bff147
The branch, pristine-tar has been created at 70efc79c2b06cf510fee6fa91f1fd52192bff147 (commit) - Shortlog commit 70efc79c2b06cf510fee6fa91f1fd52192bff147 Author: Andres Mejia [EMAIL PROTECTED] Date: Sat May 17 21:36:12 2008 -0400 pristine-tar data for ogre_1.4.8.dfsg1.orig.tar.gz --- -- Packaging for ogre ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
[SCM] Packaging for openal-soft branch, pristine-tar, created. d9f5bf7eefdf85ee38e1496dca5eab9236fb47d6
The branch, pristine-tar has been created at d9f5bf7eefdf85ee38e1496dca5eab9236fb47d6 (commit) - Shortlog commit d9f5bf7eefdf85ee38e1496dca5eab9236fb47d6 Author: Andres Mejia [EMAIL PROTECTED] Date: Sat May 17 22:21:35 2008 -0400 pristine-tar data for openal-soft_1.3.253.orig.tar.gz --- -- Packaging for openal-soft ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
[SCM] Packaging for ogreal branch, upstream, created. a449dc22437d5c59bd1b065f1ee9579634b1b8bc
The branch, upstream has been created at a449dc22437d5c59bd1b065f1ee9579634b1b8bc (commit) - Shortlog --- -- Packaging for ogreal ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
[SCM] Packaging for ogreal branch, pristine-tar, created. 8ca39e6f5fbc3a62e3c8dbe264adbe9796095136
The branch, pristine-tar has been created at 8ca39e6f5fbc3a62e3c8dbe264adbe9796095136 (commit) - Shortlog commit 8ca39e6f5fbc3a62e3c8dbe264adbe9796095136 Author: Andres Mejia [EMAIL PROTECTED] Date: Sat May 17 23:29:13 2008 -0400 pristine-tar data for ogreal_0.2.5~svn20080508.r115.orig.tar.gz --- -- Packaging for ogreal ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
[SCM] Packaging for ogreal annotated tag, upstream/0.2.5.svn20080508.r115, created. upstream/0.2.5.svn20080508.r115
The annotated tag, upstream/0.2.5.svn20080508.r115 has been created at ae74e0462f8b40ff31ede8800b17a08c4c8827fc (tag) tagging a449dc22437d5c59bd1b065f1ee9579634b1b8bc (commit) tagged by Andres Mejia on Sat May 17 23:29:15 2008 -0400 - Shortlog Upstream version 0.2.5~svn20080508.r115 Andres Mejia (2): initial upstream branch Imported Upstream version 0.2.5~svn20080508.r115 --- -- Packaging for ogreal ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
[SCM] Packaging for ogre branch, master, updated. upstream/1.4.8.dfsg1-75-g3663da6
The following commit has been merged in the master branch: -- Packaging for ogre ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
[SCM] Packaging for ogre branch, master, updated. upstream/1.4.8.dfsg1-75-g3663da6
The following commit has been merged in the master branch: -- Packaging for ogre ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
[SCM] Packaging for ogre branch, master, updated. upstream/1.4.8.dfsg1-75-g3663da6
The following commit has been merged in the master branch: -- Packaging for ogre ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
[SCM] Packaging for ogre branch, master, updated. upstream/1.4.8.dfsg1-75-g3663da6
The following commit has been merged in the master branch: commit dd9150490fad13e79cb967a47801e8cb352a2dc6 Merge: a42a63fe6a0ff1bcf29ae9ff75bd9696973245f6 583d1e7eb911c0ed05d8c02a4b29a3f5c320a70f Author: ceros-guest [EMAIL PROTECTED] Date: Sun Jul 22 03:14:18 2007 + [svn-buildpackage] Tagging ogre (1.4.3-1) -- Packaging for ogre ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
[SCM] Packaging for ogre branch, master, updated. upstream/1.4.8.dfsg1-75-g3663da6
The following commit has been merged in the master branch: -- Packaging for ogre ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
[SCM] Packaging for ogre branch, master, updated. upstream/1.4.8.dfsg1-75-g3663da6
The following commit has been merged in the master branch: -- Packaging for ogre ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
[SCM] Packaging for ogre branch, master, updated. upstream/1.4.8.dfsg1-75-g3663da6
The following commit has been merged in the master branch: -- Packaging for ogre ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
[SCM] Packaging for ogre branch, master, updated. upstream/1.4.8.dfsg1-75-g3663da6
The following commit has been merged in the master branch: -- Packaging for ogre ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
[SCM] Packaging for ogre branch, master, updated. upstream/1.4.8.dfsg1-75-g3663da6
The following commit has been merged in the master branch: -- Packaging for ogre ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
[SCM] Packaging for ogre branch, master, updated. upstream/1.4.8.dfsg1-75-g3663da6
The following commit has been merged in the master branch: commit 928bd9070c8170552e183735c348e3276f163d38 Merge: 32b726e96f64a8f65948b0c2c5c266705ef8c1df 7519cbf777d4d3484e726036dfd57524f8ff01ef bded73b9fabc181bb0304a12bb57146da87cec19 dd9150490fad13e79cb967a47801e8cb352a2dc6 ff8d301e2cc78f9755de45e5c4e044f2f49497c0 5c1fbe2ed40c83fbe54750cc0243318015b3cb38 fef5c3f650135467dad2ecc86db96246cb806670 34445e341fe0ee35953eccd0125413104fd5118a b05f519c80406f122f489463e58b65771798fb77 Author: Andres Mejia [EMAIL PROTECTED] Date: Sat May 17 03:52:50 2008 -0400 Merge remote branches 'ogre-test', 'tags/1.4.2-1', 'tags/1.4.2-2', 'tags/1.4.3-1', 'tags/1.4.4-1', 'tags/1.4.4-2', 'tags/1.4.5-1', 'tags/1.4.5-3' and 'tags/1.4.6.dfsg1-1' of git+ssh://git.debian.org/git/pkg-games/ogre -- Packaging for ogre ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
[SCM] Packaging for ogre branch, master, updated. upstream/1.4.8.dfsg1-75-g3663da6
The following commit has been merged in the master branch: commit 3663da62f953222ff25edea76ea6864da2775630 Author: Andres Mejia [EMAIL PROTECTED] Date: Sun May 18 17:08:04 2008 -0400 Don't place plugins in directory based on ogre version. diff --git a/debian/blender-ogrexml.README.Debian b/debian/blender-ogrexml.README.Debian index 7df0b0f..b8db888 100644 --- a/debian/blender-ogrexml.README.Debian +++ b/debian/blender-ogrexml.README.Debian @@ -4,15 +4,15 @@ Ogre's Blender export plugin On a Debian GNU/Linux system Blender python scripts live in the directory /usr/lib/blender/scripts/ - + and are linked to the user's private scripts directory the first time Blender is run and after each upgrade. Until this procedure is changed (there is a patch pending) the two steps detailed below should be executed to make the Ogre export script available in Blender: 1/ ln -sf /usr/lib/blender/scripts/ogreexport.py $HOME/.blender/scripts/ - + 2/ Run Blender and then from a Scripts Window use the Scripts-Update Menus menu item. - + After that Ogre XML will be available from the File-Export menu. diff --git a/debian/changelog b/debian/changelog index 9afeb45..1cbb3d1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,10 +15,9 @@ ogre (1.4.8.dfsg1-1) unstable; urgency=low * Place update-ogre-plugins in /usr/bin instead of /usr/sbin. * Added 'DM-Upload-Allowed: yes' field. * Fix patches. - * Install plugins in a directory based on the upstream version of ogre. * Allow some files to be slightly autogenerated based on the version of ogre that's being built. - * Convert to git repository. + * Convert to git repository for packaging. -- Andres Mejia [EMAIL PROTECTED] Fri, 16 May 2008 19:43:38 -0400 diff --git a/debian/extras/plugins-VERSION.cfg b/debian/extras/plugins-VERSION.cfg deleted file mode 100644 index 5c936a1..000 --- a/debian/extras/plugins-VERSION.cfg +++ /dev/null @@ -1,16 +0,0 @@ -# /etc/OGRE/[EMAIL PROTECTED]@.cfg - ogre plugins installed on Debian systems -# -# Warning: this file is autogenerated but anything between this line and -# the line saying -*- ogre-plugins -*- will be copied as-is on updates. - -PluginFolder=/usr/lib/[EMAIL PROTECTED]@ - -# default plugins installed with the [EMAIL PROTECTED]@ package. -Plugin=RenderSystem_GL.so -Plugin=Plugin_ParticleFX.so -Plugin=Plugin_BSPSceneManager.so -Plugin=Plugin_OctreeSceneManager.so -Plugin=Plugin_EXRCodec.so - -# Don't edit anything starting from next line; it was autogenerated. -# -*- ogre-plugins -*- [Please, don't remove or modify this marker] diff --git a/debian/extras/plugins.cfg b/debian/extras/plugins.cfg new file mode 100644 index 000..af6b264 --- /dev/null +++ b/debian/extras/plugins.cfg @@ -0,0 +1,16 @@ +# /etc/OGRE/plugins.cfg - ogre plugins installed on Debian systems +# +# Warning: this file is autogenerated but anything between this line and +# the line saying -*- ogre-plugins -*- will be copied as-is on updates. + +PluginFolder=/usr/lib/OGRE + +# default plugins installed with the libogremain package. +Plugin=RenderSystem_GL.so +Plugin=Plugin_ParticleFX.so +Plugin=Plugin_BSPSceneManager.so +Plugin=Plugin_OctreeSceneManager.so +Plugin=Plugin_EXRCodec.so + +# Don't edit anything starting from next line; it was autogenerated. +# -*- ogre-plugins -*- [Please, don't remove or modify this marker] diff --git a/debian/extras/update-ogre-plugins b/debian/extras/update-ogre-plugins new file mode 100755 index 000..f612825 --- /dev/null +++ b/debian/extras/update-ogre-plugins @@ -0,0 +1,35 @@ +#!/bin/sh + +# This script is used to update the plugins configuration files. + +USAGE=\n\ +This script is used to update the plugins configuration file. It takes no\n\ +options.\n\ +Usage: update-ogre-plugins\n\ +\n + +while [ $# -gt 0 ] +do +case $1 in +*) +echo ${USAGE} +exit 1 +;; +esac +done + +echo Updating /etc/OGRE/plugins.cfg. +sed -e '/# -\*- ogre-plugins -\*-/ q' \ + /etc/OGRE/plugins.cfg \ + /etc/OGRE/plugins.cfg-new + +PARTS=`ls 2/dev/null /etc/OGRE/plugins.cfg.*` +for f in $PARTS ; do + if [ -z `echo $f | grep dpkg` ] ; then + echo Adding $f + cat $f /etc/OGRE/plugins.cfg-new + fi +done + +mv /etc/OGRE/plugins.cfg-new /etc/OGRE/plugins.cfg + diff --git a/debian/extras/update-ogre-plugins.1 b/debian/extras/update-ogre-plugins.1 index 019fbe5..205e7c5 100644 --- a/debian/extras/update-ogre-plugins.1 +++ b/debian/extras/update-ogre-plugins.1 @@ -22,26 +22,14 @@ update-ogre-plugins \- rebuild /etc/OGRE/plugins-version.cfg .br .SH DESCRIPTION \fBupdate-ogre-plugins\fP uses the information placed by Ogre plugin -packages in /etc/OGRE to build the plugins-version.cfg configuration file, +packages in /etc/OGRE to build the plugins.cfg configuration file, used by the Ogre system to locate and load plugins' shared libraries. .PP An application can provide its own
[SCM] Packaging for ogre branch, master, updated. upstream/1.4.8.dfsg1-76-ga776748
The following commit has been merged in the master branch: commit a77674821673ee52c082716350a0eaccf6fa8d70 Author: Andres Mejia [EMAIL PROTECTED] Date: Sun May 18 18:15:01 2008 -0400 Correcting libogre-dev.install file diff --git a/debian/libogre-dev.install b/debian/libogre-dev.install index aef09a0..208c627 100644 --- a/debian/libogre-dev.install +++ b/debian/libogre-dev.install @@ -1,4 +1,3 @@ -usr/bin/ogre-plugins-config usr/include/* usr/lib/libOgreMain.so usr/lib/libOgreMain.la -- Packaging for ogre ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
[SCM] Packaging for ogre-contrib branch, master, updated. upstream/1.4.7-33-g57adbeb
The following commit has been merged in the master branch: commit 57adbeb3fd7a4fe754e29503c7d4d49f9505aff7 Author: Andres Mejia [EMAIL PROTECTED] Date: Sun May 18 20:28:22 2008 -0400 Don't use versioned plugin directory diff --git a/debian/changelog b/debian/changelog index d63d1c3..9b07fc1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,9 +7,7 @@ ogre-contrib (1.4.8-1) unstable; urgency=low * Updated patch. * Moved to git repository for packaging. * Added DM-Upload-Allowed: yes field. - * Install plugin in directory based on ogre version. * Using /usr/bin/update-ogre-plugins for updating plugins file. - * Need Replaces field for ogre-plugins-cgprogrammanager to replace a symlink. -- Andres Mejia [EMAIL PROTECTED] Sun, 18 May 2008 00:03:56 -0400 diff --git a/debian/control b/debian/control index e894aef..47a5399 100644 --- a/debian/control +++ b/debian/control @@ -10,12 +10,12 @@ Vcs-Git: git://git.debian.org/git/pkg-games/ogre-contrib.git Vcs-Browser: http://git.debian.org/?p=pkg-games/ogre-contrib.git DM-Upload-Allowed: yes -Package: ogre-plugins-cgprogrammanager-1.4.8 +Package: ogre-plugins-cgprogrammanager Section: contrib/libs Architecture: amd64 i386 Depends: nvidia-cg-toolkit (= 2.0), ${shlibs:Depends} Conflicts: ogre-plugins-cgmanager -Replaces: ogre-plugins-cgmanager, ogre-plugins-cgprogrammanager +Replaces: ogre-plugins-cgmanager Description: Ogre plugin: CgProgramManager Ogre is a complete object-oriented 3D rendering engine. It supports different rendering subsystems but only the OpenGL system is useful @@ -23,7 +23,7 @@ Description: Ogre plugin: CgProgramManager . This package contains the CgProgramManager Ogre plugin. -Package: ogre-plugins-cgprogrammanager-1.4.8-dbg +Package: ogre-plugins-cgprogrammanager-dbg Section: contrib/libdevel Architecture: amd64 i386 Priority: extra diff --git a/debian/ogre-plugins-cgprogrammanager-VERSION.install b/debian/ogre-plugins-cgprogrammanager-VERSION.install deleted file mode 100644 index dd194f7..000 --- a/debian/ogre-plugins-cgprogrammanager-VERSION.install +++ /dev/null @@ -1,4 +0,0 @@ -usr/lib/[EMAIL PROTECTED]@/*.so -usr/lib/[EMAIL PROTECTED]@/*.la -etc/OGRE/[EMAIL PROTECTED]@.cfg.cgprogrammanager -etc/OGRE/plugins.cfg.cgprogrammanager diff --git a/debian/ogre-plugins-cgprogrammanager.install b/debian/ogre-plugins-cgprogrammanager.install new file mode 100644 index 000..21323d4 --- /dev/null +++ b/debian/ogre-plugins-cgprogrammanager.install @@ -0,0 +1,3 @@ +usr/lib/OGRE/*.so +usr/lib/OGRE/*.la +etc/OGRE/plugins.cfg.cgprogrammanager diff --git a/debian/ogre-plugins-cgprogrammanager-VERSION.postinst b/debian/ogre-plugins-cgprogrammanager.postinst similarity index 100% rename from debian/ogre-plugins-cgprogrammanager-VERSION.postinst rename to debian/ogre-plugins-cgprogrammanager.postinst diff --git a/debian/ogre-plugins-cgprogrammanager-VERSION.postrm b/debian/ogre-plugins-cgprogrammanager.postrm similarity index 100% rename from debian/ogre-plugins-cgprogrammanager-VERSION.postrm rename to debian/ogre-plugins-cgprogrammanager.postrm diff --git a/debian/patches/series b/debian/patches/series index 4f90860..440c8cc 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1 @@ autotools.diff -change_pkglibdir_path.patch -p0 diff --git a/debian/plugins-VERSION.cfg.cgprogrammanager b/debian/plugins.cfg.cgprogrammanager similarity index 100% rename from debian/plugins-VERSION.cfg.cgprogrammanager rename to debian/plugins.cfg.cgprogrammanager diff --git a/debian/rules b/debian/rules index 5329c89..23b0485 100755 --- a/debian/rules +++ b/debian/rules @@ -5,9 +5,6 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -# Use this variable to set what version of ogre we're working with -OGRE_VERSION=1.4.8 - # These are from the autotools-dev package documentation. # /usr/share/doc/autotools-dev/README.Debian.gz # from the section titled Calling GNU configure properly @@ -43,27 +40,13 @@ OGRE_CONFIG_OPTIONS ?= $(confflags) \ --disable-ogre-demos \ CXXFLAGS=$(DEB_CXXFLAGS) -build-setup: build-setup-stamp -build-setup-stamp: - dh_testdir - cp -f debian/ogre-plugins-cgprogrammanager-VERSION.install \ - debian/ogre-plugins-cgprogrammanager-$(OGRE_VERSION).install - cp -f debian/ogre-plugins-cgprogrammanager-VERSION.postinst \ - debian/ogre-plugins-cgprogrammanager-$(OGRE_VERSION).postinst - cp -f debian/ogre-plugins-cgprogrammanager-VERSION.postrm \ - debian/ogre-plugins-cgprogrammanager-$(OGRE_VERSION).postrm - cp -f debian/plugins-VERSION.cfg.cgprogrammanager \ - debian/plugins-$(OGRE_VERSION).cfg.cgprogrammanager - sed -i 's/@VERSION@/$(OGRE_VERSION)/g' \ - debian/ogre-plugins-cgprogrammanager-$(OGRE_VERSION).install - patch: patch-stamp patch-stamp: dh_testdir QUILT_PATCHES=debian/patches quilt
[SCM] Packaging for ogre branch, master, updated. upstream/1.4.8.dfsg1-78-g2546d33
The following commit has been merged in the master branch: commit fe25334841d87fd59d828df15fc44ef6047c8ee6 Author: Andres Mejia [EMAIL PROTECTED] Date: Mon May 19 00:58:55 2008 -0400 Add fix for FBO problems with new NVIDIA driver diff --git a/debian/patches/series b/debian/patches/series index 189d657..ab433cb 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ disable_samples.diff -p0 fix_rpath.diff -p0 fix_distclean.patch -p0 +nvidia_fbo_fix.patch -p0 -- Packaging for ogre ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
[SCM] Packaging for ogre branch, master, updated. upstream/1.4.8.dfsg1-78-g2546d33
The following commit has been merged in the master branch: commit 2546d33562cbd3b293aa6c1f49a32b368ce222d5 Author: Andres Mejia [EMAIL PROTECTED] Date: Mon May 19 00:59:26 2008 -0400 Add patch diff --git a/debian/patches/nvidia_fbo_fix.patch b/debian/patches/nvidia_fbo_fix.patch new file mode 100644 index 000..d7b61c3 --- /dev/null +++ b/debian/patches/nvidia_fbo_fix.patch @@ -0,0 +1,13 @@ +--- RenderSystems/GL/src/OgreGLFBORenderTexture.cpp.bak2008-05-19 00:52:46.0 -0400 RenderSystems/GL/src/OgreGLFBORenderTexture.cpp2008-05-19 00:56:12.0 -0400 +@@ -308,7 +308,9 @@ + { + // Packed depth/stencil format + +-#if OGRE_PLATFORM == OGRE_PLATFORM_LINUX ++// #if OGRE_PLATFORM == OGRE_PLATFORM_LINUX ++// It now seems as if this workaround now *breaks* nvidia cards on Linux with the 169.12 drivers on Linux ++#if 0 + // Only query packed depth/stencil formats for 32-bit + // non-floating point formats (ie not R32!) + // Linux nVidia driver segfaults if you query others -- Packaging for ogre ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
[SCM] Packaging for funguloids branch, master, created. 92c0a8519a5122220a83e2e86f6f8e9d0a7f8ade
The branch, master has been created at 92c0a8519a510a83e2e86f6f8e9d0a7f8ade (commit) - Shortlog commit 92c0a8519a510a83e2e86f6f8e9d0a7f8ade Merge: 3e4098e878e034be2cd9907e8d602417e5380d67 2af40e494c3906b00dbcd231e09b777cf260f6e3 Author: Andres Mejia [EMAIL PROTECTED] Date: Mon May 19 14:50:15 2008 -0400 Merge branch 'upstream' commit 2af40e494c3906b00dbcd231e09b777cf260f6e3 Author: Andres Mejia [EMAIL PROTECTED] Date: Mon May 19 14:49:56 2008 -0400 Imported Upstream version 1.06 commit 3e4098e878e034be2cd9907e8d602417e5380d67 Merge: 20cda6ada431ae99891dfe22d04777215baf204a 5a0e9e240a464789ea347b9df3478a07008edda7 Author: Andres Mejia [EMAIL PROTECTED] Date: Mon May 19 14:48:51 2008 -0400 Merge branch 'upstream' commit 5a0e9e240a464789ea347b9df3478a07008edda7 Author: Andres Mejia [EMAIL PROTECTED] Date: Mon May 19 14:48:37 2008 -0400 initial upstream branch commit 20cda6ada431ae99891dfe22d04777215baf204a Author: ceros-guest [EMAIL PROTECTED] Date: Sun May 4 21:01:22 2008 + Fix problem with running funguloids using openal-soft commit 52d686130f5e626a7a2183fda5ddc39671ba4047 Author: ceros-guest [EMAIL PROTECTED] Date: Sun May 4 19:00:15 2008 + Support disabling of keyboard and mouse capture for debugging commit d7671a74e39798ddcd021610ce592682b9b2cb64 Author: ceros-guest [EMAIL PROTECTED] Date: Sun May 4 05:37:57 2008 + Send patch commit a662c641599568b4c41ab897d01a8e76efb44cca Author: ceros-guest [EMAIL PROTECTED] Date: Sun May 4 05:37:38 2008 + * Fix problem with running funguloids with ogre-1.4.6 and ogre-1.4.7. Closes: #478105 * Fix up patches and rules file. commit 9d343b42c302f875396de016570bb4afe541ff88 Author: fourmond [EMAIL PROTECTED] Date: Mon Jan 14 19:49:50 2008 + [funguloids] Dummy changelog entry commit 607902de7d71e160d7c9ddc9716e74bf7128745e Author: fourmond [EMAIL PROTECTED] Date: Mon Jan 14 19:45:58 2008 + [funguloids] Fixed changelog version commit 6ae6076d34743a90a3a21118d4409f10c8594ea6 Author: ceros-guest [EMAIL PROTECTED] Date: Mon Jan 14 07:26:52 2008 + Setting debOrigScript and debOrigScriptOptions. commit b044b63dceab1c25780b4d260eb7498d21b64f7a Author: ceros-guest [EMAIL PROTECTED] Date: Mon Jan 14 07:07:41 2008 + Update timestamp in changelog. commit e4b1bb2b125c1d33138e2e1d7ff74704131a06c2 Author: ceros-guest [EMAIL PROTECTED] Date: Mon Jan 14 07:06:53 2008 + Edit grammer and spelling mistakes. Updated README.Debian. commit ad15751f1563ea1a8d50a7e5762389bc34d12f52 Author: ceros-guest [EMAIL PROTECTED] Date: Mon Jan 14 06:57:23 2008 + Updated README.Debian. Removed deprecated Encoding field in desktop file. Polishing funguloids packaging. commit ebc4e9297c621d42ef33e7b65191bf6ad9e62f81 Author: ceros-guest [EMAIL PROTECTED] Date: Mon Jan 14 06:37:17 2008 + Fixed patch. commit ec29e141e16bd4ca4b00b2dbb66a4048aaaf2a68 Author: ceros-guest [EMAIL PROTECTED] Date: Mon Jan 14 06:33:03 2008 + Switch from dpatch to quilt. commit a5e20f48aab83b6cddf6ae2e1a7ec1010a06b642 Author: ceros-guest [EMAIL PROTECTED] Date: Mon Jan 14 06:19:16 2008 + Provide binary-indep to comply with Debian policy. commit 8b95ac4c471422bde71aca803983414e68b6e1c9 Author: ceros-guest [EMAIL PROTECTED] Date: Mon Jan 14 06:16:32 2008 + Provide get-orig-source rule. commit 01edff8e0f59b20b0f605a5c1543be2eb2308881 Author: ceros-guest [EMAIL PROTECTED] Date: Mon Jan 14 05:26:37 2008 + Update comment about DEB_BUILD_OPTIONS. commit c01cfe91a506069e76a6d4893ddd148c71cb5778 Author: ceros-guest [EMAIL PROTECTED] Date: Mon Jan 14 05:23:44 2008 + Give exact link to download upstream tarball in debian/copyright. commit 1f8ec8d1c01e78c754d684bc2c5e0e896f151cb6 Author: ceros-guest [EMAIL PROTECTED] Date: Mon Jan 14 05:18:28 2008 + Provide newest version to look for in watchfile. Exclude results matching 'src'. commit 0edc7a5cd255f158650fc418f75d3295107ef393 Author: ceros-guest [EMAIL PROTECTED] Date: Mon Jan 14 05:07:59 2008 + Fixed name of upstream tarball used in watchfile. Provide another scan line for uscan. commit 342d32d9d422e955a13c497050349c7396fb6402 Author: ceros-guest [EMAIL PROTECTED] Date: Mon Jan 14 04:38:14 2008 + Implement nostrip option to reflect what is suggested in Debian policy. commit 759a512084ad77a72e7864130f12996359f3e714 Author: ceros-guest [EMAIL PROTECTED] Date: Sun Jan 13 04:16:43 2008 + Update changelog. commit c5668ba33b23e8d5cfa4a55476390b8847b03e47 Author: ceros-guest [EMAIL PROTECTED] Date: Sun Jan 13 04:10:49 2008 + Fixed debian/rules to use nostrip option commit 36d34266f94eba12bde41cd2ee4f436369c541f4 Author: ceros-guest [EMAIL PROTECTED] Date: Sun Jan 13 03:21:34 2008 + Manually using install to install
[SCM] Packaging for funguloids branch, upstream, created. 2af40e494c3906b00dbcd231e09b777cf260f6e3
The branch, upstream has been created at 2af40e494c3906b00dbcd231e09b777cf260f6e3 (commit) - Shortlog --- -- Packaging for funguloids ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
[SCM] Packaging for funguloids branch, pristine-tar, created. 87c84f33098301fdf8195d63414b98039a10d4c6
The branch, pristine-tar has been created at 87c84f33098301fdf8195d63414b98039a10d4c6 (commit) - Shortlog commit 87c84f33098301fdf8195d63414b98039a10d4c6 Author: Andres Mejia [EMAIL PROTECTED] Date: Mon May 19 14:50:09 2008 -0400 pristine-tar data for funguloids_1.06.orig.tar.gz --- -- Packaging for funguloids ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
[SCM] Packaging for funguloids branch, master, updated. upstream/1.06-4-g4cecdca
The following commit has been merged in the master branch: commit 4cecdca0643d19bc93d2d8fb4c690fbd567d8b4c Author: Andres Mejia [EMAIL PROTECTED] Date: Mon May 19 15:12:29 2008 -0400 * Move packaging from svn to git. * Add DM-Upload-Allowed: yes field in control file. diff --git a/debian/changelog b/debian/changelog index 71d12ee..abbc25b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,8 @@ funguloids (1.06-6) unstable; urgency=low * Support disabling of keyboard and mouse capture for debugging. * Fix check where AL errors were being checked while working with AL contexts instead of ALC errors. + * Move packaging from svn to git. + * Add DM-Upload-Allowed: yes field in control file. -- Andres Mejia [EMAIL PROTECTED] Sun, 04 May 2008 14:58:59 -0400 diff --git a/debian/control b/debian/control index 8133652..98d0fda 100644 --- a/debian/control +++ b/debian/control @@ -5,9 +5,10 @@ Maintainer: Debian Games Team [EMAIL PROTECTED] Uploaders: Andres Mejia [EMAIL PROTECTED] Build-Depends: debhelper (= 5), quilt, tofrodos, automake, liblua5.1-0-dev, libois-dev, libogre-dev (= 1.4), libalut-dev, libopenal-dev, libogg-dev, libvorbis-dev, libmad0-dev Standards-Version: 3.7.3 -Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/funguloids/ -Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/funguloids/?op=log +Vcs-Svn: git://git.debian.org/git/pkg-games/funguloids.git +Vcs-Browser: http://git.debian.org/?p=pkg-games/funguloids.git Homepage: http://funguloids.sourceforge.net +DM-Upload-Allowed: yes Package: funguloids Architecture: any -- Packaging for funguloids ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
[SCM] Packaging for funguloids branch, master, updated. upstream/1.06-39-gbe1af65
The following commit has been merged in the master branch: -- Packaging for funguloids ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
[SCM] A client for connecting to 3D metaverses such as Linden Labs Secondlife(tm) and OpenSim grids branch, pristine-tar, created. 3b2064eafa72c7212a34a8211b90309fe7abf1e1
The branch, pristine-tar has been created at 3b2064eafa72c7212a34a8211b90309fe7abf1e1 (commit) - Shortlog commit 3b2064eafa72c7212a34a8211b90309fe7abf1e1 Author: root [EMAIL PROTECTED] Date: Thu May 22 21:33:53 2008 +0100 pristine-tar data for slviewer_1.20.7.orig.tar.gz --- -- A client for connecting to 3D metaverses such as Linden Labs Secondlife(tm) and OpenSim grids ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
[SCM] A client for connecting to 3D metaverses such as Linden Labs Secondlife(tm) and OpenSim grids annotated tag, byteme/1.20.7-1, created. byteme/1.20.7-1
The annotated tag, byteme/1.20.7-1 has been created at b43fb154e729ddf022e219c4a9ced2a67cf8061c (tag) tagging 7d8d17b3b13bd73bc2ab4ce23267ecc09d05bed9 (commit) replaces upstream/1.20.7 tagged by root on Thu May 22 21:36:34 2008 +0100 - Shortlog Tagging the released versions on the test repository at apt.byteme.org.uk Robin Cornelius (1): Imported Debian patch 1.20.7-1 --- -- A client for connecting to 3D metaverses such as Linden Labs Secondlife(tm) and OpenSim grids ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
[SCM] A client for connecting to 3D metaverses such as Linden Labs Secondlife(tm) and OpenSim grids annotated tag, upstream/1.20.7, created. upstream/1.20.7
The annotated tag, upstream/1.20.7 has been created at c1a3d94a7c901d5876e640adfca81bde470397cb (tag) tagging c5088bc220105c4c5cf05b648e39afe8db00eea4 (commit) tagged by root on Thu May 22 21:33:53 2008 +0100 - Shortlog Upstream version 1.20.7 root (1): Imported Upstream version 1.20.7 --- -- A client for connecting to 3D metaverses such as Linden Labs Secondlife(tm) and OpenSim grids ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
[SCM] A client for connecting to 3D metaverses such as Linden Labs Secondlife(tm) and OpenSim grids branch, master, updated. byteme/1.20.7-1-1-g2a0763a
The following commit has been merged in the master branch: commit 2a0763a627569024114d03c9ec874be31a197e5e Author: Robin Cornelius [EMAIL PROTECTED] Date: Thu May 22 21:57:06 2008 +0100 Modify build to work with git-buildpackage diff --git a/indra/SConstruct b/indra/SConstruct index 629656f..1fbb686 100644 --- a/indra/SConstruct +++ b/indra/SConstruct @@ -208,7 +208,7 @@ for build_target in targets: try: build_dir_prefix = os.environ['TEMP_BUILD_DIR'] except: -build_dir_prefix = '/tmp/' + os.environ['USER'] +build_dir_prefix = '/tmp/' build_dir = build_dir_prefix + os.getcwd() + '/' + system_str + '-' + build_target + '-' + buildtype -- A client for connecting to 3D metaverses such as Linden Labs Secondlife(tm) and OpenSim grids ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
[SCM] A client for connecting to 3D metaverses such as Linden Labs Secondlife(tm) and OpenSim grids branch, master, updated. byteme/1.20.7-1-10-g91941d4
The following commit has been merged in the master branch: commit 3c54c1de320e35ac078b656b5d5fd9da359978b5 Author: Robin Cornelius [EMAIL PROTECTED] Date: Thu May 22 22:02:07 2008 +0100 Sync executable status on dpatch files diff --git a/debian/patches/_keep_statbars_from_overshooting.patch.dpatch b/debian/patches/_keep_statbars_from_overshooting.patch.dpatch old mode 100644 new mode 100755 diff --git a/debian/patches/0001_possible_crash_and_leak_llassetstorage.patch.dpatch b/debian/patches/0001_possible_crash_and_leak_llassetstorage.patch.dpatch old mode 100644 new mode 100755 diff --git a/debian/patches/0001_possible_crash_in_llviewerpartssim.dpatch b/debian/patches/0001_possible_crash_in_llviewerpartssim.dpatch old mode 100644 new mode 100755 diff --git a/debian/patches/1294_llworkerthread_when_terminating_program.patch.dpatch b/debian/patches/1294_llworkerthread_when_terminating_program.patch.dpatch old mode 100644 new mode 100755 diff --git a/debian/patches/1857_apr_thread_mutex_nested.patch.dpatch b/debian/patches/1857_apr_thread_mutex_nested.patch.dpatch old mode 100644 new mode 100755 diff --git a/debian/patches/2003_possible_crash_draganddrop.patch.dpatch b/debian/patches/2003_possible_crash_draganddrop.patch.dpatch old mode 100644 new mode 100755 diff --git a/debian/patches/21_VWR_2488_Standalone_build_fixes.dpatch b/debian/patches/21_VWR_2488_Standalone_build_fixes.dpatch old mode 100644 new mode 100755 diff --git a/debian/patches/22_build_more_approprate_binary_name.dpatch b/debian/patches/22_build_more_approprate_binary_name.dpatch old mode 100644 new mode 100755 diff --git a/debian/patches/24_always_test_vectorize.dpatch b/debian/patches/24_always_test_vectorize.dpatch old mode 100644 new mode 100755 diff --git a/debian/patches/24_fix_64bit_times.dpatch b/debian/patches/24_fix_64bit_times.dpatch old mode 100644 new mode 100755 diff --git a/debian/patches/2543_possible_crash_in_group_voting_propsals.patch.dpatch b/debian/patches/2543_possible_crash_in_group_voting_propsals.patch.dpatch old mode 100644 new mode 100755 diff --git a/debian/patches/2683_possible_crash_update_speaker_list.patch.dpatch b/debian/patches/2683_possible_crash_update_speaker_list.patch.dpatch old mode 100644 new mode 100755 diff --git a/debian/patches/34_dont_hide_symbols.dpatch b/debian/patches/34_dont_hide_symbols.dpatch old mode 100644 new mode 100755 diff --git a/debian/patches/38_build_opensource_without_crashlogger.dpatch b/debian/patches/38_build_opensource_without_crashlogger.dpatch old mode 100644 new mode 100755 diff --git a/debian/patches/4022_jpeg_error_gracefully.dpatch b/debian/patches/4022_jpeg_error_gracefully.dpatch old mode 100644 new mode 100755 diff --git a/debian/patches/50_get_cpu_clock_count_for_more_than_just_i386.dpatch b/debian/patches/50_get_cpu_clock_count_for_more_than_just_i386.dpatch old mode 100644 new mode 100755 diff --git a/debian/patches/51_fix_vectorize.dpatch b/debian/patches/51_fix_vectorize.dpatch old mode 100644 new mode 100755 diff --git a/debian/patches/52_standalone_expat_headers.dpatch b/debian/patches/52_standalone_expat_headers.dpatch old mode 100644 new mode 100755 diff --git a/debian/patches/55_fix_the_locales.dpatch b/debian/patches/55_fix_the_locales.dpatch old mode 100644 new mode 100755 diff --git a/debian/patches/55_use_system_locale.dpatch b/debian/patches/55_use_system_locale.dpatch old mode 100644 new mode 100755 diff --git a/debian/patches/59_need_llpreprocessor_to_access_endian_macros.dpatch b/debian/patches/59_need_llpreprocessor_to_access_endian_macros.dpatch old mode 100644 new mode 100755 diff --git a/debian/patches/60_use_system_headers_for_apr-1.dpatch b/debian/patches/60_use_system_headers_for_apr-1.dpatch old mode 100644 new mode 100755 diff --git a/debian/patches/60_use_system_xulrunner.dpatch b/debian/patches/60_use_system_xulrunner.dpatch old mode 100644 new mode 100755 diff --git a/debian/patches/61_use_debain_cares_1.5.1.dpatch b/debian/patches/61_use_debain_cares_1.5.1.dpatch old mode 100644 new mode 100755 diff --git a/debian/patches/68_use_system_headers_for_openjpeg.dpatch b/debian/patches/68_use_system_headers_for_openjpeg.dpatch old mode 100644 new mode 100755 diff --git a/debian/patches/70_put_AppROData_in_usr_share_secondlife.dpatch b/debian/patches/70_put_AppROData_in_usr_share_secondlife.dpatch old mode 100644 new mode 100755 diff --git a/debian/patches/71_use_debian_alternatives_for_www_browser.dpatch b/debian/patches/71_use_debian_alternatives_for_www_browser.dpatch old mode 100644 new mode 100755 diff --git a/debian/patches/75_use_debian-included_fonts.dpatch b/debian/patches/75_use_debian-included_fonts.dpatch old mode 100644 new mode 100755 diff --git a/debian/patches/79_use_debian_channel.dpatch b/debian/patches/79_use_debian_channel.dpatch old mode 100644 new mode 100755 diff --git a/debian/patches/VWR-1815_top_corner_fix.dpatch b/debian/patches/VWR-1815_top_corner_fix.dpatch old
[SCM] Packaging for warsow branch, master, updated. upstream/0.42.dfsg1-56-g214dfd8
The following commit has been merged in the master branch: commit 214dfd83b46017eef24a9142b8a71455e2ed28c7 Author: Andres Mejia [EMAIL PROTECTED] Date: Mon May 19 16:08:34 2008 -0400 Change Vcs entries to point to git diff --git a/debian/control b/debian/control index 412868a..3bb5ef8 100644 --- a/debian/control +++ b/debian/control @@ -6,8 +6,8 @@ Uploaders: Gonéri Le Bouder [EMAIL PROTECTED], Bruno Fuddl Kleinert fudd Build-Depends: debhelper (= 5), quilt, tofrodos, sharutils, libopenal-dev, libjpeg-dev, libvorbis-dev, libsdl-dev, libz-dev, libxxf86vm-dev, libxxf86dga-dev, libxinerama-dev, libcurl4-gnutls-dev | libcurl3-gnutls-dev Standards-Version: 3.7.3 Homepage: http://www.warsow.net/ -Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/warsow -Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/warsow/?op=log +Vcs-Git: git://git.debian.org/git/pkg-games/warsow.git +Vcs-Browser: http://git.debian.org/?p=pkg-games/warsow.git Package: warsow Architecture: any -- Packaging for warsow ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
[SCM] Packaging for warsow branch, master, created. 6a6262e08a01d27963a05ea0afea43eacf2153ad
The branch, master has been created at 6a6262e08a01d27963a05ea0afea43eacf2153ad (commit) - Shortlog commit 6a6262e08a01d27963a05ea0afea43eacf2153ad Merge: 8535d5f36e0fa75ef30348035713dcbea2ded84e 64a41f658c50ae349cc248dd43aea4a5c55e2afa Author: Andres Mejia [EMAIL PROTECTED] Date: Mon May 19 15:50:41 2008 -0400 Merge branch 'upstream' commit 64a41f658c50ae349cc248dd43aea4a5c55e2afa Author: Andres Mejia [EMAIL PROTECTED] Date: Mon May 19 15:50:31 2008 -0400 Imported Upstream version 0.42.dfsg1 commit 8535d5f36e0fa75ef30348035713dcbea2ded84e Merge: d51ab242376fdfe080a920191ac128ab58bf79ff b1267c432548a408372bc91b13c6e8b171816246 5adfdfd1fbc21536ce8bdc58ed66a7d5c57c2122 28ab7fe60336ec24a3650a9bfbf935491586ab66 b58d643a221a2d7db4d6788b6646c71efca46857 Author: Andres Mejia [EMAIL PROTECTED] Date: Mon May 19 15:48:28 2008 -0400 Merge commit 'tags/0.32.dfsg-1'; commit 'tags/0.31.dfsg-6'; commit 'tags/0.31.dfsg-3'; commit 'tags/0.42.dfsg1-1'; commit 'tags/0.31.dfsg-2' commit d51ab242376fdfe080a920191ac128ab58bf79ff Merge: 3b19b0fa60d6c19f43ff47c3431130823ddb8335 e90d1cc2838f35748ce5ee46c15bd04547fba645 Author: Andres Mejia [EMAIL PROTECTED] Date: Mon May 19 15:39:23 2008 -0400 Merge branch 'upstream' commit e90d1cc2838f35748ce5ee46c15bd04547fba645 Author: Andres Mejia [EMAIL PROTECTED] Date: Mon May 19 15:38:56 2008 -0400 initial upstream branch commit 3b19b0fa60d6c19f43ff47c3431130823ddb8335 Author: ceros-guest [EMAIL PROTECTED] Date: Tue Apr 22 11:56:20 2008 + [svn-buildpackage] Tagging warsow (0.42.dfsg1-1) commit feb0e4b84cb8ab0fd56c643fa643f78da4e829f6 Author: goneri [EMAIL PROTECTED] Date: Mon Apr 21 18:11:56 2008 + update the copyright file commit 5f840b443f6ba58a952d9fa94674915ff7877d74 Author: ceros-guest [EMAIL PROTECTED] Date: Mon Apr 21 04:31:42 2008 + Need fromdos line for file patched by disable_update_check.diff patch commit a1ebc7bc356a6439a027b6179d5ccf5ef1fc99f8 Author: ceros-guest [EMAIL PROTECTED] Date: Mon Apr 21 04:28:19 2008 + Disable update notifications by default commit 80317dd1ad8b34a5bd16ce0cfdc69e1a80aa4a3d Author: ceros-guest [EMAIL PROTECTED] Date: Mon Apr 21 04:17:02 2008 + Using one docs file for installing documentation commit d4449f1f51059c11fae09622d698ab4656d6b9a8 Author: ceros-guest [EMAIL PROTECTED] Date: Mon Apr 21 04:13:43 2008 + Fixing up packaging for warsow-0.42 commit 7218af8ccba10b7348f99e45eecca169759b8795 Author: ceros-guest [EMAIL PROTECTED] Date: Mon Apr 21 03:48:43 2008 + Updating install files commit 87b57202c4d3f3ae6ad4708f786045939aae201b Author: ceros-guest [EMAIL PROTECTED] Date: Mon Apr 21 03:42:01 2008 + Updating patches commit 088a776fb12467bb79e724993c3c72745d84c040 Author: ceros-guest [EMAIL PROTECTED] Date: Mon Apr 21 03:27:30 2008 + No longer need map_download.diff patch commit 9ef0714df7e68b108c600b64691ca609aa4d8493 Author: ceros-guest [EMAIL PROTECTED] Date: Mon Apr 21 03:12:16 2008 + Reordering which patches are applied first commit 7a7317fe873fbbfac9b4a120f36959d57d2001e7 Author: ceros-guest [EMAIL PROTECTED] Date: Mon Apr 21 03:10:00 2008 + Fix problem in debian/rules commit a2ac91eb46090539a350fd942c1ab099a9eb Author: ceros-guest [EMAIL PROTECTED] Date: Mon Apr 21 03:08:00 2008 + Adding mention of new upstream release in changelog commit 7885ab0c77bb463109110d19a2132386f8875dc2 Author: ceros-guest [EMAIL PROTECTED] Date: Mon Apr 21 03:04:25 2008 + Including a png file in documentation commit 8ac85c4be5673ff70f4c24e6f102f5ed2e26f3f1 Author: ceros-guest [EMAIL PROTECTED] Date: Mon Apr 21 02:58:26 2008 + Including upstream license commit ffbcf16ff6a88cf2ed4c345dacc8cc203860b43c Author: ceros-guest [EMAIL PROTECTED] Date: Mon Apr 21 02:57:51 2008 + Excluding some documentation commit cfacfd57f544c8e9bca7e8ff2e6df7c3aab0385c Author: ceros-guest [EMAIL PROTECTED] Date: Mon Apr 21 02:54:35 2008 + Preparing packaging for warsow-0.42 commit 0144bd60609fd0539e0a016764fcd269e749c620 Author: ceros-guest [EMAIL PROTECTED] Date: Sun Feb 17 15:56:40 2008 + Updated changelog commit 56ce10dd4303f904ed8523e96f2b69ae59e037f0 Author: ceros-guest [EMAIL PROTECTED] Date: Sun Feb 17 15:55:27 2008 + Added get-orig-source in debian/rules. commit f376f49bd71d8611d811a87505a0994721c1a6ca Author: ceros-guest [EMAIL PROTECTED] Date: Wed Jan 16 19:48:56 2008 + Changed who really debianized warsow. commit 87f9aaf6e5225fa303070e5320f9d12ce2a29293 Author: ceros-guest [EMAIL PROTECTED] Date: Wed Jan 16 18:04:18 2008 + Fixing use of nostrip option. commit 15a6998d5a02391dc348bffbc76f1eb9a65f5e22 Author: ceros-guest [EMAIL PROTECTED] Date: Wed Jan 16 17:41:47 2008 + Added watchfile. commit
[SCM] Base artwork package for slviewer branch, upstream, created. 76afd036ba3beb6e7ab82e47da89af24ec0e7a07
The branch, upstream has been created at 76afd036ba3beb6e7ab82e47da89af24ec0e7a07 (commit) - Shortlog --- -- Base artwork package for slviewer ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
[SCM] Base artwork package for slviewer branch, master, updated. byteme/1.20.4.0-1-7-ga779e7b
The following commit has been merged in the master branch: commit a779e7b9fd40aedc02bdbd70a437cab0ad529eab Author: Robin Cornelius [EMAIL PROTECTED] Date: Thu May 29 12:11:17 2008 +0100 Remove rogue execute perm on graphic diff --git a/indra/newview/skins/textures/6002a571-549c-472c-9443-9ab35b1a55ed.tga b/indra/newview/skins/textures/6002a571-549c-472c-9443-9ab35b1a55ed.tga old mode 100755 new mode 100644 -- Base artwork package for slviewer ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
[SCM] Packaging for ogre-contrib branch, master, updated. upstream/1.4.7-25-g6345a34
The following commit has been merged in the master branch: commit 6345a347cf7e9811e4c97407935bcd3bda3a9732 Author: Andres Mejia [EMAIL PROTECTED] Date: Sun May 18 00:47:59 2008 -0400 Preparing for release of ogre-contrib-1.4.8 diff --git a/debian/changelog b/debian/changelog index 308d852..4db99d1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,12 +1,16 @@ -ogre-contrib (1.4.7-1) unstable; urgency=low +ogre-contrib (1.4.8-1) unstable; urgency=low * New upstream release. * Setup a OGRE_CONFIG_OPTIONS for default configure options used in building ogre. * Changing use of CFLAGS TO CXXFLAGS. * Updated patch. + * Moved to git repository for packaging. + * Added DM-Upload-Allowed: yes field. + * Installing plugin in directory based on ogre version. + * Using /usr/bin/update-ogre-plugins for updating plugins file. - -- Andres Mejia [EMAIL PROTECTED] Thu, 03 Apr 2008 23:27:41 -0400 + -- Andres Mejia [EMAIL PROTECTED] Sun, 18 May 2008 00:03:56 -0400 ogre-contrib (1.4.6-1) unstable; urgency=low diff --git a/debian/control b/debian/control index c20bef0..d8114f3 100644 --- a/debian/control +++ b/debian/control @@ -3,13 +3,14 @@ Priority: optional Section: contrib/libs Maintainer: Debian Games Team [EMAIL PROTECTED] Uploaders: Andres Mejia [EMAIL PROTECTED], Federico Di Gregorio [EMAIL PROTECTED] -Build-Depends: debhelper (= 5), quilt, libtool, automake, pkg-config, nvidia-cg-toolkit (= 2.0), libfreetype6-dev, libfreeimage-dev, libzzip-dev, libogre-dev (= 1.4.7), libogre-dev ( 1.4.8) +Build-Depends: debhelper (= 5), quilt, libtool, automake, pkg-config, nvidia-cg-toolkit (= 2.0), libfreetype6-dev, libfreeimage-dev, libzzip-dev, libogre-dev (= 1.4.8), libogre-dev ( 1.4.9) Standards-Version: 3.7.3 Homepage: http://ogre3d.org/ -Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/ogre-contrib -Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/ogre-contrib/?op=log +Vcs-Git: git://git.debian.org/git/pkg-games/ogre-contrib.git +Vcs-Browser: http://git.debian.org/?p=pkg-games/ogre-contrib.git +DM-Upload-Allowed: yes -Package: ogre-plugins-cgprogrammanager +Package: ogre-plugins-cgprogrammanager-1.4.8 Section: contrib/libs Architecture: amd64 i386 Depends: nvidia-cg-toolkit (= 2.0), ${shlibs:Depends} @@ -22,7 +23,7 @@ Description: Ogre plugin: CgProgramManager . This package contains the CgProgramManager Ogre plugin. -Package: ogre-plugins-cgprogrammanager-dbg +Package: ogre-plugins-cgprogrammanager-1.4.8-dbg Section: contrib/libdevel Architecture: amd64 i386 Priority: extra diff --git a/debian/ogre-contrib-get-orig-source b/debian/ogre-contrib-get-orig-source index 27a1a62..8e7f290 100755 --- a/debian/ogre-contrib-get-orig-source +++ b/debian/ogre-contrib-get-orig-source @@ -4,9 +4,9 @@ # distributed through Debian. # Some variables to make maintaining this script easier -OGRE_VERSION=1.4.7 -OGRE_TARBALL=ogre-linux_osx-v1-4-7.tar.bz2 -OGRE_TARBALL_CHECKSUM=f44cba3f7362f6d8ca4187dee0d588ef +OGRE_VERSION=1.4.8 +OGRE_TARBALL=ogre-v1-4-8.tar.bz2 +OGRE_TARBALL_CHECKSUM=c9034bdbd4c7cd79a4dd38811765262a USAGE=\n\ This script is used to generate the orig tarball used in building\n\ @@ -20,10 +20,6 @@ Usage: ogre-contrib-get-orig-source [OPTION]\n\ while [ $# -gt 0 ] do case $1 in --h|--help) -echo ${USAGE} -exit 1 -;; --keep-upstream-tarball) KEEP_UPSTREAM_TARBALL=1 shift @@ -32,6 +28,10 @@ do KEEP_ORIG_DIR=1 shift ;; +-h|--help|*) +echo ${USAGE} +exit 1 +;; esac done @@ -52,29 +52,25 @@ else fi # Prepare the ogre-contrib orig tarball -if [ ! -d ogrenew ]; then +if [ ! -d ogre ]; then echo Extracting $OGRE_TARBALL tar -xjf $OGRE_TARBALL else - echo Already found extracted ogrenew directory. Please remove -or move ogrenew and ogre-contrib-$OGRE_VERSION directories and also ogre-contrib_$OGRE_VERSION.orig.tar.gz. + echo Already found extracted ogre directory. Please remove +or move ogre and ogre-contrib-$OGRE_VERSION directories and also +ogre-contrib_$OGRE_VERSION.orig.tar.gz. exit 1 fi if [ ! -d ogre-contrib-$OGRE_VERSION ]; then - echo Renaming extracted ogrenew directory to ogre-contrib-$OGRE_VERSION - mv ogrenew ogre-contrib-$OGRE_VERSION + echo Renaming extracted ogre directory to ogre-contrib-$OGRE_VERSION + mv ogre ogre-contrib-$OGRE_VERSION else - echo Already found ogre-contrib-$OGRE_VERSION directory. Please remove or move -ogrenew and ogre-contrib-$OGRE_VERSION directories and also ogre-contrib_$OGRE_VERSION.orig.tar.gz. + echo Already found ogre-contrib-$OGRE_VERSION directory. Please remove or +move ogre and ogre-contrib-$OGRE_VERSION directories and also +ogre-contrib_$OGRE_VERSION.orig.tar.gz. exit 1 fi -# Remove all CVS directories -echo
[SCM] Base artwork package for slviewer branch, master, updated. byteme/1.20.4.0-1-7-ga779e7b
The following commit has been merged in the master branch: commit 188913ae1d5bae91dac2e79a808b1c6a8aa8b09a Author: Robin Cornelius [EMAIL PROTECTED] Date: Thu May 29 11:39:25 2008 +0100 Add changes to complete move to omvviewer for trademark compliance diff --git a/debian/README.Debian-source b/debian/README.Debian-source deleted file mode 100644 index 1dd623b..000 --- a/debian/README.Debian-source +++ /dev/null @@ -1,10 +0,0 @@ -The .orig.tgz tarball was created by: - -VERS=1.18.1.2 -unzip slviewer-artwork-$VERS.zip -cd linden/indra/newview/skins/textures/ -chmod a-x * -cd ../../../../.. -mv linden/ slviewer-artwork-$VERS.orig -tar cvf - slviewer-artwork-$VERS.orig/ | gzip -9 slviewer-artwork_$VERS.orig.tar.gz -rm -rf slviewer-artwork-$VERS.orig diff --git a/debian/changelog b/debian/changelog index 7025c4f..94f6df9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -slviewer-artwork (1.20.4.0-1) unstable; urgency=low +omvviewer-artwork (1.20.4.0-1) unstable; urgency=low * New upstream release - -- root [EMAIL PROTECTED] Sat, 26 Apr 2008 18:58:42 +0100 + -- robin [EMAIL PROTECTED] Sat, 26 Apr 2008 18:58:42 +0100 slviewer-artwork (1.19.1.0-1) unstable; urgency=low diff --git a/debian/control b/debian/control index ce7edba..19f136f 100644 --- a/debian/control +++ b/debian/control @@ -1,14 +1,14 @@ -Source: slviewer-artwork +Source: omvviewer-artwork Section: games Priority: extra -Maintainer: Paul TBBle Hampson [EMAIL PROTECTED] +Maintainer: Robin Cornelius [EMAIL PROTECTED] Build-Depends: debhelper (= 5) Standards-Version: 3.7.2 -Package: slviewer-artwork +Package: omvviewer-artwork Architecture: all -Description: skin textures and misc data for the Second Life Viewer - slviewer-artwork contains the artwork for use with the Second Life Viewer +Description: Skin textures and misc data for the Open Metaverse Viewer + omvviewer-artwork contains the artwork for use with the Open Metaverse Viewer . This long description needs improving, and should also contain the intro par - from slviewer + from omvviewer diff --git a/debian/rules b/debian/rules index bc2942c..86d5d6a 100755 --- a/debian/rules +++ b/debian/rules @@ -20,7 +20,7 @@ binary-indep: build dh_installdirs dh_installchangelogs dh_installdocs debian/README.Debian-source - dh_install --sourcedir=indra/newview/ app_settings character res res-sdl skins usr/share/secondlife + dh_install --sourcedir=indra/newview/ app_settings character res res-sdl skins usr/share/omvviewer dh_compress dh_fixperms dh_installdeb -- Base artwork package for slviewer ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
[SCM] Base artwork package for slviewer branch, master, updated. byteme/1.20.4.0-1-7-ga779e7b
The following commit has been merged in the master branch: commit 8785e78f4972cea614657008fb55e3fa3f40b759 Author: Robin Cornelius [EMAIL PROTECTED] Date: Thu May 29 12:08:05 2008 +0100 Fix build problem diff --git a/debian/rules b/debian/rules index 86d5d6a..20fded4 100755 --- a/debian/rules +++ b/debian/rules @@ -19,7 +19,7 @@ binary-indep: build dh_testroot dh_installdirs dh_installchangelogs - dh_installdocs debian/README.Debian-source + dh_installdocs dh_install --sourcedir=indra/newview/ app_settings character res res-sdl skins usr/share/omvviewer dh_compress dh_fixperms -- Base artwork package for slviewer ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
[SCM] Packaging for funguloids branch, master, updated. upstream/1.06-39-gbe1af65
The following commit has been merged in the master branch: commit be1af6562885a7b92c4e86c85c9d2e1df1909671 Merge: 4cecdca0643d19bc93d2d8fb4c690fbd567d8b4c d175f04bdae65806598c378a02080db52e0e50ec 4cc6ce2c54e5b5d845d6a6a8d7960276b70c45a3 Author: Andres Mejia [EMAIL PROTECTED] Date: Mon May 19 15:18:07 2008 -0400 Merge remote branches 'tags/1.06-4' and 'tags/1.06-5' of git+ssh://git.debian.org/git/pkg-games/funguloids -- Packaging for funguloids ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
[SCM] Base artwork package for slviewer branch, pristine-tar, created. d5860af3dee148eacae8ea4c4928725e654fc438
The branch, pristine-tar has been created at d5860af3dee148eacae8ea4c4928725e654fc438 (commit) - Shortlog commit d5860af3dee148eacae8ea4c4928725e654fc438 Author: root [EMAIL PROTECTED] Date: Mon May 26 12:39:23 2008 +0100 pristine-tar data for slviewer-artwork_1.20.4.0.orig.tar.gz --- -- Base artwork package for slviewer ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
[SCM] Packaging for openal-soft branch, master, updated. upstream/1.3.253-7-g6197b89
The following commit has been merged in the master branch: commit 6197b89739424fcdecba51a166cceb5145ab1962 Author: Andres Mejia [EMAIL PROTECTED] Date: Sun Jun 8 01:27:48 2008 -0400 Fix version diff --git a/debian/changelog b/debian/changelog index 14e4f19..23f3938 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -openal-soft (1.1.3.253-2) experimental; urgency=low +openal-soft (1:1.3.253-2) experimental; urgency=low [ Andres Mejia ] * Fix typo in copyright file. -- Packaging for openal-soft ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
[SCM] Packaging for openal-soft annotated tag, debian/1.3.253-2, created. debian/1.3.253-2
The annotated tag, debian/1.3.253-2 has been created at 60ae54d41646048374b7f50f767f652923a0e6de (tag) tagging 6197b89739424fcdecba51a166cceb5145ab1962 (commit) replaces debian/1.3.253-1 tagged by Andres Mejia on Sun Jun 8 20:03:24 2008 -0400 - Shortlog Debian release 1:1.3.253-2 Andres Mejia (3): Fix typo in copyright file. Update Cyril's email address. Fix version --- -- Packaging for openal-soft ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
[SCM] Base artwork package for slviewer annotated tag, upstream/1.20.4.0, created. upstream/1.20.4.0
The annotated tag, upstream/1.20.4.0 has been created at 90f063aec135a9e3215c24a366746b62e54eb8ff (tag) tagging 76afd036ba3beb6e7ab82e47da89af24ec0e7a07 (commit) tagged by root on Mon May 26 12:39:23 2008 +0100 - Shortlog Upstream version 1.20.4.0 root (1): Imported Upstream version 1.20.4.0 --- -- Base artwork package for slviewer ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
[SCM] Packaging for ogre-contrib branch, master, updated. upstream/1.4.7-32-ga77a5d4
The following commit has been merged in the master branch: commit a77a5d4887958491bd3c7273d77d9caccd36d981 Author: Andres Mejia [EMAIL PROTECTED] Date: Sun May 18 02:39:24 2008 -0400 Need Replaces field for ogre-plugins-cgprogrammanager to replace a symlink. diff --git a/debian/changelog b/debian/changelog index aa03b20..d63d1c3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,7 @@ ogre-contrib (1.4.8-1) unstable; urgency=low * Added DM-Upload-Allowed: yes field. * Install plugin in directory based on ogre version. * Using /usr/bin/update-ogre-plugins for updating plugins file. + * Need Replaces field for ogre-plugins-cgprogrammanager to replace a symlink. -- Andres Mejia [EMAIL PROTECTED] Sun, 18 May 2008 00:03:56 -0400 diff --git a/debian/control b/debian/control index d8114f3..e894aef 100644 --- a/debian/control +++ b/debian/control @@ -15,7 +15,7 @@ Section: contrib/libs Architecture: amd64 i386 Depends: nvidia-cg-toolkit (= 2.0), ${shlibs:Depends} Conflicts: ogre-plugins-cgmanager -Replaces: ogre-plugins-cgmanager +Replaces: ogre-plugins-cgmanager, ogre-plugins-cgprogrammanager Description: Ogre plugin: CgProgramManager Ogre is a complete object-oriented 3D rendering engine. It supports different rendering subsystems but only the OpenGL system is useful diff --git a/debian/ogre-plugins-cgprogrammanager-VERSION.install b/debian/ogre-plugins-cgprogrammanager-VERSION.install index 55e656e..dd194f7 100644 --- a/debian/ogre-plugins-cgprogrammanager-VERSION.install +++ b/debian/ogre-plugins-cgprogrammanager-VERSION.install @@ -1,3 +1,4 @@ usr/lib/[EMAIL PROTECTED]@/*.so usr/lib/[EMAIL PROTECTED]@/*.la etc/OGRE/[EMAIL PROTECTED]@.cfg.cgprogrammanager +etc/OGRE/plugins.cfg.cgprogrammanager -- Packaging for ogre-contrib ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
[SCM] Base artwork package for slviewer branch, master, updated. byteme/1.20.4.0-1-7-ga779e7b
The following commit has been merged in the master branch: commit dd148c2493c50695876598d47b6842c00c6defd4 Author: Robin Cornelius [EMAIL PROTECTED] Date: Thu May 29 12:09:46 2008 +0100 Fix build problem, due to rename of package diff --git a/debian/changelog b/debian/changelog index fdb9cf2..279d3a2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,7 +4,7 @@ omvviewer-artwork (1.20.8+dfsg-1) experimental; urgency=low + Remove Tradmarked images + Add Public Domain replacment icon - -- Robin Cornelius robin [EMAIL PROTECTED] Thu, 29 May 2008 11:40:55 +0100 + -- Robin Cornelius [EMAIL PROTECTED] Thu, 29 May 2008 11:40:55 +0100 omvviewer-artwork (1.20.4.0-1) unstable; urgency=low diff --git a/debian/control b/debian/control index 19f136f..e8cf3fa 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: games Priority: extra Maintainer: Robin Cornelius [EMAIL PROTECTED] Build-Depends: debhelper (= 5) -Standards-Version: 3.7.2 +Standards-Version: 3.7.3 Package: omvviewer-artwork Architecture: all diff --git a/debian/dirs b/debian/dirs index 88e98e1..74170e4 100644 --- a/debian/dirs +++ b/debian/dirs @@ -1 +1 @@ -usr/share/secondlife/ +usr/share/omvviewer/ -- Base artwork package for slviewer ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
[SCM] Base artwork package for slviewer branch, pristine-tar, updated. ed8836ba891d118ec9f1e555c7603464fe2fbb98
The following commit has been merged in the pristine-tar branch: commit ed8836ba891d118ec9f1e555c7603464fe2fbb98 Author: Robin Cornelius [EMAIL PROTECTED] Date: Thu May 29 11:40:51 2008 +0100 pristine-tar data for omvviewer-artwork_1.20.8+dfsg.orig.tar.gz diff --git a/omvviewer-artwork_1.20.8+dfsg.orig.tar.gz.delta b/omvviewer-artwork_1.20.8+dfsg.orig.tar.gz.delta new file mode 100644 index 000..14cdf81 Binary files /dev/null and b/omvviewer-artwork_1.20.8+dfsg.orig.tar.gz.delta differ diff --git a/omvviewer-artwork_1.20.8+dfsg.orig.tar.gz.id b/omvviewer-artwork_1.20.8+dfsg.orig.tar.gz.id new file mode 100644 index 000..9e6ca91 --- /dev/null +++ b/omvviewer-artwork_1.20.8+dfsg.orig.tar.gz.id @@ -0,0 +1 @@ +c7821a0a1e97f8d9f6a7dafa9b698a79c5e79b43 -- Base artwork package for slviewer ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
[SCM] Packaging for openal-soft annotated tag, debian/1.3.253-1, created. debian/1.3.253-1
The annotated tag, debian/1.3.253-1 has been created at dc78a4b179481d5c2b16bd032f6137ce487a0d09 (tag) tagging 6d8c316c35cc058dfb2c480f52b3242d5db3758b (commit) replaces upstream/1.3.253 tagged by Andres Mejia on Sun Jun 8 01:56:50 2008 -0400 - Shortlog Debian release 1:1.3.253-1 Andres Mejia (3): Imported Debian patch 1.3.253-1~experimental0 Changed Vcs entries to point to git repositories. Include a debug package Reinhard Tartler (1): target upload to experimental instead of unstable for now. --- -- Packaging for openal-soft ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
[SCM] Packaging for openal-soft branch, master, updated. upstream/1.3.253-5-g3e6f179
The following commit has been merged in the master branch: commit 3e6f17931971e08b3aeb08014d0682f424da259b Author: Andres Mejia [EMAIL PROTECTED] Date: Sun Jun 8 01:09:01 2008 -0400 Fix typo in copyright file. diff --git a/debian/changelog b/debian/changelog index 5a14c2b..4d21d02 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +openal-soft (1.1.3.253-2) experimental; urgency=low + + [ Andres Mejia ] + * Fix typo in copyright file. + + -- Andres Mejia [EMAIL PROTECTED] Sun, 08 Jun 2008 01:07:34 -0400 + openal-soft (1:1.3.253-1) experimental; urgency=low [Bruno Kleinert] diff --git a/debian/copyright b/debian/copyright index 39a55ec..dd95f37 100644 --- a/debian/copyright +++ b/debian/copyright @@ -3,7 +3,7 @@ Thu, 27 Mar 2008 16:05:18 +0100. OpenAL Soft was downloaded from http://kcat.strangesoft.net/openal.html -OpenAL Soft is copright (C) 1999-2008 by the OpenAL team +OpenAL Soft is copyright (C) 1999-2008 by the OpenAL team 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 -- Packaging for openal-soft ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
[SCM] Packaging for warsow branch, pristine-tar, created. d781dafe75c21045ea055c81084c871fa378ee85
The branch, pristine-tar has been created at d781dafe75c21045ea055c81084c871fa378ee85 (commit) - Shortlog commit d781dafe75c21045ea055c81084c871fa378ee85 Author: Andres Mejia [EMAIL PROTECTED] Date: Mon May 19 15:50:35 2008 -0400 pristine-tar data for warsow_0.42.dfsg1.orig.tar.gz --- -- Packaging for warsow ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
[SCM] Packaging for ogre-contrib branch, master, updated. upstream/1.4.7-26-g835e6f5
The following commit has been merged in the master branch: commit 835e6f50e0016fee0c4e07a0fea953c1a732bbae Author: Andres Mejia [EMAIL PROTECTED] Date: Sun May 18 01:06:08 2008 -0400 Adding patch to change where plugin is installed. diff --git a/debian/patches/change_pkglibdir_path.patch b/debian/patches/change_pkglibdir_path.patch new file mode 100644 index 000..6ee15b6 --- /dev/null +++ b/debian/patches/change_pkglibdir_path.patch @@ -0,0 +1,11 @@ +Change path plugin gets installed to a directory based on ogre version. += +--- PlugIns/CgProgramManager/src/Makefile.am.bak 2008-05-18 00:49:50.0 -0400 PlugIns/CgProgramManager/src/Makefile.am 2008-05-18 00:50:02.0 -0400 +@@ -1,5 +1,6 @@ + INCLUDES = $(STLPORT_CFLAGS) -I$(top_srcdir)/PlugIns/CgProgramManager/include -I$(top_srcdir)/OgreMain/include + ++pkglibdir = $(libdir)/@[EMAIL PROTECTED]@PACKAGE_VERSION@ + pkglib_LTLIBRARIES = Plugin_CgProgramManager.la + + Plugin_CgProgramManager_la_SOURCES = OgreCgProgram.cpp \ diff --git a/debian/patches/series b/debian/patches/series index 440c8cc..4f90860 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ autotools.diff +change_pkglibdir_path.patch -p0 -- Packaging for ogre-contrib ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
[SCM] Packaging for openal-soft branch, master, updated. upstream/1.3.253-4-g6d8c316
The following commit has been merged in the master branch: commit 6d8c316c35cc058dfb2c480f52b3242d5db3758b Author: Reinhard Tartler [EMAIL PROTECTED] Date: Sat Jun 7 16:28:01 2008 +0200 target upload to experimental instead of unstable for now. diff --git a/debian/changelog b/debian/changelog index 1276cec..5a14c2b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -openal-soft (1:1.3.253-1) unstable; urgency=low +openal-soft (1:1.3.253-1) experimental; urgency=low [Bruno Kleinert] * Initial release (Closes: #473128) -- Packaging for openal-soft ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
[SCM] Packaging for ogre-contrib branch, master, updated. upstream/1.4.7-27-g55493c7
The following commit has been merged in the master branch: commit 55493c7496f7e3e52f982767b539c89c54e9a71e Author: Andres Mejia [EMAIL PROTECTED] Date: Sun May 18 01:14:06 2008 -0400 Fix rules file. Update changelog. diff --git a/debian/changelog b/debian/changelog index 4db99d1..aa03b20 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,7 +7,7 @@ ogre-contrib (1.4.8-1) unstable; urgency=low * Updated patch. * Moved to git repository for packaging. * Added DM-Upload-Allowed: yes field. - * Installing plugin in directory based on ogre version. + * Install plugin in directory based on ogre version. * Using /usr/bin/update-ogre-plugins for updating plugins file. -- Andres Mejia [EMAIL PROTECTED] Sun, 18 May 2008 00:03:56 -0400 diff --git a/debian/rules b/debian/rules index 7d3d85d..e4c1bd5 100755 --- a/debian/rules +++ b/debian/rules @@ -5,6 +5,9 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +# Use this variable to set what version of ogre we're working with +OGRE_VERSION=1.4.8 + # These are from the autotools-dev package documentation. # /usr/share/doc/autotools-dev/README.Debian.gz # from the section titled Calling GNU configure properly @@ -25,7 +28,7 @@ ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) else DEFAULT_CXXFLAGS += -O2 endif -CXXFLAGS ?= $(DEFAULT_CXXFLAGS) +DEB_CXXFLAGS ?= $(DEFAULT_CXXFLAGS) # Include a OGRE_CONFIG_OPTIONS variable that has the default configure options # used to build this package. This variable can be overridden. @@ -36,8 +39,9 @@ OGRE_CONFIG_OPTIONS ?= $(confflags) \ --mandir=\$${prefix}/share/man \ --infodir=\$${prefix}/share/info \ --with-gui=Xt \ + --enable-cg \ --disable-ogre-demos \ - CXXFLAGS=$(CXXFLAGS) + CXXFLAGS=$(DEB_CXXFLAGS) patch: patch-stamp patch-stamp: @@ -75,7 +79,7 @@ clean-stamp: unpatch: dh_testdir QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2 - rm -f patch-stamp + rm -rf .pc/ patch-stamp install: build dh_testdir -- Packaging for ogre-contrib ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
[SCM] Packaging for warsow branch, master, updated. upstream/0.42.dfsg1-57-g12fc570
The following commit has been merged in the master branch: commit 12fc5701ac6c1ccf0143945e213fa6765ac74fb4 Author: Andres Mejia [EMAIL PROTECTED] Date: Mon May 19 16:17:22 2008 -0400 * Use git for packaging. * Include DM-Upload-Allowed: yes field. diff --git a/debian/changelog b/debian/changelog index c99c01d..1caf050 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +warsow (0.42.dfsg1-2) unstable; urgency=low + + [ Andres Mejia ] + * Use git for packaging. + * Include DM-Upload-Allowed: yes field. + + -- Andres Mejia [EMAIL PROTECTED] Mon, 19 May 2008 16:16:18 -0400 + warsow (0.42.dfsg1-1) unstable; urgency=low [ Andres Mejia ] diff --git a/debian/control b/debian/control index 3bb5ef8..93dc953 100644 --- a/debian/control +++ b/debian/control @@ -8,6 +8,7 @@ Standards-Version: 3.7.3 Homepage: http://www.warsow.net/ Vcs-Git: git://git.debian.org/git/pkg-games/warsow.git Vcs-Browser: http://git.debian.org/?p=pkg-games/warsow.git +DM-Upload-Allowed: yes Package: warsow Architecture: any -- Packaging for warsow ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
[SCM] Packaging for warsow annotated tag, upstream/0.42.dfsg1, created. upstream/0.42.dfsg1
The annotated tag, upstream/0.42.dfsg1 has been created at 2436fe5ca31d9a5f0fbf2253cfbbe38b31be6031 (tag) tagging 64a41f658c50ae349cc248dd43aea4a5c55e2afa (commit) tagged by Andres Mejia on Mon May 19 15:50:37 2008 -0400 - Shortlog Upstream version 0.42.dfsg1 Andres Mejia (2): initial upstream branch Imported Upstream version 0.42.dfsg1 --- -- Packaging for warsow ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
[SCM] Base artwork package for slviewer branch, master, updated. byteme/1.20.4.0-1-7-ga779e7b
The following commit has been merged in the master branch: commit 4baae0ce4c035b6dcb1c3af39076940df599a8c1 Merge: 188913ae1d5bae91dac2e79a808b1c6a8aa8b09a c7821a0a1e97f8d9f6a7dafa9b698a79c5e79b43 Author: Robin Cornelius [EMAIL PROTECTED] Date: Thu May 29 11:40:53 2008 +0100 Merge branch 'upstream' -- Base artwork package for slviewer ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
[SCM] Packaging for openal-soft branch, master, updated. upstream/1.3.253-6-gf4226a9
The following commit has been merged in the master branch: commit f4226a957880ed92eaa6ced8bad435514cd35741 Author: Andres Mejia [EMAIL PROTECTED] Date: Sun Jun 8 01:14:36 2008 -0400 Update Cyril's email address. diff --git a/debian/changelog b/debian/changelog index 4d21d02..14e4f19 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ openal-soft (1.1.3.253-2) experimental; urgency=low [ Andres Mejia ] * Fix typo in copyright file. + * Update Cyril's email address. -- Andres Mejia [EMAIL PROTECTED] Sun, 08 Jun 2008 01:07:34 -0400 diff --git a/debian/control b/debian/control index 56907ad..5c008d5 100644 --- a/debian/control +++ b/debian/control @@ -1,7 +1,7 @@ Source: openal-soft Priority: extra Maintainer: Debian Games Team [EMAIL PROTECTED] -Uploaders: Bruno Fuddl Kleinert [EMAIL PROTECTED], Andres Mejia [EMAIL PROTECTED], Reinhard Tartler [EMAIL PROTECTED], Thierry Reding [EMAIL PROTECTED], Cyril Brulebois [EMAIL PROTECTED], Gonéri Le Bouder [EMAIL PROTECTED] +Uploaders: Bruno Fuddl Kleinert [EMAIL PROTECTED], Andres Mejia [EMAIL PROTECTED], Reinhard Tartler [EMAIL PROTECTED], Thierry Reding [EMAIL PROTECTED], Cyril Brulebois [EMAIL PROTECTED], Gonéri Le Bouder [EMAIL PROTECTED] Build-Depends: debhelper (= 5), quilt, libasound2-dev, cmake Standards-Version: 3.7.3 Section: libs -- Packaging for openal-soft ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
[SCM] Packaging for ogre-contrib branch, master, updated. upstream/1.4.7-31-g818bbd3
The following commit has been merged in the master branch: commit 818bbd387b7aa9bde9c7cbde02268f4d0f826050 Author: Andres Mejia [EMAIL PROTECTED] Date: Sun May 18 02:24:58 2008 -0400 Change rules file for new packaging method. diff --git a/debian/ogre-plugins-cgprogrammanager.install b/debian/ogre-plugins-cgprogrammanager.install deleted file mode 100644 index 21323d4..000 --- a/debian/ogre-plugins-cgprogrammanager.install +++ /dev/null @@ -1,3 +0,0 @@ -usr/lib/OGRE/*.so -usr/lib/OGRE/*.la -etc/OGRE/plugins.cfg.cgprogrammanager diff --git a/debian/ogre-plugins-cgprogrammanager.postinst b/debian/ogre-plugins-cgprogrammanager.postinst deleted file mode 100644 index e2f3c5c..000 --- a/debian/ogre-plugins-cgprogrammanager.postinst +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh -e - -if [ -x /usr/bin/update-ogre-plugins ] ; then -/usr/bin/update-ogre-plugins -fi - -#DEBHELPER# diff --git a/debian/ogre-plugins-cgprogrammanager.postrm b/debian/ogre-plugins-cgprogrammanager.postrm deleted file mode 100644 index e2f3c5c..000 --- a/debian/ogre-plugins-cgprogrammanager.postrm +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh -e - -if [ -x /usr/bin/update-ogre-plugins ] ; then -/usr/bin/update-ogre-plugins -fi - -#DEBHELPER# diff --git a/debian/plugins.cfg.cgprogrammanager b/debian/plugins.cfg.cgprogrammanager deleted file mode 100644 index bf60926..000 --- a/debian/plugins.cfg.cgprogrammanager +++ /dev/null @@ -1 +0,0 @@ -Plugin=Plugin_CgProgramManager.so diff --git a/debian/rules b/debian/rules index e4c1bd5..5329c89 100755 --- a/debian/rules +++ b/debian/rules @@ -43,13 +43,27 @@ OGRE_CONFIG_OPTIONS ?= $(confflags) \ --disable-ogre-demos \ CXXFLAGS=$(DEB_CXXFLAGS) +build-setup: build-setup-stamp +build-setup-stamp: + dh_testdir + cp -f debian/ogre-plugins-cgprogrammanager-VERSION.install \ + debian/ogre-plugins-cgprogrammanager-$(OGRE_VERSION).install + cp -f debian/ogre-plugins-cgprogrammanager-VERSION.postinst \ + debian/ogre-plugins-cgprogrammanager-$(OGRE_VERSION).postinst + cp -f debian/ogre-plugins-cgprogrammanager-VERSION.postrm \ + debian/ogre-plugins-cgprogrammanager-$(OGRE_VERSION).postrm + cp -f debian/plugins-VERSION.cfg.cgprogrammanager \ + debian/plugins-$(OGRE_VERSION).cfg.cgprogrammanager + sed -i 's/@VERSION@/$(OGRE_VERSION)/g' \ + debian/ogre-plugins-cgprogrammanager-$(OGRE_VERSION).install + patch: patch-stamp patch-stamp: dh_testdir QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2 touch patch-stamp -configure: patch configure-stamp +configure: build-setup patch configure-stamp configure-stamp: dh_testdir # Modified bootstrapping from upstream, declares everything obsolete. @@ -67,7 +81,7 @@ build-stamp: $(MAKE) touch build-stamp -clean: clean-stamp unpatch +clean: clean-stamp unpatch reverse-build-setup clean-stamp: dh_testdir dh_testroot @@ -81,6 +95,14 @@ unpatch: QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2 rm -rf .pc/ patch-stamp +reverse-build-setup: + dh_testdir + rm -f debian/ogre-plugins-cgprogrammanager-$(OGRE_VERSION).install + rm -f debian/ogre-plugins-cgprogrammanager-$(OGRE_VERSION).postinst + rm -f debian/ogre-plugins-cgprogrammanager-$(OGRE_VERSION).postrm + rm -f debian/plugins-$(OGRE_VERSION).cfg.cgprogrammanager + rm -f build-setup-stamp + install: build dh_testdir dh_testroot @@ -97,12 +119,14 @@ binary-arch: build install dh_testdir dh_testroot install -d debian/tmp/etc/OGRE - install -m 644 debian/plugins.cfg.cgprogrammanager \ - debian/tmp/etc/OGRE/plugins.cfg.cgprogrammanager + install -m 644 debian/plugins-$(OGRE_VERSION).cfg.cgprogrammanager \ + debian/tmp/etc/OGRE/plugins-$(OGRE_VERSION).cfg.cgprogrammanager + ln -s plugins-$(OGRE_VERSION).cfg.cgprogrammanager \ + debian/tmp/etc/OGRE/plugins.cfg.cgprogrammanager dh_install --sourcedir=debian/tmp dh_installchangelogs dh_installdocs - dh_strip --dbg-package=ogre-plugins-cgprogrammanager-dbg + dh_strip --dbg-package=ogre-plugins-cgprogrammanager-$(OGRE_VERSION)-dbg dh_compress dh_fixperms dh_makeshlibs -- Packaging for ogre-contrib ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
r7319 - in packages/trunk/wesnoth/debian: . patches
Author: alfie Date: 2008-06-09 12:13:10 + (Mon, 09 Jun 2008) New Revision: 7319 Added: packages/trunk/wesnoth/debian/README.source Removed: packages/trunk/wesnoth/debian/patches/04no-campaign-fix packages/trunk/wesnoth/debian/patches/05address-align-for-sparc Modified: packages/trunk/wesnoth/debian/changelog packages/trunk/wesnoth/debian/control packages/trunk/wesnoth/debian/patches/series Log: * New upstream release, incorporating the following two patches: no-campaign-fix, address-align-for-sparc. Removed them from patch series. * Finally switched Maintainer to Games Team. * Updated to Standards-Version 3.8.0: - Added README.source to package. Added: packages/trunk/wesnoth/debian/README.source === --- packages/trunk/wesnoth/debian/README.source (rev 0) +++ packages/trunk/wesnoth/debian/README.source 2008-06-09 12:13:10 UTC (rev 7319) @@ -0,0 +1,2 @@ +This package uses quilt for its patch management, see +/usr/share/doc/quilt/README.source if you are unfamiliar with it. Modified: packages/trunk/wesnoth/debian/changelog === --- packages/trunk/wesnoth/debian/changelog 2008-06-09 07:56:03 UTC (rev 7318) +++ packages/trunk/wesnoth/debian/changelog 2008-06-09 12:13:10 UTC (rev 7319) @@ -1,3 +1,13 @@ +wesnoth (1:1.4.3-1) unstable; urgency=low + + * New upstream release, incorporating the following two patches: +no-campaign-fix, address-align-for-sparc. Removed them from patch series. + * Finally switched Maintainer to Games Team. + * Updated to Standards-Version 3.8.0: +- Added README.source to package. + + -- Gerfried Fuchs [EMAIL PROTECTED] Sun, 08 Jun 2008 21:26:24 +0200 + wesnoth (1:1.4.2-1) unstable; urgency=low * New upstream release. Modified: packages/trunk/wesnoth/debian/control === --- packages/trunk/wesnoth/debian/control 2008-06-09 07:56:03 UTC (rev 7318) +++ packages/trunk/wesnoth/debian/control 2008-06-09 12:13:10 UTC (rev 7319) @@ -1,13 +1,13 @@ Source: wesnoth Section: games Priority: optional -Maintainer: Isaac Clerencia [EMAIL PROTECTED] +Maintainer: Debian Games Team [EMAIL PROTECTED] Build-Depends: debhelper (= 5), quilt, libsdl-image1.2-dev, libfreetype6-dev, libsdl-mixer1.2-dev, libsdl-net1.2-dev, libfribidi-dev, libsdl1.2-dev, python-dev (= 2.3), python-support, libboost-iostreams-dev, libboost-test-dev -Standards-Version: 3.7.3 -Uploaders: Cyril Bouthors [EMAIL PROTECTED], Gerfried Fuchs [EMAIL PROTECTED] +Standards-Version: 3.8.0 +Uploaders: Isaac Clerencia [EMAIL PROTECTED], Cyril Bouthors [EMAIL PROTECTED], Gerfried Fuchs [EMAIL PROTECTED] Homepage: http://wesnoth.org/ Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/wesnoth/ Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/wesnoth/?op=log Deleted: packages/trunk/wesnoth/debian/patches/04no-campaign-fix === --- packages/trunk/wesnoth/debian/patches/04no-campaign-fix 2008-06-09 07:56:03 UTC (rev 7318) +++ packages/trunk/wesnoth/debian/patches/04no-campaign-fix 2008-06-09 12:13:10 UTC (rev 7319) @@ -1,20 +0,0 @@ -Author: Eric S. Raymond [EMAIL PROTECTED]vim:ft=diff: -Description: display an error message if no campaign is available - -Index: wesnoth-1.4.2/src/game.cpp -=== wesnoth-1.4.2.orig/src/game.cpp -+++ wesnoth-1.4.2/src/game.cpp -@@ -896,10 +896,11 @@ bool game_controller::new_campaign() - campaign_desc.push_back(std::pairstd::string,std::string(desc,image)); - } - -- dialogs::campaign_preview_pane campaign_preview(disp().video(),campaign_desc); - if(campaign_names.size() = 0) { -+ gui::show_error_message(disp(), _(No campaigns are available.\n)); - return false; - } -+ dialogs::campaign_preview_pane campaign_preview(disp().video(),campaign_desc); - gui::dialog cmenu(disp(), _(Play a campaign), , gui::OK_CANCEL); - cmenu.set_menu(campaign_names); - cmenu.add_pane(campaign_preview); Deleted: packages/trunk/wesnoth/debian/patches/05address-align-for-sparc === --- packages/trunk/wesnoth/debian/patches/05address-align-for-sparc 2008-06-09 07:56:03 UTC (rev 7318) +++ packages/trunk/wesnoth/debian/patches/05address-align-for-sparc 2008-06-09 12:13:10 UTC (rev 7319) @@ -1,23 +0,0 @@ -Author: Mark de Wever [EMAIL PROTECTED] vim:ft=diff: -Description: Fixed an alignement issue which caused a SIGBUS on a Sparc (debian bug #426318). - -Index: wesnoth-1.4.2/src/network_worker.cpp -===
r7320 - packages/trunk/wesnoth/debian
Author: alfie Date: 2008-06-09 12:45:46 + (Mon, 09 Jun 2008) New Revision: 7320 Modified: packages/trunk/wesnoth/debian/README.source Log: Document upstream tarball handling in README.source, too Modified: packages/trunk/wesnoth/debian/README.source === --- packages/trunk/wesnoth/debian/README.source 2008-06-09 12:13:10 UTC (rev 7319) +++ packages/trunk/wesnoth/debian/README.source 2008-06-09 12:45:46 UTC (rev 7320) @@ -1,2 +1,7 @@ This package uses quilt for its patch management, see /usr/share/doc/quilt/README.source if you are unfamiliar with it. + +Upstream ships their tarballs as .tar.bz2 files - which the Debian pool +unfortunately doesn't like (yet). All I do with them is piping them +through bzcat and gzip, like this for e.g. the 1.4.3 release: +bzcat wesnoth-1.4.3.tar.bz2 | gzip --best -c wesnoth_1.4.3.orig.tar.gz ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
[SCM] Packaging for ogre branch, master, updated. upstream/1.4.8.dfsg1-80-g6f20c01
The following commit has been merged in the master branch: commit 6f20c0157dd67385857847f80c3df0eebd69fc55 Author: Andres Mejia [EMAIL PROTECTED] Date: Mon Jun 9 11:32:18 2008 -0400 Started updating ogre's copyright file using proposal from http://wiki.debian.org/Proposals/CopyrightFormat diff --git a/debian/changelog b/debian/changelog index e06f2d4..f2e5b09 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +ogre (1.4.8.dfsg1-2) unstable; urgency=low + + * Fix copyright file. Using proposal found in +http://wiki.debian.org/Proposals/CopyrightFormat. + + -- Andres Mejia [EMAIL PROTECTED] Sun, 08 Jun 2008 23:07:57 -0400 + ogre (1.4.8.dfsg1-1) unstable; urgency=low * New upstream release. diff --git a/debian/copyright b/debian/copyright index 28fc32d..5e03913 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,19 +1,38 @@ -This package was debianized on Mon, 20 Sep 2004 23:04:34 +0200 by: +Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat - Federico Di Gregorio [EMAIL PROTECTED] - Moritz Muehlenhoff [EMAIL PROTECTED] - Christer Stenbrenden [EMAIL PROTECTED] - Andres Mejia [EMAIL PROTECTED] +Upstream-Author: Steve Streeting [EMAIL PROTECTED] + Justin Walsh [EMAIL PROTECTED] + Brian 'praetor' Johnstone [EMAIL PROTECTED] + Assaf Raman [EMAIL PROTECTED] + Thomas Muldowney [EMAIL PROTECTED] + James O'Sullivan [EMAIL PROTECTED] + Wladimir J. van der Laan [EMAIL PROTECTED] -Original sources were downloaded from: +Packaged-By: Federico Di Gregorio [EMAIL PROTECTED] + Moritz Muehlenhoff [EMAIL PROTECTED] + Christer Stenbrenden [EMAIL PROTECTED] + Andres Mejia [EMAIL PROTECTED] - http://www.ogre3d.org/. +Packaged-Date: Mon, 20 Sep 2004 23:04:34 +0200 -Upstream Authors: +Original-Source-Location: http://www.ogre3d.org/ + +Original-Source-Command: ./debian/ogre-get-orig-source + +Files: * +Copyright: Copyright © 2002-2008 by The OGRE Team +License: LGPL-2.1+ + +Files: debian/* +Copyright: Federico Di Gregorio [EMAIL PROTECTED] + Moritz Muehlenhoff [EMAIL PROTECTED] + Christer Stenbrenden [EMAIL PROTECTED] + Andres Mejia [EMAIL PROTECTED] +License: LGPL-2.1+ + +Files: Mac/Ogre/include/macBundlePath.h, Mac/Ogre/include/macPlugins.h, + Mac/Ogre/src/macPlugins.cpp - Steve Streeting - Adrian Cearnau - Thomas Muldowney Copyright: -- Packaging for ogre ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
r7323 - packages/trunk/pegsolitaire/debian
Author: goneri Date: 2008-06-09 19:11:51 + (Mon, 09 Jun 2008) New Revision: 7323 Modified: packages/trunk/pegsolitaire/debian/control Log: add Vcs-* fields Modified: packages/trunk/pegsolitaire/debian/control === --- packages/trunk/pegsolitaire/debian/control 2008-06-09 18:59:50 UTC (rev 7322) +++ packages/trunk/pegsolitaire/debian/control 2008-06-09 19:11:51 UTC (rev 7323) @@ -6,6 +6,8 @@ Build-Depends: debhelper (= 5.0.0), autotools-dev, pkg-config, libgnome2-dev, libxml-parser-perl, libgnomeui-dev, libglade2-dev Standards-Version: 3.7.3 Homepage: http://www.asselstine.com/pegsolitaire/ +Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/pegsolitaire/ +Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/pegsolitaire/?op=log Package: pegsolitaire Architecture: any ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
r7324 - packages/tags/wesnoth
Author: alfie Date: 2008-06-09 20:05:35 + (Mon, 09 Jun 2008) New Revision: 7324 Added: packages/tags/wesnoth/1.4.3-1/ Log: Release 1.4.3-1 Copied: packages/tags/wesnoth/1.4.3-1 (from rev 7323, packages/trunk/wesnoth) ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
r7325 - packages/tags/wesnoth
Author: alfie Date: 2008-06-09 20:08:07 + (Mon, 09 Jun 2008) New Revision: 7325 Removed: packages/tags/wesnoth/1.4.3-1/ Log: Wrongly commited ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
r7327 - packages/tags/wesnoth
Author: alfie Date: 2008-06-09 20:13:01 + (Mon, 09 Jun 2008) New Revision: 7327 Added: packages/tags/wesnoth/1.4.3-1/ Log: Release 1.4.3-1 Copied: packages/tags/wesnoth/1.4.3-1 (from rev 7326, packages/trunk/wesnoth) ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
[SCM] A client for connecting to 3D metaverses such as Linden Labs Secondlife(tm) and OpenSim grids branch, master, updated. upstream/1.20.8-16-g79a8c8e
The following commit has been merged in the master branch: commit b74cfab6c48937b17012ddd7f0b070f2b740703e Merge: b37efee7284f723e634150a0f59bcd785ebd869c 03d41ac184c99f784e58d16fbec9c5ece6080cbe Author: Robin Cornelius [EMAIL PROTECTED] Date: Mon Jun 9 19:40:53 2008 +0100 Merge branch 'upstream' diff --combined indra/SConstruct index bfc30aa,9353317..af14c93 --- a/indra/SConstruct +++ b/indra/SConstruct @@@ -163,9 -163,6 +163,9 @@@ standalone_net_pkgs = 'libssl', ] +if enable_gstreamer: +standalone_pkgs.append( 'gstreamer-0.10' ) + def pkgconfig(opt, pkgs=None): if pkgs is None: pkgs = standalone_pkgs + standalone_net_pkgs @@@ -180,8 -177,6 +180,8 @@@ if standalone 'packages: %s' % ' '.join(missing)) sys.exit(2) + + # # ITERATE TARGETS # # @@@ -213,7 -208,7 +213,7 @@@ for build_target in targets try: build_dir_prefix = os.environ['TEMP_BUILD_DIR'] except: -build_dir_prefix = '/tmp/' + os.environ['USER'] +build_dir_prefix = '/tmp/' build_dir = build_dir_prefix + os.getcwd() + '/' + system_str + '-' + build_target + '-' + buildtype @@@ -354,7 -349,7 +354,7 @@@ strip_cmd = '/opt/crosstool/gcc-4.0.2-glibc-2.3.6/x86_64-unknown-linux-gnu/x86_64-unknown-linux-gnu/bin/strip -S -o $TARGET $SOURCE' else: - gcc_bin = 'g++-3.4' + gcc_bin = 'g++-4.1' # Are we using the Intel compiler? if gcc_bin.find('icpc') = 0: @@@ -375,8 -370,8 +375,8 @@@ releasenoopt_cflags = cflags + '-O0 ' releasenoopt_cxxflags = cxxflags + '-O0 ' releasenoopt_cppflags = cppflags + '-DNDEBUG -DLL_RELEASE=1 ' - releasefordownload_cflags = cflags + '-O2 ' - releasefordownload_cxxflags = cxxflags + '-O2 ' + releasefordownload_cflags = cflags + '-O2 -fno-stack-protector ' + releasefordownload_cxxflags = cxxflags + '-O2 -fno-stack-protector ' releasefordownload_cppflags = cppflags + '-DNDEBUG -DLL_RELEASE=1 -DLL_RELEASE_FOR_DOWNLOAD=1 ' @@@ -481,6 -476,7 +481,7 @@@ env['ENV']['DISTCC_HOSTS'] = hosts env['ENV']['USER'] = os.environ['USER'] env['ENV']['HOME'] = os.environ['HOME'] + #env['ENV']['SSH_AUTH_SOCK'] = os.environ['SSH_AUTH_SOCK'] if enable_colorgcc: env['ENV']['PATH'] = os.environ['PATH'] -- A client for connecting to 3D metaverses such as Linden Labs Secondlife(tm) and OpenSim grids ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
[SCM] A client for connecting to 3D metaverses such as Linden Labs Secondlife(tm) and OpenSim grids branch, master, updated. upstream/1.20.8-16-g79a8c8e
The following commit has been merged in the master branch: commit 8a560fb687312f0db12386ee693f70d8b14b2276 Author: Robin Cornelius [EMAIL PROTECTED] Date: Mon Jun 9 19:41:50 2008 +0100 Correct my email address diff --git a/debian/changelog b/debian/changelog index fa38a9e..c2723c2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +omvviewer (1.20.9-1) experimental; urgency=low + + * New Upstream Version + + -- Robin Cornelius [EMAIL PROTECTED] Mon, 09 Jun 2008 19:40:54 +0100 + omvviewer (1.20.8-1) experimental; urgency=low * New Upstream Version -- A client for connecting to 3D metaverses such as Linden Labs Secondlife(tm) and OpenSim grids ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
[SCM] A client for connecting to 3D metaverses such as Linden Labs Secondlife(tm) and OpenSim grids branch, master, updated. upstream/1.20.8-16-g79a8c8e
The following commit has been merged in the master branch: commit 79a8c8ee0be962b2fe114bb399ed7b9898cc44aa Author: Robin Cornelius [EMAIL PROTECTED] Date: Mon Jun 9 19:47:04 2008 +0100 Add texture cache patch diff --git a/debian/patches/_no_texture_cache_madness.dpatch b/debian/patches/_no_texture_cache_madness.dpatch new file mode 100755 index 000..b8cd7b3 --- /dev/null +++ b/debian/patches/_no_texture_cache_madness.dpatch @@ -0,0 +1,80 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## Less texture cache madness.dpatch by [EMAIL PROTECTED] +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + [EMAIL PROTECTED]@ + +diff --git a/indra/newview/lltexturecache.cpp b/indra/newview/lltexturecache.cpp +index 8240f77..b2bd12c 100644 +--- a/indra/newview/lltexturecache.cpp b/indra/newview/lltexturecache.cpp +@@ -477,12 +477,36 @@ bool LLTextureCacheRemoteWorker::doRead() + } + } + #else ++ std::string filename = mCache-getTextureFileName(mID); ++ S32 filesize = ll_apr_file_size(filename+.j2c, mCache-getFileAPRPool()); ++ if(filesize==0) ++ { ++ mDataSize = -1; ++ return true; ++ } ++ ++ mReadData = new U8[mBytesToRead]; ++ ++ S32 bytes_read = ll_apr_file_read_ex(filename+.j2c, mCache-getFileAPRPool(), mReadData, 0, mDataSize); ++ ++ if (bytes_read != mDataSize) ++ { ++ llwarns LLTextureCacheWorker:mID ++incorrect number of bytes read from header: bytes_read ++/ mDataSize llendl; ++ mDataSize = -1; // failed ++ return true; ++ } ++ ++ return true; ++ ++ + llassert_always(idx = 0); + llassert_always(mOffset TEXTURE_CACHE_ENTRY_SIZE); + S32 offset = idx * TEXTURE_CACHE_ENTRY_SIZE + mOffset; + S32 size = TEXTURE_CACHE_ENTRY_SIZE - mOffset; + mReadData = new U8[size]; +- S32 bytes_read = ll_apr_file_read_ex(mCache-mHeaderDataFileName, mCache-getFileAPRPool(), ++ bytes_read = ll_apr_file_read_ex(mCache-mHeaderDataFileName, mCache-getFileAPRPool(), + mReadData, offset, size); + if (bytes_read != size) + { +@@ -617,6 +641,19 @@ bool LLTextureCacheRemoteWorker::doWrite() + S32 idx = -1; + + // No LOCAL state for write() ++ ++ std::string filename = mCache-getTextureFileName(mID); ++ ++ S32 bytes_written = ll_apr_file_write_ex(filename+.j2c, mCache-getFileAPRPool(), mWriteData, 0, mDataSize); ++ ++ if (bytes_written = 0) ++ { ++ llwarns LLTextureCacheWorker: missing entry: mID llendl; ++ mDataSize = -1; // failed ++ return true; ++ } ++ ++ return true; + + if (mState == INIT) + { +@@ -696,6 +733,9 @@ bool LLTextureCacheRemoteWorker::doWrite() + S32 bytes_written = ll_apr_file_write_ex(mCache-mHeaderDataFileName, mCache-getFileAPRPool(), + mWriteData, offset, size); + ++ ++ ++ + if (bytes_written = 0) + { + llwarns LLTextureCacheWorker: missing entry: mID llendl; diff --git a/debian/patches/00list b/debian/patches/00list index a0a9136..d0c7088 100644 --- a/debian/patches/00list +++ b/debian/patches/00list @@ -96,3 +96,4 @@ VWR-1815_top_corner_fix.dpatch VWR-5697_fix_startup_paths.dpatch VWR-7271_fix_mutlist_for_amd64.dpatch _valgrind_wild_vars.dpatch +_no_texture_cache_madness.dpatch -- A client for connecting to 3D metaverses such as Linden Labs Secondlife(tm) and OpenSim grids ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
[SCM] A client for connecting to 3D metaverses such as Linden Labs Secondlife(tm) and OpenSim grids branch, pristine-tar, updated. 31863afed75fb04c9f1b3ff17c0d61a2975027b2
The following commit has been merged in the pristine-tar branch: commit 31863afed75fb04c9f1b3ff17c0d61a2975027b2 Author: Robin Cornelius [EMAIL PROTECTED] Date: Mon Jun 9 19:40:52 2008 +0100 pristine-tar data for slviewer-src-Branch_1-20-9-Viewer-2-r88980.tar.gz diff --git a/slviewer-src-Branch_1-20-9-Viewer-2-r88980.tar.gz.delta b/slviewer-src-Branch_1-20-9-Viewer-2-r88980.tar.gz.delta new file mode 100644 index 000..2400e2a Binary files /dev/null and b/slviewer-src-Branch_1-20-9-Viewer-2-r88980.tar.gz.delta differ diff --git a/slviewer-src-Branch_1-20-9-Viewer-2-r88980.tar.gz.id b/slviewer-src-Branch_1-20-9-Viewer-2-r88980.tar.gz.id new file mode 100644 index 000..6e0245d --- /dev/null +++ b/slviewer-src-Branch_1-20-9-Viewer-2-r88980.tar.gz.id @@ -0,0 +1 @@ +03d41ac184c99f784e58d16fbec9c5ece6080cbe -- A client for connecting to 3D metaverses such as Linden Labs Secondlife(tm) and OpenSim grids ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits