Revision: 7927
http://playerstage.svn.sourceforge.net/playerstage/?rev=7927&view=rev
Author: thjc
Date: 2009-06-29 08:17:13 +0000 (Mon, 29 Jun 2009)
Log Message:
-----------
update of packaging for player 3.0 with cmake builds and so on
Modified Paths:
--------------
packages/debian/player/debian/changelog
packages/debian/player/debian/compat
packages/debian/player/debian/control
packages/debian/player/debian/docs
packages/debian/player/debian/liblodo0-dev.install
packages/debian/player/debian/libpmap0-dev.install
packages/debian/player/debian/patches/series
packages/debian/player/debian/python-playerc.install
packages/debian/player/debian/robot-player.install
packages/debian/player/debian/rules
Added Paths:
-----------
packages/debian/player/debian/libplayerc++3-dev.install
packages/debian/player/debian/libplayerc++3.install
packages/debian/player/debian/libplayerc3-dev.install
packages/debian/player/debian/libplayerc3.install
packages/debian/player/debian/libplayercore3-dev.install
packages/debian/player/debian/libplayercore3.install
packages/debian/player/debian/libplayerdrivers3-dev.install
packages/debian/player/debian/libplayerdrivers3.install
packages/debian/player/debian/libplayererror3-dev.install
packages/debian/player/debian/libplayererror3.install
packages/debian/player/debian/libplayertcp3-dev.install
packages/debian/player/debian/libplayertcp3.install
packages/debian/player/debian/libplayerutils3-dev.install
packages/debian/player/debian/libplayerutils3.install
packages/debian/player/debian/libplayerxdr3-dev.install
packages/debian/player/debian/libplayerxdr3.install
packages/debian/player/debian/ruby-playerc.install
Removed Paths:
-------------
packages/debian/player/debian/libplayerc++2-dev.install
packages/debian/player/debian/libplayerc++2.install
packages/debian/player/debian/libplayerc2-dev.install
packages/debian/player/debian/libplayerc2.install
packages/debian/player/debian/libplayercore2-dev.install
packages/debian/player/debian/libplayercore2.install
packages/debian/player/debian/libplayerdrivers2-dev.install
packages/debian/player/debian/libplayerdrivers2.install
packages/debian/player/debian/libplayererror2-dev.install
packages/debian/player/debian/libplayererror2.install
packages/debian/player/debian/libplayerjpeg2-dev.install
packages/debian/player/debian/libplayerjpeg2.install
packages/debian/player/debian/libplayertcp2-dev.install
packages/debian/player/debian/libplayertcp2.install
packages/debian/player/debian/libplayerxdr2-dev.install
packages/debian/player/debian/libplayerxdr2.install
packages/debian/player/debian/patches/python2.6_transition.patch
Modified: packages/debian/player/debian/changelog
===================================================================
--- packages/debian/player/debian/changelog 2009-06-28 14:57:35 UTC (rev
7926)
+++ packages/debian/player/debian/changelog 2009-06-29 08:17:13 UTC (rev
7927)
@@ -1,3 +1,15 @@
+player (3.0.0+svn7926-1~ppa5) karmic; urgency=low
+
+ * change in how we manipulate the robot- names
+
+ -- Toby Collett <[email protected]> Mon, 29 Jun 2009 08:35:27 +0200
+
+player (3.0.0+svn7926-1~ppa1) karmic; urgency=low
+
+ * new upstream release
+
+ -- Toby Collett <[email protected]> Thu, 25 Jun 2009 16:05:31 +0200
+
player (2.0.4-3.3ubuntu3) jaunty; urgency=low
* debian/python-playerc.install: changed site-package to dist-package
Modified: packages/debian/player/debian/compat
===================================================================
--- packages/debian/player/debian/compat 2009-06-28 14:57:35 UTC (rev
7926)
+++ packages/debian/player/debian/compat 2009-06-29 08:17:13 UTC (rev
7927)
@@ -1 +1 @@
-5
+7
Modified: packages/debian/player/debian/control
===================================================================
--- packages/debian/player/debian/control 2009-06-28 14:57:35 UTC (rev
7926)
+++ packages/debian/player/debian/control 2009-06-29 08:17:13 UTC (rev
7927)
@@ -3,9 +3,9 @@
Priority: extra
Maintainer: Ubuntu MOTU Developers <[email protected]>
XSBC-Original-Maintainer: Michael Janssen <[email protected]>
-Build-Depends: debhelper (>= 5), autotools-dev, libmagick++9-dev, libgsl0-dev,
libcv-dev, libhighgui-dev, libgtk2.0-dev, libdc1394-22-dev | libdc1394-dev,
libboost-signals-dev, libboost-thread-dev, swig, libjpeg62-dev, python-central
(>= 0.5), doxygen, linux-kernel-headers, libgnomecanvas2-dev, python-dev,
freeglut3-dev, libvorbis-dev, libtheora-dev, quilt
+Build-Depends: cdbs, debhelper (>= 7), cmake, libmagick++9-dev, libgsl0-dev,
libcv-dev, libhighgui-dev, libgtk2.0-dev, libdc1394-22-dev | libdc1394-dev,
libboost-signals-dev, libboost-thread-dev, swig, libjpeg62-dev, python-central
(>= 0.5), doxygen, linux-kernel-headers, libgnomecanvas2-dev, python-dev,
freeglut3-dev, libvorbis-dev, libtheora-dev, libgeos-dev, ruby, ruby-dev,
libpqxx-dev, libxmu-dev
XS-Python-Version: all
-Standards-Version: 3.7.2
+Standards-Version: 3.8.0
Homepage: http://playerstage.sourceforge.net/
Package: robot-player
@@ -25,6 +25,7 @@
Package: robot-player-doc
Section: doc
Architecture: all
+Depends: ${misc:Depends}
Homepage: http://playerstage.sourceforge.net/
Description: Networked server for robots and sensors (documentation)
Player provides a common interface to a variety of robot and
@@ -35,7 +36,7 @@
Package: robot-player-dev
Architecture: all
-Depends: libplayertcp2-dev, libplayerc++2-dev, libplayerdrivers2-dev
+Depends: libplayertcp3-dev, libplayerc++3-dev, libplayerdrivers3-dev,
${misc:Depends}
Homepage: http://playerstage.sourceforge.net/
Description: Networked server for robots and sensors - development package
Player proovides a common interface to a variety of robot and
@@ -43,7 +44,7 @@
written in many programming languages. This package provides an easy way
to install all the development libraries at once by depending on them.
-Package: libplayererror2
+Package: libplayererror3
Section: libs
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -58,12 +59,12 @@
.
This package contains shared functions for error handling.
-Package: libplayererror2-dev
+Package: libplayererror3-dev
Provides: libplayererror-dev
Conflicts: libplayererror-dev
Section: libdevel
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libplayererror2
+Depends: ${shlibs:Depends}, ${misc:Depends}, libplayererror3
Homepage: http://playerstage.sourceforge.net/
Description: Networked server for robots and sensors - error handling
development files
Provides a network interface to a variety of robot and sensor
@@ -76,7 +77,7 @@
This package contains the development files for error handling.
-Package: libplayercore2
+Package: libplayercore3
Section: libs
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -93,12 +94,12 @@
devices supported by Player and the interfaces which are defined, including
the messages and queues in which messages are stored.
-Package: libplayercore2-dev
+Package: libplayercore3-dev
Provides: libplayercore-dev
Conflicts: libplayercore-dev
Section: libdevel
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libplayercore2,
libplayererror2-dev
+Depends: ${shlibs:Depends}, ${misc:Depends}, libplayercore3,
libplayererror3-dev
Homepage: http://playerstage.sourceforge.net/
Description: Networked server for robots and sensors - core library
development files
Provides a network interface to a variety of robot and sensor
@@ -113,7 +114,7 @@
interfaces which are defined, including the messages and queues in which
messages are stored.
-Package: libplayertcp2
+Package: libplayertcp3
Section: libs
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -129,12 +130,12 @@
This package contains the library which moves messages from Player
message queues to the TCP socket, and vice-versa.
-Package: libplayertcp2-dev
+Package: libplayertcp3-dev
Provides: libplayertcp-dev
Conflicts: libplayertcp-dev
Section: libdevel
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libplayertcp2,
libplayercore2-dev, libplayerxdr2-dev
+Depends: ${shlibs:Depends}, ${misc:Depends}, libplayertcp3,
libplayercore3-dev, libplayerxdr3-dev
Homepage: http://playerstage.sourceforge.net/
Description: Networked server for robots and sensors - core library
development files
Provides a network interface to a variety of robot and sensor
@@ -147,7 +148,7 @@
This package contains the development files for using the library which moves
messages from Player message queues to the TCP socket, and vice-versa.
-Package: libplayerxdr2
+Package: libplayerxdr3
Section: libs
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -164,12 +165,12 @@
to XDR representations. It marshalls and demarshalls common structures used
in Player.
-Package: libplayerxdr2-dev
+Package: libplayerxdr3-dev
Provides: libplayerxdr-dev
Conflicts: libplayerxdr-dev
Section: libdevel
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libplayerxdr2,
libplayererror2-dev, python
+Depends: ${shlibs:Depends}, ${misc:Depends}, libplayerxdr3,
libplayererror3-dev, python
Homepage: http://playerstage.sourceforge.net/
Description: Networked server for robots and sensors - xdr library development
files
Provides a network interface to a variety of robot and sensor
@@ -183,7 +184,7 @@
player structs to XDR representations. It marshalls and demarshalls common
structures used in Player.
-Package: libplayerc2
+Package: libplayerc3
Section: libs
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -198,12 +199,12 @@
.
This package contains the C library for interface to Player servers.
-Package: libplayerc2-dev
+Package: libplayerc3-dev
Provides: libplayerc-dev
Conflicts: libplayerc-dev
Section: libdevel
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libplayerc2, libplayerxdr2-dev
+Depends: ${shlibs:Depends}, ${misc:Depends}, libplayerc3, libplayerxdr3-dev
Homepage: http://playerstage.sourceforge.net/
Description: Networked server for robots and sensors - C client library
development files
Provides a network interface to a variety of robot and sensor
@@ -215,7 +216,7 @@
.
This package contains the files required to utilize the C client library
-Package: libplayerc++2
+Package: libplayerc++3
Section: libs
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -230,12 +231,12 @@
.
This package contains the C++ library for interface to Player servers.
-Package: libplayerc++2-dev
+Package: libplayerc++3-dev
Provides: libplayerc++-dev
Conflicts: libplayerc++-dev
Section: libdevel
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libplayerc++2, libplayerc2-dev,
libboost-thread-dev, libboost-signals-dev
+Depends: ${shlibs:Depends}, ${misc:Depends}, libplayerc++3, libplayerc3-dev,
libboost-thread-dev, libboost-signals-dev
Homepage: http://playerstage.sourceforge.net/
Description: Networked server for robots and sensors - C++ client library
development files
Provides a network interface to a variety of robot and sensor
@@ -247,7 +248,7 @@
.
This package contains the files required to utilize the C++ client library
-Package: libplayerdrivers2
+Package: libplayerutils3
Section: libs
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -260,15 +261,17 @@
concurrent client connections to devices, creating new possibilities
for distributed and collaborative sensing and control.
.
- This package contains drivers required to run hardware available through
- the Player server.
+ This package contains general player utility libraries including:
+ - libplayerutils
+ - libplayerjpeg
+ - libplayerwkb
-Package: libplayerdrivers2-dev
-Provides: libplayerdrivers-dev
-Conflicts: libplayerdrivers-dev
+Package: libplayerutils3-dev
+Provides: libplayerutils-dev
+Conflicts: libplayerutils-dev
Section: libdevel
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libplayerdrivers2,
libplayercore2-dev, libplayerjpeg2-dev, libcv-dev, libcvaux-dev, libgsl0-dev,
libdc1394-22-dev | libdc1394-dev, libhighgui-dev
+Depends: ${shlibs:Depends}, ${misc:Depends}
Homepage: http://playerstage.sourceforge.net/
Description: Networked server for robots and sensors - hardware drivers
development files
Provides a network interface to a variety of robot and sensor
@@ -278,15 +281,21 @@
concurrent client connections to devices, creating new possibilities
for distributed and collaborative sensing and control.
.
+ This package contains development files for general player utility libs
+ including:
+ - libplayerutils
+ - libplayerjpeg
+ - libplayerwkb
This package contains the development files required to interface new
hardware to the Player server.
-Package: libplayerjpeg2
+
+Package: libplayerdrivers3
Section: libs
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Homepage: http://playerstage.sourceforge.net/
-Description: Networked server for robots and sensors - jpeg library
+Description: Networked server for robots and sensors - hardware drivers library
Provides a network interface to a variety of robot and sensor
hardware. Player's client/server model allows robot control programs
to be written in any programming language and to run on any computer
@@ -294,16 +303,17 @@
concurrent client connections to devices, creating new possibilities
for distributed and collaborative sensing and control.
.
- This package contains utility functions for handling jpeg compression.
+ This package contains drivers required to run hardware available through
+ the Player server.
-Package: libplayerjpeg2-dev
-Provides: libplayerjpeg-dev
-Conflicts: libplayerjpeg-dev
+Package: libplayerdrivers3-dev
+Provides: libplayerdrivers-dev
+Conflicts: libplayerdrivers-dev
Section: libdevel
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libplayerjpeg2, libjpeg62-dev
+Depends: ${shlibs:Depends}, ${misc:Depends}, libplayerdrivers3,
libplayercore3-dev, libplayerutils3-dev, libcv-dev, libcvaux-dev, libgsl0-dev,
libdc1394-22-dev | libdc1394-dev, libhighgui-dev
Homepage: http://playerstage.sourceforge.net/
-Description: Networked server for robots and sensors - jpeg library
development files
+Description: Networked server for robots and sensors - hardware drivers
development files
Provides a network interface to a variety of robot and sensor
hardware. Player's client/server model allows robot control programs
to be written in any programming language and to run on any computer
@@ -311,14 +321,14 @@
concurrent client connections to devices, creating new possibilities
for distributed and collaborative sensing and control.
.
- This package contains the development files for the utility functions
- handling jpeg compression.
+ This package contains the development files required to interface new
+ hardware to the Player server.
Package: python-playerc
Provides: ${python:Provides}
Section: python
Architecture: any
-Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:depends}
+Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}
XB-Python-Version: ${python:Versions}
Homepage: http://playerstage.sourceforge.net/
Description: Networked server for robots and sensors - Python wrapper
@@ -331,6 +341,23 @@
.
This package contains the Python wrapper module.
+Package: ruby-playerc
+Provides: ${ruby:Provides}
+Section: ruby
+Architecture: any
+Depends: ${ruby:Depends}, ${shlibs:Depends}, ${misc:Depends}
+XB-Ruby-Version: ${ruby:Versions}
+Homepage: http://playerstage.sourceforge.net/
+Description: Networked server for robots and sensors - Python wrapper
+ Provides a network interface to a variety of robot and sensor
+ hardware. Player's client/server model allows robot control programs
+ to be written in any programming language and to run on any computer
+ with a network connection to th e robot. Player supports multiple
+ concurrent client connections to devices, creating new possibilities
+ for distributed and collaborative sensing and control.
+ .
+ This package contains the Ruby wrapper module.
+
Package: libpmap0
Section: libs
Architecture: any
Modified: packages/debian/player/debian/docs
===================================================================
--- packages/debian/player/debian/docs 2009-06-28 14:57:35 UTC (rev 7926)
+++ packages/debian/player/debian/docs 2009-06-29 08:17:13 UTC (rev 7927)
@@ -1,3 +1,2 @@
-NEWS
README
TODO
Modified: packages/debian/player/debian/liblodo0-dev.install
===================================================================
--- packages/debian/player/debian/liblodo0-dev.install 2009-06-28 14:57:35 UTC
(rev 7926)
+++ packages/debian/player/debian/liblodo0-dev.install 2009-06-29 08:17:13 UTC
(rev 7927)
@@ -1,4 +1,2 @@
usr/lib/liblodo.so
-usr/lib/liblodo.a
-usr/lib/liblodo.la
-usr/include/player-2.0/pmap/lodo.h
+usr/include/player-3.0/libpmap/lodo.h
Deleted: packages/debian/player/debian/libplayerc++2-dev.install
===================================================================
--- packages/debian/player/debian/libplayerc++2-dev.install 2009-06-28
14:57:35 UTC (rev 7926)
+++ packages/debian/player/debian/libplayerc++2-dev.install 2009-06-29
08:17:13 UTC (rev 7927)
@@ -1,6 +0,0 @@
-usr/lib/libplayerc++.so
-usr/include/player-2.0/libplayerc++
-usr/lib/pkgconfig/playerc++.pc
-usr/lib/libplayerc++.la
-usr/lib/libplayerc++.a
-
Deleted: packages/debian/player/debian/libplayerc++2.install
===================================================================
--- packages/debian/player/debian/libplayerc++2.install 2009-06-28 14:57:35 UTC
(rev 7926)
+++ packages/debian/player/debian/libplayerc++2.install 2009-06-29 08:17:13 UTC
(rev 7927)
@@ -1 +0,0 @@
-usr/lib/libplayerc++.so.*
Copied: packages/debian/player/debian/libplayerc++3-dev.install (from rev 7900,
packages/debian/player/debian/libplayerc++2-dev.install)
===================================================================
--- packages/debian/player/debian/libplayerc++3-dev.install
(rev 0)
+++ packages/debian/player/debian/libplayerc++3-dev.install 2009-06-29
08:17:13 UTC (rev 7927)
@@ -0,0 +1,5 @@
+usr/lib/libplayerc++.so
+usr/include/player-3.0/libplayerc++
+usr/lib/pkgconfig/playerc++.pc
+
+
Property changes on: packages/debian/player/debian/libplayerc++3-dev.install
___________________________________________________________________
Added: svn:mergeinfo
+
Copied: packages/debian/player/debian/libplayerc++3.install (from rev 7900,
packages/debian/player/debian/libplayerc++2.install)
===================================================================
--- packages/debian/player/debian/libplayerc++3.install
(rev 0)
+++ packages/debian/player/debian/libplayerc++3.install 2009-06-29 08:17:13 UTC
(rev 7927)
@@ -0,0 +1 @@
+usr/lib/libplayerc++.so.*
Property changes on: packages/debian/player/debian/libplayerc++3.install
___________________________________________________________________
Added: svn:mergeinfo
+
Deleted: packages/debian/player/debian/libplayerc2-dev.install
===================================================================
--- packages/debian/player/debian/libplayerc2-dev.install 2009-06-28
14:57:35 UTC (rev 7926)
+++ packages/debian/player/debian/libplayerc2-dev.install 2009-06-29
08:17:13 UTC (rev 7927)
@@ -1,5 +0,0 @@
-usr/lib/libplayerc.so
-usr/include/player-2.0/libplayerc
-usr/lib/pkgconfig/playerc.pc
-usr/lib/libplayerc.la
-usr/lib/libplayerc.a
Deleted: packages/debian/player/debian/libplayerc2.install
===================================================================
--- packages/debian/player/debian/libplayerc2.install 2009-06-28 14:57:35 UTC
(rev 7926)
+++ packages/debian/player/debian/libplayerc2.install 2009-06-29 08:17:13 UTC
(rev 7927)
@@ -1 +0,0 @@
-usr/lib/libplayerc.so.*
Copied: packages/debian/player/debian/libplayerc3-dev.install (from rev 7900,
packages/debian/player/debian/libplayerc2-dev.install)
===================================================================
--- packages/debian/player/debian/libplayerc3-dev.install
(rev 0)
+++ packages/debian/player/debian/libplayerc3-dev.install 2009-06-29
08:17:13 UTC (rev 7927)
@@ -0,0 +1,4 @@
+usr/lib/libplayerc.so
+usr/include/player-3.0/libplayerc
+usr/lib/pkgconfig/playerc.pc
+
Property changes on: packages/debian/player/debian/libplayerc3-dev.install
___________________________________________________________________
Added: svn:mergeinfo
+
Copied: packages/debian/player/debian/libplayerc3.install (from rev 7900,
packages/debian/player/debian/libplayerc2.install)
===================================================================
--- packages/debian/player/debian/libplayerc3.install
(rev 0)
+++ packages/debian/player/debian/libplayerc3.install 2009-06-29 08:17:13 UTC
(rev 7927)
@@ -0,0 +1 @@
+usr/lib/libplayerc.so.*
Property changes on: packages/debian/player/debian/libplayerc3.install
___________________________________________________________________
Added: svn:mergeinfo
+
Deleted: packages/debian/player/debian/libplayercore2-dev.install
===================================================================
--- packages/debian/player/debian/libplayercore2-dev.install 2009-06-28
14:57:35 UTC (rev 7926)
+++ packages/debian/player/debian/libplayercore2-dev.install 2009-06-29
08:17:13 UTC (rev 7927)
@@ -1,5 +0,0 @@
-usr/lib/libplayercore.so
-usr/lib/libplayercore.a
-usr/lib/libplayercore.la
-usr/include/player-2.0/libplayercore/[a-df-zA-Z]*
-usr/lib/pkgconfig/playercore.pc
Deleted: packages/debian/player/debian/libplayercore2.install
===================================================================
--- packages/debian/player/debian/libplayercore2.install 2009-06-28
14:57:35 UTC (rev 7926)
+++ packages/debian/player/debian/libplayercore2.install 2009-06-29
08:17:13 UTC (rev 7927)
@@ -1 +0,0 @@
-usr/lib/libplayercore.so.*
Copied: packages/debian/player/debian/libplayercore3-dev.install (from rev
7900, packages/debian/player/debian/libplayercore2-dev.install)
===================================================================
--- packages/debian/player/debian/libplayercore3-dev.install
(rev 0)
+++ packages/debian/player/debian/libplayercore3-dev.install 2009-06-29
08:17:13 UTC (rev 7927)
@@ -0,0 +1,3 @@
+usr/lib/libplayercore.so
+usr/include/player-3.0/libplayercore/[a-df-zA-Z]*
+usr/lib/pkgconfig/playercore.pc
Property changes on: packages/debian/player/debian/libplayercore3-dev.install
___________________________________________________________________
Added: svn:mergeinfo
+
Copied: packages/debian/player/debian/libplayercore3.install (from rev 7900,
packages/debian/player/debian/libplayercore2.install)
===================================================================
--- packages/debian/player/debian/libplayercore3.install
(rev 0)
+++ packages/debian/player/debian/libplayercore3.install 2009-06-29
08:17:13 UTC (rev 7927)
@@ -0,0 +1 @@
+usr/lib/libplayercore.so.*
Property changes on: packages/debian/player/debian/libplayercore3.install
___________________________________________________________________
Added: svn:mergeinfo
+
Deleted: packages/debian/player/debian/libplayerdrivers2-dev.install
===================================================================
--- packages/debian/player/debian/libplayerdrivers2-dev.install 2009-06-28
14:57:35 UTC (rev 7926)
+++ packages/debian/player/debian/libplayerdrivers2-dev.install 2009-06-29
08:17:13 UTC (rev 7927)
@@ -1,5 +0,0 @@
-usr/lib/libplayerdrivers.so
-usr/lib/libplayerdrivers.a
-usr/lib/libplayerdrivers.la
-usr/lib/pkgconfig/playerdrivers.pc
-usr/include/player-2.0/libplayerdrivers
Deleted: packages/debian/player/debian/libplayerdrivers2.install
===================================================================
--- packages/debian/player/debian/libplayerdrivers2.install 2009-06-28
14:57:35 UTC (rev 7926)
+++ packages/debian/player/debian/libplayerdrivers2.install 2009-06-29
08:17:13 UTC (rev 7927)
@@ -1 +0,0 @@
-usr/lib/libplayerdrivers.so.*
Copied: packages/debian/player/debian/libplayerdrivers3-dev.install (from rev
7900, packages/debian/player/debian/libplayerdrivers2-dev.install)
===================================================================
--- packages/debian/player/debian/libplayerdrivers3-dev.install
(rev 0)
+++ packages/debian/player/debian/libplayerdrivers3-dev.install 2009-06-29
08:17:13 UTC (rev 7927)
@@ -0,0 +1,3 @@
+usr/lib/libplayerdrivers.so
+usr/lib/pkgconfig/playerdrivers.pc
+usr/include/player-3.0/libplayerdrivers
Property changes on: packages/debian/player/debian/libplayerdrivers3-dev.install
___________________________________________________________________
Added: svn:mergeinfo
+
Copied: packages/debian/player/debian/libplayerdrivers3.install (from rev 7900,
packages/debian/player/debian/libplayerdrivers2.install)
===================================================================
--- packages/debian/player/debian/libplayerdrivers3.install
(rev 0)
+++ packages/debian/player/debian/libplayerdrivers3.install 2009-06-29
08:17:13 UTC (rev 7927)
@@ -0,0 +1 @@
+usr/lib/libplayerdrivers.so.*
Property changes on: packages/debian/player/debian/libplayerdrivers3.install
___________________________________________________________________
Added: svn:mergeinfo
+
Deleted: packages/debian/player/debian/libplayererror2-dev.install
===================================================================
--- packages/debian/player/debian/libplayererror2-dev.install 2009-06-28
14:57:35 UTC (rev 7926)
+++ packages/debian/player/debian/libplayererror2-dev.install 2009-06-29
08:17:13 UTC (rev 7927)
@@ -1,5 +0,0 @@
-usr/lib/libplayererror.so
-usr/lib/libplayererror.a
-usr/lib/libplayererror.la
-usr/lib/pkgconfig/playererror.pc
-usr/include/player-2.0/libplayercore/error.h
Deleted: packages/debian/player/debian/libplayererror2.install
===================================================================
--- packages/debian/player/debian/libplayererror2.install 2009-06-28
14:57:35 UTC (rev 7926)
+++ packages/debian/player/debian/libplayererror2.install 2009-06-29
08:17:13 UTC (rev 7927)
@@ -1 +0,0 @@
-usr/lib/libplayererror.so.*
Copied: packages/debian/player/debian/libplayererror3-dev.install (from rev
7900, packages/debian/player/debian/libplayererror2-dev.install)
===================================================================
--- packages/debian/player/debian/libplayererror3-dev.install
(rev 0)
+++ packages/debian/player/debian/libplayererror3-dev.install 2009-06-29
08:17:13 UTC (rev 7927)
@@ -0,0 +1,3 @@
+usr/lib/libplayererror.so
+usr/lib/pkgconfig/playererror.pc
+usr/include/player-3.0/libplayercore/error.h
Property changes on: packages/debian/player/debian/libplayererror3-dev.install
___________________________________________________________________
Added: svn:mergeinfo
+
Copied: packages/debian/player/debian/libplayererror3.install (from rev 7900,
packages/debian/player/debian/libplayererror2.install)
===================================================================
--- packages/debian/player/debian/libplayererror3.install
(rev 0)
+++ packages/debian/player/debian/libplayererror3.install 2009-06-29
08:17:13 UTC (rev 7927)
@@ -0,0 +1 @@
+usr/lib/libplayererror.so.*
Property changes on: packages/debian/player/debian/libplayererror3.install
___________________________________________________________________
Added: svn:mergeinfo
+
Deleted: packages/debian/player/debian/libplayerjpeg2-dev.install
===================================================================
--- packages/debian/player/debian/libplayerjpeg2-dev.install 2009-06-28
14:57:35 UTC (rev 7926)
+++ packages/debian/player/debian/libplayerjpeg2-dev.install 2009-06-29
08:17:13 UTC (rev 7927)
@@ -1,4 +0,0 @@
-usr/lib/libplayerjpeg.so
-usr/lib/libplayerjpeg.a
-usr/lib/libplayerjpeg.la
-usr/include/player-2.0/libplayerjpeg
Deleted: packages/debian/player/debian/libplayerjpeg2.install
===================================================================
--- packages/debian/player/debian/libplayerjpeg2.install 2009-06-28
14:57:35 UTC (rev 7926)
+++ packages/debian/player/debian/libplayerjpeg2.install 2009-06-29
08:17:13 UTC (rev 7927)
@@ -1 +0,0 @@
-usr/lib/libplayerjpeg.so.*
Deleted: packages/debian/player/debian/libplayertcp2-dev.install
===================================================================
--- packages/debian/player/debian/libplayertcp2-dev.install 2009-06-28
14:57:35 UTC (rev 7926)
+++ packages/debian/player/debian/libplayertcp2-dev.install 2009-06-29
08:17:13 UTC (rev 7927)
@@ -1,5 +0,0 @@
-usr/lib/libplayertcp.so
-usr/lib/libplayertcp.a
-usr/lib/libplayertcp.la
-usr/lib/pkgconfig/playertcp.pc
-usr/include/player-2.0/libplayertcp
Deleted: packages/debian/player/debian/libplayertcp2.install
===================================================================
--- packages/debian/player/debian/libplayertcp2.install 2009-06-28 14:57:35 UTC
(rev 7926)
+++ packages/debian/player/debian/libplayertcp2.install 2009-06-29 08:17:13 UTC
(rev 7927)
@@ -1 +0,0 @@
-usr/lib/libplayertcp.so.*
Copied: packages/debian/player/debian/libplayertcp3-dev.install (from rev 7900,
packages/debian/player/debian/libplayertcp2-dev.install)
===================================================================
--- packages/debian/player/debian/libplayertcp3-dev.install
(rev 0)
+++ packages/debian/player/debian/libplayertcp3-dev.install 2009-06-29
08:17:13 UTC (rev 7927)
@@ -0,0 +1,5 @@
+usr/lib/libplayertcp.so
+usr/lib/pkgconfig/playertcp.pc
+usr/include/player-3.0/libplayertcp
+usr/lib/libplayerudp.so
+usr/lib/pkgconfig/playerudp.pc
Property changes on: packages/debian/player/debian/libplayertcp3-dev.install
___________________________________________________________________
Added: svn:mergeinfo
+
Copied: packages/debian/player/debian/libplayertcp3.install (from rev 7900,
packages/debian/player/debian/libplayertcp2.install)
===================================================================
--- packages/debian/player/debian/libplayertcp3.install
(rev 0)
+++ packages/debian/player/debian/libplayertcp3.install 2009-06-29 08:17:13 UTC
(rev 7927)
@@ -0,0 +1,2 @@
+usr/lib/libplayertcp.so.*
+usr/lib/libplayerudp.so.*
Property changes on: packages/debian/player/debian/libplayertcp3.install
___________________________________________________________________
Added: svn:mergeinfo
+
Added: packages/debian/player/debian/libplayerutils3-dev.install
===================================================================
--- packages/debian/player/debian/libplayerutils3-dev.install
(rev 0)
+++ packages/debian/player/debian/libplayerutils3-dev.install 2009-06-29
08:17:13 UTC (rev 7927)
@@ -0,0 +1,3 @@
+usr/lib/libplayererror.so
+usr/lib/pkgconfig/playererror.pc
+usr/include/player-3.0/libplayercore/error.h
Added: packages/debian/player/debian/libplayerutils3.install
===================================================================
--- packages/debian/player/debian/libplayerutils3.install
(rev 0)
+++ packages/debian/player/debian/libplayerutils3.install 2009-06-29
08:17:13 UTC (rev 7927)
@@ -0,0 +1,3 @@
+usr/lib/libplayerutils.so.*
+usr/lib/libplayerjpeg.so.*
+usr/lib/libplayerwkb.so.*
Deleted: packages/debian/player/debian/libplayerxdr2-dev.install
===================================================================
--- packages/debian/player/debian/libplayerxdr2-dev.install 2009-06-28
14:57:35 UTC (rev 7926)
+++ packages/debian/player/debian/libplayerxdr2-dev.install 2009-06-29
08:17:13 UTC (rev 7927)
@@ -1,6 +0,0 @@
-usr/lib/libplayerxdr.so
-usr/lib/libplayerxdr.a
-usr/lib/libplayerxdr.la
-usr/lib/pkgconfig/playerxdr.pc
-usr/include/player-2.0/libplayerxdr
-usr/bin/playerxdrgen
Deleted: packages/debian/player/debian/libplayerxdr2.install
===================================================================
--- packages/debian/player/debian/libplayerxdr2.install 2009-06-28 14:57:35 UTC
(rev 7926)
+++ packages/debian/player/debian/libplayerxdr2.install 2009-06-29 08:17:13 UTC
(rev 7927)
@@ -1 +0,0 @@
-usr/lib/libplayerxdr.so.*
Copied: packages/debian/player/debian/libplayerxdr3-dev.install (from rev 7900,
packages/debian/player/debian/libplayerxdr2-dev.install)
===================================================================
--- packages/debian/player/debian/libplayerxdr3-dev.install
(rev 0)
+++ packages/debian/player/debian/libplayerxdr3-dev.install 2009-06-29
08:17:13 UTC (rev 7927)
@@ -0,0 +1,5 @@
+usr/lib/libplayerxdr.so
+usr/lib/pkgconfig/playerxdr.pc
+usr/include/player-3.0/libplayerxdr
+# install this in rules instead
+#usr/bin/robot-playerxdrgen
Property changes on: packages/debian/player/debian/libplayerxdr3-dev.install
___________________________________________________________________
Added: svn:mergeinfo
+
Copied: packages/debian/player/debian/libplayerxdr3.install (from rev 7900,
packages/debian/player/debian/libplayerxdr2.install)
===================================================================
--- packages/debian/player/debian/libplayerxdr3.install
(rev 0)
+++ packages/debian/player/debian/libplayerxdr3.install 2009-06-29 08:17:13 UTC
(rev 7927)
@@ -0,0 +1 @@
+usr/lib/libplayerxdr.so.*
Property changes on: packages/debian/player/debian/libplayerxdr3.install
___________________________________________________________________
Added: svn:mergeinfo
+
Modified: packages/debian/player/debian/libpmap0-dev.install
===================================================================
--- packages/debian/player/debian/libpmap0-dev.install 2009-06-28 14:57:35 UTC
(rev 7926)
+++ packages/debian/player/debian/libpmap0-dev.install 2009-06-29 08:17:13 UTC
(rev 7927)
@@ -1,7 +1,5 @@
usr/lib/libpmap.so
-usr/lib/libpmap.a
-usr/lib/libpmap.la
-usr/include/player-2.0/pmap/omap.h
-usr/include/player-2.0/pmap/pmap.h
-usr/include/player-2.0/pmap/rmap.h
-usr/include/player-2.0/pmap/slap.h
+usr/include/player-3.0/libpmap/omap.h
+usr/include/player-3.0/libpmap/pmap.h
+usr/include/player-3.0/libpmap/rmap.h
+usr/include/player-3.0/libpmap/slap.h
Deleted: packages/debian/player/debian/patches/python2.6_transition.patch
===================================================================
--- packages/debian/player/debian/patches/python2.6_transition.patch
2009-06-28 14:57:35 UTC (rev 7926)
+++ packages/debian/player/debian/patches/python2.6_transition.patch
2009-06-29 08:17:13 UTC (rev 7927)
@@ -1,13 +0,0 @@
-Index: player-2.0.4/client_libs/libplayerc/bindings/python/Makefile.in
-===================================================================
---- player-2.0.4.orig/client_libs/libplayerc/bindings/python/Makefile.in
2009-03-17 20:36:38.000000000 +0000
-+++ player-2.0.4/client_libs/libplayerc/bindings/python/Makefile.in
2009-03-17 20:37:06.000000000 +0000
-@@ -768,7 +768,7 @@
-
- # use distutils to install
- pythoninstall:
-- python $(srcdir)/setup.py install --prefix=$(DESTDIR)/$(prefix)
-+ python $(srcdir)/setup.py install --prefix=$(DESTDIR)/$(prefix)
--install-layout=deb
-
- # seems that distutils doesn't support 'uninstall', oh well
- uninstall-local:
Modified: packages/debian/player/debian/patches/series
===================================================================
--- packages/debian/player/debian/patches/series 2009-06-28 14:57:35 UTC
(rev 7926)
+++ packages/debian/player/debian/patches/series 2009-06-29 08:17:13 UTC
(rev 7927)
@@ -1 +0,0 @@
-python2.6_transition.patch
Modified: packages/debian/player/debian/python-playerc.install
===================================================================
--- packages/debian/player/debian/python-playerc.install 2009-06-28
14:57:35 UTC (rev 7926)
+++ packages/debian/player/debian/python-playerc.install 2009-06-29
08:17:13 UTC (rev 7927)
@@ -1,3 +1,3 @@
-usr/lib/python*/dist-packages/*.py
-usr/lib/python*/dist-packages/*.so
+usr/lib/python*/site-packages/*.py
+usr/lib/python*/site-packages/*.so
Modified: packages/debian/player/debian/robot-player.install
===================================================================
--- packages/debian/player/debian/robot-player.install 2009-06-28 14:57:35 UTC
(rev 7926)
+++ packages/debian/player/debian/robot-player.install 2009-06-29 08:17:13 UTC
(rev 7927)
@@ -1,10 +1,13 @@
-usr/bin/robot-player
-usr/bin/robot-playercam
-usr/bin/robot-playerjoy
-usr/bin/robot-playernav
-usr/bin/robot-playerprint
-usr/bin/robot-playerv
-usr/bin/robot-playervcr
-usr/bin/robot-playerwritemap
-usr/bin/robot-pmaptest
+# Dont install these here as we need to rename them in rules
+#usr/bin/robot-player
+#usr/bin/robot-playercam
+#usr/bin/robot-playerjoy
+#usr/bin/robot-playerlogsplitter
+#usr/bin/robot-playernav
+#usr/bin/robot-playerprint
+#usr/bin/robot-playerprop
+#usr/bin/robot-playerv
+#usr/bin/robot-playervcr
+#usr/bin/robot-playerwritemap
+usr/bin/pmaptest
usr/share
Added: packages/debian/player/debian/ruby-playerc.install
===================================================================
--- packages/debian/player/debian/ruby-playerc.install
(rev 0)
+++ packages/debian/player/debian/ruby-playerc.install 2009-06-29 08:17:13 UTC
(rev 7927)
@@ -0,0 +1,2 @@
+usr/lib/site_ruby/*/*.so
+
Modified: packages/debian/player/debian/rules
===================================================================
--- packages/debian/player/debian/rules 2009-06-28 14:57:35 UTC (rev 7926)
+++ packages/debian/player/debian/rules 2009-06-29 08:17:13 UTC (rev 7927)
@@ -1,146 +1,15 @@
#!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-#
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
-#
-# Modified to make a template file for a multi-binary package with separated
-# build-arch and build-indep targets by Bill Allombert 2001
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/cmake.mk
-# This has to be exported to make some magic below work.
-export DH_OPTIONS
+# Add here any variable or target overrides you need.
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-include /usr/share/quilt/quilt.make
-
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O0
-else
- CFLAGS += -O2
-endif
-
-config.status: patch configure
- dh_testdir
- # Add here commands to configure the package.
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
- cp -f /usr/share/misc/config.sub config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
- cp -f /usr/share/misc/config.guess config.guess
-endif
- ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE)
--prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs"
-
-
-#Architecture
-build: build-arch build-indep
-
-build-arch: build-arch-stamp
-build-arch-stamp: config.status
-
- # Add here commands to compile the arch part of the package.
- #$(MAKE)
- touch $@
-
-build-indep: build-indep-stamp
-build-indep-stamp: config.status
-
- # Add here commands to compile the indep part of the package.
- (cd doc && $(MAKE) doc)
- touch $@
-
-clean: unpatch
- dh_testdir
- dh_testroot
- rm -f build-arch-stamp build-indep-stamp #CONFIGURE-STAMP#
-
- # Add here commands to clean up after the build process.
- [ ! -f Makefile ] || $(MAKE) distclean
- rm -f config.sub config.guess
- rm -rf doc/player-docs
-
- dh_clean
-
-install: install-indep install-arch
-install-indep:
- dh_testdir
- dh_testroot
- dh_clean -k -i
- dh_installdirs -i
-
- # Add here commands to install the indep part of the package into
- # debian/<package>-doc.
- (cd doc && $(MAKE) doc-install DESTDIR="../debian/robot-player-doc")
-
- dh_install -i
-
-install-arch:
- dh_testdir
- dh_testroot
- dh_clean -k -s
- dh_installdirs -s
-
- # Add here commands to install the arch part of the package into
- # debian/tmp.
- $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
-
- mv -v debian/tmp/usr/bin/playerxdrgen.py debian/tmp/usr/bin/playerxdrgen
- # fix names
- for i in player playerv playercam playerjoy playernav playerprint
playervcr playerwritemap pmaptest; do mv -v debian/tmp/usr/bin/$$i
debian/tmp/usr/bin/robot-$$i; done
-
-
- dh_install -s --sourcedir=debian/tmp
-
-# Must not depend on anything. This is to be called by
-# binary-arch/binary-indep
-# in another 'make' thread.
-binary-common:
- dh_testdir
- dh_testroot
- dh_installchangelogs ChangeLog
- dh_installdocs
- dh_installexamples
-# dh_installmenu
-# dh_installdebconf
-# dh_installlogrotate
-# dh_installemacsen
-# dh_installpam
-# dh_installmime
-# dh_python
-# dh_installinit
-# dh_installcron
-# dh_installinfo
- dh_installman
- dh_link
- dh_strip
- dh_pycentral -ppython-playerc
- dh_compress
- dh_fixperms
-# dh_perl
- dh_makeshlibs DH_VERBOSE=1
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-# Build architecture independant packages using the common target.
-binary-indep: build-indep install-indep
- $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
-
-# Build architecture dependant packages using the common target.
-binary-arch: build-arch install-arch
- $(MAKE) -f debian/rules DH_OPTIONS=-s binary-common
-
-binary: binary-arch binary-indep
-.PHONY: build clean binary-indep binary-arch binary install install-indep
install-arch
+# We need to rename the player binaries
+PLAYER_BIN_DIR=$(DEB_DESTDIR)/usr/bin
+install/robot-player::
+ mkdir -p debian/tmp/robot-player/usr/bin/
+ for b in `ls $(PLAYER_BIN_DIR)`; do cp $(PLAYER_BIN_DIR)/$$b
debian/tmp/robot-player/usr/bin/robot-$$b; done
+ mkdir -p debian/tmp/libplayerxdr3-dev/usr/bin/
+ mv debian/tmp/robot-player/usr/bin/robot-playerxdrgen
debian/tmp/libplayerxdr3-dev/usr/bin/
+ rm debian/tmp/robot-player/usr/bin/robot-pmaptest
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
