r7246 - in people/brad-guest/unstable/trunk/plib/debian: . patches
Bradley Smith
brad-guest at alioth.debian.org
Fri Jun 6 11:44:02 UTC 2008
Author: brad-guest
Date: 2008-06-06 11:44:02 +0000 (Fri, 06 Jun 2008)
New Revision: 7246
Added:
people/brad-guest/unstable/trunk/plib/debian/patches/misc_fixes
people/brad-guest/unstable/trunk/plib/debian/plib1.8.4-dev.docs
people/brad-guest/unstable/trunk/plib/debian/plib1.8.4-dev.install
people/brad-guest/unstable/trunk/plib/debian/plib1.8.4c2.install
people/brad-guest/unstable/trunk/plib/debian/plib1.8.4c2.lintian-overrides
people/brad-guest/unstable/trunk/plib/debian/plib1.8.4c2.postinst
Removed:
people/brad-guest/unstable/trunk/plib/debian/libplib-debian1.install
people/brad-guest/unstable/trunk/plib/debian/libplib-debian1.lintian-overrides
people/brad-guest/unstable/trunk/plib/debian/libplib-debian1.postinst
people/brad-guest/unstable/trunk/plib/debian/libplib-dev.docs
people/brad-guest/unstable/trunk/plib/debian/libplib-dev.install
Modified:
people/brad-guest/unstable/trunk/plib/debian/changelog
people/brad-guest/unstable/trunk/plib/debian/control
people/brad-guest/unstable/trunk/plib/debian/patches/build_shared_libs
people/brad-guest/unstable/trunk/plib/debian/patches/series
people/brad-guest/unstable/trunk/plib/debian/rules
Log:
Prepare fixed plib1.8.4 package for lenny
Modified: people/brad-guest/unstable/trunk/plib/debian/changelog
===================================================================
--- people/brad-guest/unstable/trunk/plib/debian/changelog 2008-06-06 11:24:06 UTC (rev 7245)
+++ people/brad-guest/unstable/trunk/plib/debian/changelog 2008-06-06 11:44:02 UTC (rev 7246)
@@ -1,8 +1,7 @@
-plib (1.8.5-1) unstable; urgency=low
+plib (1.8.4-9) unstable; urgency=low
* New Maintainer. Closes: #475428
* Add games team as uploader.
- * New upstream release. Closes: #475354
* Add build_shared_libs patch
- Build shared libs properly. Closes: #475331
* Add remove_pthread_link patch
@@ -14,14 +13,14 @@
- Remove extra whitespace in copyright
- Tidy up debian/rules
- Update standards and debhelper versions
- - Remove plib-pic package
- - Rename packages to saner names
- Add homepage field
+ * Remove unneeded plib1.8.4-pic package.
* Change 'downloaded from' in copyright, since it is no longer correct.
* Bump shlibs version.
* Bump compat version to 5.
+ * Remove changes from top srcdir into misc_fixes patch.
- -- Bradley Smith <brad at brad-smith.co.uk> Sun, 11 May 2008 17:55:48 +0100
+ -- Bradley Smith <brad at brad-smith.co.uk> Fri, 06 Jun 2008 12:43:32 +0100
plib (1.8.4-8) unstable; urgency=low
Modified: people/brad-guest/unstable/trunk/plib/debian/control
===================================================================
--- people/brad-guest/unstable/trunk/plib/debian/control 2008-06-06 11:24:06 UTC (rev 7245)
+++ people/brad-guest/unstable/trunk/plib/debian/control 2008-06-06 11:44:02 UTC (rev 7246)
@@ -18,12 +18,12 @@
Vcs-Svn: svn://svn.debian.org/svn/pkg-games/people/brad-guest/trunk/plib/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/people/brad-guest/trunk/plib/?op=log
-Package: libplib-debian1
+Package: plib1.8.4c2
Section: libs
Architecture: any
Depends: freeglut3, libgl1, ${misc:Depends} ${shlibs:Depends}
-Conflicts: plib1.8.3, plib1.8.4c2
-Replaces: plib1.8.3, plib1.8.4c2
+Conflicts: plib1.8.3
+Replaces: plib1.8.3
Description: Portability Libraries: Run-time package
Provides a Joystick interface, a simple GUI built on top of OpenGL,
some standard geometry functions, a sound library and a simple scene
@@ -32,13 +32,13 @@
This package provides the shared libraries. It should be installed
automatically by packages which need it.
-Package: libplib-dev
+Package: plib1.8.4-dev
Section: libdevel
Architecture: any
-Depends: libplib-debian1 (= ${binary:Version}), freeglut3-dev,
+Depends: plib1.8.4c2 (= ${binary:Version}), freeglut3-dev,
libgl1-mesa-dev | libgl-dev, ${misc:Depends}, ${shlibs:Depends}
-Conflicts: plib1.8.3-pic, plib1.8.3-dev, plib1.8.4-pic, plib1.8.4-dev
-Replaces: plib1.8.3-pic, plib1.8.3-dev, plib1.8.4-pic, plib1.8.4-dev
+Conflicts: plib1.8.3-pic, plib1.8.3-dev
+Replaces: plib1.8.3-pic, plib1.8.3-dev
Provides: plib-dev
Description: Portability Libraries: Development package
Provides a Joystick interface, a simple GUI built on top of OpenGL,
Deleted: people/brad-guest/unstable/trunk/plib/debian/libplib-debian1.install
===================================================================
--- people/brad-guest/unstable/trunk/plib/debian/libplib-debian1.install 2008-06-06 11:24:06 UTC (rev 7245)
+++ people/brad-guest/unstable/trunk/plib/debian/libplib-debian1.install 2008-06-06 11:44:02 UTC (rev 7246)
@@ -1 +0,0 @@
-debian/tmp/usr/lib/*.so.*
Deleted: people/brad-guest/unstable/trunk/plib/debian/libplib-debian1.lintian-overrides
===================================================================
--- people/brad-guest/unstable/trunk/plib/debian/libplib-debian1.lintian-overrides 2008-06-06 11:24:06 UTC (rev 7245)
+++ people/brad-guest/unstable/trunk/plib/debian/libplib-debian1.lintian-overrides 2008-06-06 11:44:02 UTC (rev 7246)
@@ -1 +0,0 @@
-libplib-debian1: package-name-doesnt-match-sonames libplibfnt-debian1 libplibjs-debian1 libplibnet-debian1 libplibpsl-debian1 libplibpu-debian1 libplibpuaux-debian1 libplibpw-debian1 libplibsg-debian1 libplibsl-debian1 libplibsm-debian1 libplibssg-debian1 libplibssgaux-debian1 libplibul-debian1
Deleted: people/brad-guest/unstable/trunk/plib/debian/libplib-debian1.postinst
===================================================================
--- people/brad-guest/unstable/trunk/plib/debian/libplib-debian1.postinst 2008-06-06 11:24:06 UTC (rev 7245)
+++ people/brad-guest/unstable/trunk/plib/debian/libplib-debian1.postinst 2008-06-06 11:44:02 UTC (rev 7246)
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-set -e
-
-if [ "$1" = "configure" ]; then
- ldconfig
-fi
-
-#DEBHELPER#
Deleted: people/brad-guest/unstable/trunk/plib/debian/libplib-dev.docs
===================================================================
--- people/brad-guest/unstable/trunk/plib/debian/libplib-dev.docs 2008-06-06 11:24:06 UTC (rev 7245)
+++ people/brad-guest/unstable/trunk/plib/debian/libplib-dev.docs 2008-06-06 11:44:02 UTC (rev 7246)
@@ -1,8 +0,0 @@
-AUTHORS
-NOTICE
-README
-README.GLUT
-TODO-1.6
-TODO-2.0
-TODO_AFTER135
-KNOWN_BUGS
Deleted: people/brad-guest/unstable/trunk/plib/debian/libplib-dev.install
===================================================================
--- people/brad-guest/unstable/trunk/plib/debian/libplib-dev.install 2008-06-06 11:24:06 UTC (rev 7245)
+++ people/brad-guest/unstable/trunk/plib/debian/libplib-dev.install 2008-06-06 11:44:02 UTC (rev 7246)
@@ -1,4 +0,0 @@
-debian/tmp/usr/include
-debian/tmp/usr/lib/*.la
-debian/tmp/usr/lib/*.a
-debian/tmp/usr/lib/*.so
Modified: people/brad-guest/unstable/trunk/plib/debian/patches/build_shared_libs
===================================================================
--- people/brad-guest/unstable/trunk/plib/debian/patches/build_shared_libs 2008-06-06 11:24:06 UTC (rev 7245)
+++ people/brad-guest/unstable/trunk/plib/debian/patches/build_shared_libs 2008-06-06 11:44:02 UTC (rev 7246)
@@ -1,6 +1,6 @@
-diff -Naur plib-1.8.5.orig/configure.in plib-1.8.5/configure.in
---- plib-1.8.5.orig/configure.in 2008-04-17 13:46:45.000000000 +0100
-+++ plib-1.8.5/configure.in 2008-04-17 13:47:10.000000000 +0100
+diff -Naur plib-1.8.4.orig/configure.in plib-1.8.4/configure.in
+--- plib-1.8.4.orig/configure.in 2008-04-17 13:46:45.000000000 +0100
++++ plib-1.8.4/configure.in 2008-04-17 13:47:10.000000000 +0100
@@ -36,7 +36,7 @@
AC_PROG_CXX
AC_PROG_CXXCPP
@@ -10,9 +10,9 @@
dnl Command line arguments
-diff -Naur plib-1.8.5.orig/src/fnt/Makefile.am plib-1.8.5/src/fnt/Makefile.am
---- plib-1.8.5.orig/src/fnt/Makefile.am 2008-04-17 13:46:45.000000000 +0100
-+++ plib-1.8.5/src/fnt/Makefile.am 2008-04-17 13:52:53.000000000 +0100
+diff -Naur plib-1.8.4.orig/src/fnt/Makefile.am plib-1.8.4/src/fnt/Makefile.am
+--- plib-1.8.4.orig/src/fnt/Makefile.am 2008-04-17 13:46:45.000000000 +0100
++++ plib-1.8.4/src/fnt/Makefile.am 2008-04-17 13:52:53.000000000 +0100
@@ -1,10 +1,12 @@
if BUILD_FNT
@@ -24,13 +24,13 @@
-libplibfnt_a_SOURCES = fnt.cxx fntTXF.cxx fntLocal.h fntBitmap.cxx
+libplibfnt_la_SOURCES = fnt.cxx fntTXF.cxx fntLocal.h fntBitmap.cxx
+libplibfnt_la_LIBADD = ../util/libplibul.la
-+libplibfnt_la_LDFLAGS = -release debian -version-info 9:5:8
++libplibfnt_la_LDFLAGS = -version-info 9:4:8
INCLUDES = -I$(top_srcdir)/src/sg -I$(top_srcdir)/src/util
-diff -Naur plib-1.8.5.orig/src/js/Makefile.am plib-1.8.5/src/js/Makefile.am
---- plib-1.8.5.orig/src/js/Makefile.am 2008-04-17 13:46:45.000000000 +0100
-+++ plib-1.8.5/src/js/Makefile.am 2008-04-17 13:53:33.000000000 +0100
+diff -Naur plib-1.8.4.orig/src/js/Makefile.am plib-1.8.4/src/js/Makefile.am
+--- plib-1.8.4.orig/src/js/Makefile.am 2008-04-17 13:46:45.000000000 +0100
++++ plib-1.8.4/src/js/Makefile.am 2008-04-17 13:53:33.000000000 +0100
@@ -1,12 +1,15 @@
if BUILD_JS
@@ -44,20 +44,20 @@
jsMacOSX.cxx jsWindows.cxx jsBSD.cxx \
jsNone.cxx
+libplibjs_la_LIBADD = ../util/libplibul.la
-+libplibjs_la_LDFLAGS = -release debian -version-info 9:5:8
++libplibjs_la_LDFLAGS = -version-info 9:4:8
+
INCLUDES = -I$(top_srcdir)/src/util
-diff -Naur plib-1.8.5.orig/src/Makefile.am plib-1.8.5/src/Makefile.am
---- plib-1.8.5.orig/src/Makefile.am 2008-04-17 13:46:45.000000000 +0100
-+++ plib-1.8.5/src/Makefile.am 2008-04-17 14:16:21.000000000 +0100
+diff -Naur plib-1.8.4.orig/src/Makefile.am plib-1.8.4/src/Makefile.am
+--- plib-1.8.4.orig/src/Makefile.am 2008-04-17 13:46:45.000000000 +0100
++++ plib-1.8.4/src/Makefile.am 2008-04-17 14:16:21.000000000 +0100
@@ -1 +1 @@
-SUBDIRS = util js sl pui puAux sg ssg fnt ssgAux net psl pw
+SUBDIRS = util fnt sg js sl pui puAux ssg ssgAux net psl pw
-diff -Naur plib-1.8.5.orig/src/net/Makefile.am plib-1.8.5/src/net/Makefile.am
---- plib-1.8.5.orig/src/net/Makefile.am 2008-04-17 13:46:45.000000000 +0100
-+++ plib-1.8.5/src/net/Makefile.am 2008-04-17 13:54:12.000000000 +0100
+diff -Naur plib-1.8.4.orig/src/net/Makefile.am plib-1.8.4/src/net/Makefile.am
+--- plib-1.8.4.orig/src/net/Makefile.am 2008-04-17 13:46:45.000000000 +0100
++++ plib-1.8.4/src/net/Makefile.am 2008-04-17 13:54:12.000000000 +0100
@@ -1,12 +1,14 @@
if BUILD_NET
@@ -71,13 +71,13 @@
+libplibnet_la_SOURCES = netBuffer.cxx netChannel.cxx netChat.cxx \
netMessage.cxx netMonitor.cxx netSocket.cxx
+libplibnet_la_LIBADD = ../util/libplibul.la
-+libplibnet_la_LDFLAGS = -release debian -version-info 9:5:8
++libplibnet_la_LDFLAGS = -version-info 9:4:8
INCLUDES = -I$(top_srcdir)/src/util
-diff -Naur plib-1.8.5.orig/src/psl/Makefile.am plib-1.8.5/src/psl/Makefile.am
---- plib-1.8.5.orig/src/psl/Makefile.am 2008-04-17 13:46:45.000000000 +0100
-+++ plib-1.8.5/src/psl/Makefile.am 2008-04-17 14:13:43.000000000 +0100
+diff -Naur plib-1.8.4.orig/src/psl/Makefile.am plib-1.8.4/src/psl/Makefile.am
+--- plib-1.8.4.orig/src/psl/Makefile.am 2008-04-17 13:46:45.000000000 +0100
++++ plib-1.8.4/src/psl/Makefile.am 2008-04-17 14:13:43.000000000 +0100
@@ -1,16 +1,18 @@
if BUILD_PSL
@@ -95,13 +95,13 @@
pslContext.h pslFileIO.h pslLocal.h \
pslOpcodes.h pslSymbol.h
+libplibpsl_la_LIBADD = ../util/libplibul.la
-+libplibpsl_la_LDFLAGS = -release debian -version-info 9:5:8
++libplibpsl_la_LDFLAGS = -version-info 9:4:8
INCLUDES = -I$(top_srcdir)/src/util
-diff -Naur plib-1.8.5.orig/src/puAux/Makefile.am plib-1.8.5/src/puAux/Makefile.am
---- plib-1.8.5.orig/src/puAux/Makefile.am 2008-04-17 13:46:45.000000000 +0100
-+++ plib-1.8.5/src/puAux/Makefile.am 2008-04-17 14:08:34.000000000 +0100
+diff -Naur plib-1.8.4.orig/src/puAux/Makefile.am plib-1.8.4/src/puAux/Makefile.am
+--- plib-1.8.4.orig/src/puAux/Makefile.am 2008-04-17 13:46:45.000000000 +0100
++++ plib-1.8.4/src/puAux/Makefile.am 2008-04-17 14:08:34.000000000 +0100
@@ -1,10 +1,10 @@
if BUILD_PUAUX
@@ -121,13 +121,13 @@
puAuxChooser.cxx
+libplibpuaux_la_LIBADD = ../util/libplibul.la ../pui/libplibpu.la \
+ ../fnt/libplibfnt.la ../sg/libplibsg.la
-+libplibpuaux_la_LDFLAGS = -release debian -version-info 9:5:8
++libplibpuaux_la_LDFLAGS = -version-info 9:4:8
INCLUDES = -I$(top_srcdir)/src/sg \
-I$(top_srcdir)/src/pui \
-diff -Naur plib-1.8.5.orig/src/pui/Makefile.am plib-1.8.5/src/pui/Makefile.am
---- plib-1.8.5.orig/src/pui/Makefile.am 2008-04-17 13:46:45.000000000 +0100
-+++ plib-1.8.5/src/pui/Makefile.am 2008-04-17 14:09:12.000000000 +0100
+diff -Naur plib-1.8.4.orig/src/pui/Makefile.am plib-1.8.4/src/pui/Makefile.am
+--- plib-1.8.4.orig/src/pui/Makefile.am 2008-04-17 13:46:45.000000000 +0100
++++ plib-1.8.4/src/pui/Makefile.am 2008-04-17 14:09:12.000000000 +0100
@@ -1,10 +1,10 @@
if BUILD_PUI
@@ -142,17 +142,17 @@
puArrowButton.cxx puDialogBox.cxx puFrame.cxx puGroup.cxx \
puInput.cxx puInterface.cxx puLocal.h puMenuBar.cxx \
@@ -14,6 +14,8 @@
- puDial.cxx \
- puRange.cxx \
- puInputBase.cxx
+ puDial.cxx puVerticalMenu.cxx puLargeInput.cxx \
+ puFileSelector.cxx puComboBox.cxx puSelectBox.cxx puRange.cxx \
+ puSpinBox.cxx puScrollBar.cxx puInputBase.cxx
+libplibpu_la_LIBADD = ../util/libplibul.la ../fnt/libplibfnt.la
-+libplibpu_la_LDFLAGS = -release debian -version-info 9:5:8
++libplibpu_la_LDFLAGS = -version-info 9:4:8
AM_CPPFLAGS = -I$(top_srcdir)/src/sg -I$(top_srcdir)/src/fnt
AM_CPPFLAGS += -I$(top_srcdir)/src/util
-diff -Naur plib-1.8.5.orig/src/pw/Makefile.am plib-1.8.5/src/pw/Makefile.am
---- plib-1.8.5.orig/src/pw/Makefile.am 2008-04-17 13:46:45.000000000 +0100
-+++ plib-1.8.5/src/pw/Makefile.am 2008-04-17 14:13:46.000000000 +0100
+diff -Naur plib-1.8.4.orig/src/pw/Makefile.am plib-1.8.4/src/pw/Makefile.am
+--- plib-1.8.4.orig/src/pw/Makefile.am 2008-04-17 13:46:45.000000000 +0100
++++ plib-1.8.4/src/pw/Makefile.am 2008-04-17 14:13:46.000000000 +0100
@@ -1,10 +1,11 @@
if BUILD_PW
@@ -163,13 +163,13 @@
-libplibpw_a_SOURCES = pw.cxx pwX11.cxx pwWindows.cxx pwMacOSX.cxx
+libplibpw_la_SOURCES = pw.cxx pwX11.cxx pwWindows.cxx pwMacOSX.cxx
-+libplibpw_la_LDFLAGS = -release debian -version-info 9:5:8
++libplibpw_la_LDFLAGS = -version-info 9:4:8
INCLUDES = -I$(top_srcdir)/src/util
-diff -Naur plib-1.8.5.orig/src/sg/Makefile.am plib-1.8.5/src/sg/Makefile.am
---- plib-1.8.5.orig/src/sg/Makefile.am 2008-04-17 13:46:45.000000000 +0100
-+++ plib-1.8.5/src/sg/Makefile.am 2008-04-17 14:14:23.000000000 +0100
+diff -Naur plib-1.8.4.orig/src/sg/Makefile.am plib-1.8.4/src/sg/Makefile.am
+--- plib-1.8.4.orig/src/sg/Makefile.am 2008-04-17 13:46:45.000000000 +0100
++++ plib-1.8.4/src/sg/Makefile.am 2008-04-17 14:14:23.000000000 +0100
@@ -1,12 +1,14 @@
if BUILD_SG
@@ -183,13 +183,13 @@
sgIsect.cxx sgdIsect.cxx \
sgPerlinNoise.cxx
+libplibsg_la_LIBADD = ../util/libplibul.la
-+libplibsg_la_LDFLAGS = -release debian -version-info 9:5:8
++libplibsg_la_LDFLAGS = -version-info 9:4:8
INCLUDES = -I$(top_srcdir)/src/util
-diff -Naur plib-1.8.5.orig/src/sl/Makefile.am plib-1.8.5/src/sl/Makefile.am
---- plib-1.8.5.orig/src/sl/Makefile.am 2008-04-17 13:46:45.000000000 +0100
-+++ plib-1.8.5/src/sl/Makefile.am 2008-04-17 14:12:02.000000000 +0100
+diff -Naur plib-1.8.4.orig/src/sl/Makefile.am plib-1.8.4/src/sl/Makefile.am
+--- plib-1.8.4.orig/src/sl/Makefile.am 2008-04-17 13:46:45.000000000 +0100
++++ plib-1.8.4/src/sl/Makefile.am 2008-04-17 14:12:02.000000000 +0100
@@ -1,16 +1,19 @@
if BUILD_SL
@@ -205,17 +205,17 @@
slScheduler.cxx slMODdacio.cxx slMODfile.cxx \
slMODinst.cxx slMODnote.cxx slMODPrivate.h slMODfile.h
+libplibsl_la_LIBADD = ../util/libplibul.la
-+libplibsl_la_LDFLAGS = -release debian -version-info 9:5:8
++libplibsl_la_LDFLAGS = -version-info 9:4:8
-libplibsm_a_SOURCES = slPortability.h smMixer.cxx
+libplibsm_la_SOURCES = slPortability.h smMixer.cxx
-+libplibsm_la_LDFLAGS = -release debian -version-info 9:5:8
++libplibsm_la_LDFLAGS = -version-info 9:4:8
INCLUDES = -I$(top_srcdir)/src/util
-diff -Naur plib-1.8.5.orig/src/ssg/Makefile.am plib-1.8.5/src/ssg/Makefile.am
---- plib-1.8.5.orig/src/ssg/Makefile.am 2008-04-17 13:46:45.000000000 +0100
-+++ plib-1.8.5/src/ssg/Makefile.am 2008-04-17 14:15:18.000000000 +0100
+diff -Naur plib-1.8.4.orig/src/ssg/Makefile.am plib-1.8.4/src/ssg/Makefile.am
+--- plib-1.8.4.orig/src/ssg/Makefile.am 2008-04-17 13:46:45.000000000 +0100
++++ plib-1.8.4/src/ssg/Makefile.am 2008-04-17 14:15:18.000000000 +0100
@@ -1,10 +1,10 @@
if BUILD_SSG
@@ -234,13 +234,13 @@
ssgSaveIV.cxx ssgAnimTransform.cxx\
ssgVertSplitter.h ssgVertSplitter.cxx ssgStatistics.cxx
+libplibssg_la_LIBADD = ../util/libplibul.la ../sg/libplibsg.la
-+libplibssg_la_LDFLAGS = -release debian -version-info 9:5:8
++libplibssg_la_LDFLAGS = -version-info 9:4:8
INCLUDES = -I$(top_srcdir)/src/sg -I$(top_srcdir)/src/util
-diff -Naur plib-1.8.5.orig/src/ssgAux/Makefile.am plib-1.8.5/src/ssgAux/Makefile.am
---- plib-1.8.5.orig/src/ssgAux/Makefile.am 2008-04-17 13:46:45.000000000 +0100
-+++ plib-1.8.5/src/ssgAux/Makefile.am 2008-04-17 14:14:50.000000000 +0100
+diff -Naur plib-1.8.4.orig/src/ssgAux/Makefile.am plib-1.8.4/src/ssgAux/Makefile.am
+--- plib-1.8.4.orig/src/ssgAux/Makefile.am 2008-04-17 13:46:45.000000000 +0100
++++ plib-1.8.4/src/ssgAux/Makefile.am 2008-04-17 14:14:50.000000000 +0100
@@ -1,6 +1,6 @@
if BUILD_SSGAUX
@@ -264,13 +264,13 @@
ssgaBillboards.cxx
+libplibssgaux_la_LIBADD = ../util/libplibul.la ../ssg/libplibssg.la \
+ ../sg/libplibsg.la
-+libplibssgaux_la_LDFLAGS = -release debian -version-info 9:5:8
++libplibssgaux_la_LDFLAGS = -version-info 9:4:8
INCLUDES = -I$(top_srcdir)/src/sg -I$(top_srcdir)/src/ssg
INCLUDES += -I$(top_srcdir)/src/util
-diff -Naur plib-1.8.5.orig/src/util/Makefile.am plib-1.8.5/src/util/Makefile.am
---- plib-1.8.5.orig/src/util/Makefile.am 2008-04-17 13:46:45.000000000 +0100
-+++ plib-1.8.5/src/util/Makefile.am 2008-04-17 14:13:41.000000000 +0100
+diff -Naur plib-1.8.4.orig/src/util/Makefile.am plib-1.8.4/src/util/Makefile.am
+--- plib-1.8.4.orig/src/util/Makefile.am 2008-04-17 13:46:45.000000000 +0100
++++ plib-1.8.4/src/util/Makefile.am 2008-04-17 14:13:41.000000000 +0100
@@ -1,11 +1,12 @@
if BUILD_UL
@@ -282,7 +282,7 @@
-libplibul_a_SOURCES = ul.cxx ulClock.cxx ulError.cxx ulLinkedList.cxx \
+libplibul_la_SOURCES = ul.cxx ulClock.cxx ulError.cxx ulLinkedList.cxx \
ulList.cxx ulLocal.h ulRTTI.cxx
-+libplibul_la_LDFLAGS = -release debian -version-info 9:5:8
++libplibul_la_LDFLAGS = -version-info 9:4:8
endif
Added: people/brad-guest/unstable/trunk/plib/debian/patches/misc_fixes
===================================================================
--- people/brad-guest/unstable/trunk/plib/debian/patches/misc_fixes (rev 0)
+++ people/brad-guest/unstable/trunk/plib/debian/patches/misc_fixes 2008-06-06 11:44:02 UTC (rev 7246)
@@ -0,0 +1,75 @@
+--- plib-1.8.4.orig/src/js/jsLinuxOld.cxx
++++ plib-1.8.4/src/js/jsLinuxOld.cxx
+@@ -27,7 +27,7 @@
+
+ #include <linux/joystick.h>
+
+-#if !defined(JS_VERSION) || JS_VERSION >= 0x010000
++#if !defined(JS_VERSION) || JS_VERSION < 0x010000
+
+ #include <fcntl.h>
+ #include <sys/ioctl.h>
+--- plib-1.8.4.orig/src/js/jsBSD.cxx
++++ plib-1.8.4/src/js/jsBSD.cxx
+@@ -45,7 +45,7 @@
+ #endif
+
+ #include <sys/ioctl.h>
+-#if defined(__FreeBSD__)
++#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+ # include <sys/joystick.h>
+ #else
+ # include <machine/joystick.h> // For analog joysticks
+--- plib-1.8.4.orig/src/sl/slDSP.cxx
++++ plib-1.8.4/src/sl/slDSP.cxx
+@@ -413,7 +413,7 @@
+ /* NetBSD/OpenBSD 2.3 this should be very close to SUN Audio */
+ /* ------------------------------------------------------------ */
+
+-#elif (defined(UL_BSD) && !defined(__FreeBSD__)) || defined(UL_SOLARIS)
++#elif (defined(UL_BSD) && !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__)) || defined(UL_SOLARIS)
+ void slDSP::open ( const char *device, int _rate, int _stereo, int _bps )
+ {
+
+--- plib-1.8.4.orig/src/sl/slPortability.h
++++ plib-1.8.4/src/sl/slPortability.h
+@@ -59,8 +59,8 @@
+ # if defined(UL_LINUX)
+ # include <linux/soundcard.h>
+ # include <sys/ioctl.h>
+-# elif defined(__FreeBSD__)
+-# include <machine/soundcard.h>
++# elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
++# include <sys/soundcard.h>
+ # else
+ /*
+ Tom thinks this file may be <sys/soundcard.h> under some
+@@ -75,7 +75,7 @@
+ #endif
+
+ #ifdef UL_BSD
+-#ifndef __FreeBSD__
++#if !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__)
+ # include <sys/audioio.h>
+ #endif
+ #endif
+--- plib-1.8.4.orig/src/ssgAux/ssgaSky.h
++++ plib-1.8.4/src/ssgAux/ssgaSky.h
+@@ -104,7 +104,7 @@
+ ssgaCelestialBodyList ( int init = 3 )
+ : ssgSimpleList ( sizeof(ssgaCelestialBody*), init ) { }
+
+- ssgaCelestialBodyList::~ssgaCelestialBodyList () { removeAll(); }
++ ~ssgaCelestialBodyList () { removeAll(); }
+
+ int getNum (void) { return total ; }
+
+@@ -192,7 +192,7 @@
+ ssgaCloudLayerList ( int init = 3 )
+ : ssgSimpleList ( sizeof(ssgaCloudLayer*), init ) { }
+
+- ssgaCloudLayerList::~ssgaCloudLayerList () { removeAll(); }
++ ~ssgaCloudLayerList () { removeAll(); }
+
+ int getNum (void) { return total ; }
+
Modified: people/brad-guest/unstable/trunk/plib/debian/patches/series
===================================================================
--- people/brad-guest/unstable/trunk/plib/debian/patches/series 2008-06-06 11:24:06 UTC (rev 7245)
+++ people/brad-guest/unstable/trunk/plib/debian/patches/series 2008-06-06 11:44:02 UTC (rev 7246)
@@ -1,2 +1,3 @@
build_shared_libs
remove_pthread_link
+misc_fixes
Added: people/brad-guest/unstable/trunk/plib/debian/plib1.8.4-dev.docs
===================================================================
--- people/brad-guest/unstable/trunk/plib/debian/plib1.8.4-dev.docs (rev 0)
+++ people/brad-guest/unstable/trunk/plib/debian/plib1.8.4-dev.docs 2008-06-06 11:44:02 UTC (rev 7246)
@@ -0,0 +1,8 @@
+AUTHORS
+NOTICE
+README
+README.GLUT
+TODO-1.6
+TODO-2.0
+TODO_AFTER135
+KNOWN_BUGS
Added: people/brad-guest/unstable/trunk/plib/debian/plib1.8.4-dev.install
===================================================================
--- people/brad-guest/unstable/trunk/plib/debian/plib1.8.4-dev.install (rev 0)
+++ people/brad-guest/unstable/trunk/plib/debian/plib1.8.4-dev.install 2008-06-06 11:44:02 UTC (rev 7246)
@@ -0,0 +1,4 @@
+debian/tmp/usr/include
+debian/tmp/usr/lib/*.la
+debian/tmp/usr/lib/*.a
+debian/tmp/usr/lib/*.so
Added: people/brad-guest/unstable/trunk/plib/debian/plib1.8.4c2.install
===================================================================
--- people/brad-guest/unstable/trunk/plib/debian/plib1.8.4c2.install (rev 0)
+++ people/brad-guest/unstable/trunk/plib/debian/plib1.8.4c2.install 2008-06-06 11:44:02 UTC (rev 7246)
@@ -0,0 +1 @@
+debian/tmp/usr/lib/*.so.*
Added: people/brad-guest/unstable/trunk/plib/debian/plib1.8.4c2.lintian-overrides
===================================================================
--- people/brad-guest/unstable/trunk/plib/debian/plib1.8.4c2.lintian-overrides (rev 0)
+++ people/brad-guest/unstable/trunk/plib/debian/plib1.8.4c2.lintian-overrides 2008-06-06 11:44:02 UTC (rev 7246)
@@ -0,0 +1 @@
+plib1.8.4c2: package-name-doesnt-match-sonames libplibfnt1 libplibjs1 libplibnet1 libplibpsl1 libplibpu1 libplibpuaux1 libplibpw1 libplibsg1 libplibsl1 libplibsm1 libplibssg1 libplibssgaux1 libplibul1
Added: people/brad-guest/unstable/trunk/plib/debian/plib1.8.4c2.postinst
===================================================================
--- people/brad-guest/unstable/trunk/plib/debian/plib1.8.4c2.postinst (rev 0)
+++ people/brad-guest/unstable/trunk/plib/debian/plib1.8.4c2.postinst 2008-06-06 11:44:02 UTC (rev 7246)
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" = "configure" ]; then
+ ldconfig
+fi
+
+#DEBHELPER#
Modified: people/brad-guest/unstable/trunk/plib/debian/rules
===================================================================
--- people/brad-guest/unstable/trunk/plib/debian/rules 2008-06-06 11:24:06 UTC (rev 7245)
+++ people/brad-guest/unstable/trunk/plib/debian/rules 2008-06-06 11:44:02 UTC (rev 7246)
@@ -46,9 +46,9 @@
dh_testroot
dh_clean -k
$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp/
- mkdir -p debian/libplib-debian1/usr/share/lintian/overrides/
- cp -a debian/libplib-debian1.lintian-overrides \
- debian/libplib-debian1/usr/share/lintian/overrides/libplib-debian1
+ mkdir -p debian/plib1.8.4c2/usr/share/lintian/overrides/
+ cp -a debian/plib1.8.4c2.lintian-overrides \
+ debian/plib1.8.4c2/usr/share/lintian/overrides/plib1.8.4c2
binary-indep: build install
@@ -65,7 +65,7 @@
dh_shlibdeps
dh_fixperms
dh_installdeb
- dh_makeshlibs -V 'libplib-debian1 (>= 1.8.5)'
+ dh_makeshlibs -V 'plib1.8.4c2 (>= 1.8.4)'
dh_gencontrol
dh_md5sums
dh_builddeb
More information about the Pkg-games-commits
mailing list