debian rules

This commit is contained in:
Alexander Deynichenko
2013-02-25 08:01:39 +04:00
parent 03b62f3315
commit 9f15255db6
14 changed files with 1056 additions and 0 deletions
+464
View File
@@ -0,0 +1,464 @@
plib (1.8.5-5) unstable; urgency=low
* New upstream release
-- Alexander Deynichenko <adeynichenko@gmail.com> Mon, 25 2013 07:39:43 +0400
plib (1.8.5-5) unstable; urgency=low
* Fix FTBFS on hurd. Thanks to Pino Toscano <pino@kde.org>.
Closes: #558790.
-- Bradley Smith <bradsmith@debian.org> Mon, 14 Dec 2009 22:21:38 +0000
plib (1.8.5-4) unstable; urgency=low
* Merge changes to unstable.
* Update Standards-Version to 3.8.1. (No changes).
-- Bradley Smith <bradsmith@debian.org> Tue, 12 May 2009 11:39:47 +0100
plib (1.8.5-3) experimental; urgency=low
* Stop replacing ltmain.sh. Closes: #527506.
-- Bradley Smith <bradsmith@debian.org> Sat, 09 May 2009 19:00:25 +0100
plib (1.8.5-2) experimental; urgency=low
* Add 'Provides: plib1.8.4-dev' to libplib-dev.
-- Bradley Smith <bradsmith@debian.org> Tue, 24 Feb 2009 13:38:02 +0000
plib (1.8.5-1) experimental; urgency=low
* New upstream release. Closes: #475354.
* debian/control
- Update maintainer email address.
- Rename binary packages.
- Remove obsolote Conflicts/Replaces, and add new ones.
- Fix Vcs-* entries.
* debian/patches
- build_shared_libs - Update soname.
- misc_fixes - Refresh
* Update compat version to 7 and upgrade debhelper build-depends.
* Convert copyright to machine readable format.
* Fix watch file.
-- Bradley Smith <bradsmith@debian.org> Sun, 22 Feb 2009 12:31:31 +0000
plib (1.8.4-10) unstable; urgency=low
* Bump shlibs version to 1.8.4-9. Closes: #487367.
* Correct dh_* rules order.
* Update Vcs entries in debian/control.
* Update Standards-Version to 3.8.0.
- Support parallel=N in DEB_BUILD_OPTIONS.
-- Bradley Smith <brad@brad-smith.co.uk> Sat, 05 Jul 2008 12:39:29 +0100
plib (1.8.4-9) unstable; urgency=low
* New Maintainer. Closes: #475428
* Add games team as uploader.
* Add build_shared_libs patch
- Build shared libs properly. Closes: #475331
* Add remove_pthread_link patch
- Remove unneeded linking with pthread
* Use fixed ltmain.sh in build
* Overhaul packaging. Closes: #475356
- Correct debian/control
- Fix autotools regeneration
- Remove extra whitespace in copyright
- Tidy up debian/rules
- Update standards and debhelper versions
- 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.
* Added missing conflict against plib1.8.3.
-- Bradley Smith <brad@brad-smith.co.uk> Fri, 06 Jun 2008 16:16:35 +0100
plib (1.8.4-8) unstable; urgency=low
* Add versioned shlib to help upgrade to release post -6 (which was buggy).
Closes: #436917
-- Philipp Frauenfelder <pfrauenf@debian.org> Fri, 10 Aug 2007 22:45:41 +0200
plib (1.8.4-7) unstable; urgency=low
* Fix libplibjs. Closes: #425724
-- Philipp Frauenfelder <pfrauenf@debian.org> Thu, 24 May 2007 21:54:12 +0200
plib (1.8.4-6) unstable; urgency=low
* Change dependency of libglut3[-dev] to freeglut3[-dev]. Closes: #394500
* Updated watch file.
-- Philipp Frauenfelder <pfrauenf@debian.org> Mon, 23 Oct 2006 22:42:11 +0200
plib (1.8.4-5) unstable; urgency=low
* Acknowledge NMU of Matthias Klose. Closes: #385836.
Removing build-dependency on g++-4.0
* #374540 was already handled in -4. Closes: #374540.
* #302711 was never really reproducable by other people. The submitter did
not answer after nearlly two month. Closes: #302711
* The same with #260179. But here, the submitter did not answer after
nearlly one year. Closes: #260179
-- Philipp Frauenfelder <pfrauenf@debian.org> Sat, 14 Oct 2006 09:37:10 +0200
plib (1.8.4-4.1) unstable; urgency=low
* NMU.
* Drop build dependency on g++-4.0. Closes: #385836.
-- Matthias Klose <doko@debian.org> Sun, 3 Sep 2006 16:57:16 +0000
plib (1.8.4-4) unstable; urgency=low
* Thanks for the NMU! Closes: #372772
* Bumped standards version to 3.7.2 (no changes)
-- Philipp Frauenfelder <pfrauenf@debian.org> Thu, 22 Jun 2006 11:13:43 +0200
plib (1.8.4-3.1) unstable; urgency=high
* Non-maintainer upload.
* Add build-dependency on libxi-dev; fixes FTBFS. (Closes: #372772)
-- Steinar H. Gunderson <sesse@debian.org> Mon, 19 Jun 2006 23:17:39 +0200
plib (1.8.4-3) unstable; urgency=low
* Fixes for GNU/kFreeBSD. Closes: #332995
* Properly use autotools to recreate configure, Makefiles etc.
-- Philipp Frauenfelder <pfrauenf@debian.org> Tue, 25 Oct 2005 17:55:16 +0200
plib (1.8.4-2) unstable; urgency=low
* New package name for plib1.8.4 -> plib1.8.4c2 as advised by the
GCC 4.0 transition guide.
* Bumped standards version to 3.6.2
-- Philipp Frauenfelder <pfrauenf@debian.org> Wed, 6 Jul 2005 21:46:45 +0200
plib (1.8.4-1) unstable; urgency=low
* New upstream release: accumulated small bug fixes, minor enhancements.
* Changed debian/watch file.
-- Philipp Frauenfelder <pfrauenf@debian.org> Tue, 25 Jan 2005 16:34:05 +0100
plib (1.8.3-2) unstable; urgency=low
* Corrected C++ syntax in ssgAux/ssgaSky.h. Thanks to
neuro.harald AT surfeu.at for the patch. Closes: #260355
* Build-Depends on libx11-dev, libxmu-dev instead of xlibs-dev
* Removed build depends on g++, libc6.
* Changed (build) depends on libgl-dev to xlibmesa-gl-dev | libgl-dev
-- Philipp Frauenfelder <pfrauenf@debian.org> Thu, 26 Aug 2004 23:31:16 +0200
plib (1.8.3-1) unstable; urgency=low
* New upstream release:
- NET now allows a NULL argument to netSocket::accept
- Added #include <stdio.h> to all top level header files
in order to ensure that NULL is defined.
- Added ssgaScreenDump into ssgAux.dsp
- Cleaned up some warnings from MSVC.
- Added Christos Dimitrakakis' fixes to SL to prevent
crackling in certain envelope conditions.
- Added pwAutoRepeatKey to control keyboard auto-repeat.
- Fixed a horrific bug in the sgDistToLineSegment routines.
* The above includes changes in the header files and therefore, we
have a new soname.
-- Philipp Frauenfelder <pfrauenf@debian.org> Sun, 11 Apr 2004 20:40:53 +0200
plib (1.8.2-2) unstable; urgency=low
* Changed dependencies from glutg3* to libglut3*.
* Added build dependency to libc6-dev | libc-dev
* Changed SONAME from 1 to 1.8 (though I had this naming scheme since
long ago), changed package names also.
* Removed shlibs file.
-- Philipp Frauenfelder <pfrauenf@debian.org> Sun, 4 Apr 2004 14:23:19 +0200
plib (1.8.2-1) unstable; urgency=low
* New upstream release
* Reverted package name from plib1c102 to plib1 as we have a new so-name.
* Updated config.guess and config.sub
* Added debian/watch file
* Some other changes in rules file
-- Philipp Frauenfelder <pfrauenf@debian.org> Fri, 26 Mar 2004 23:46:54 +0100
plib (1.6.0-4) unstable; urgency=low
* Add automake1.7 as alternative to automake to build dependencies
* Create a new package plib-pic which is a copy of plib-dev but
the libraries have -fPIC code opposed to plib-dev. Closes: #229852
* Made the package descriptions somewhat clearer.
* Bumped standards version to 3.6.1
-- Philipp Frauenfelder <pfrauenf@debian.org> Wed, 18 Feb 2004 13:15:57 +0100
plib (1.6.0-3) unstable; urgency=low
* Adapted shlibs file to name change. Closes: #177775
Tried to follow the hint in the same bug.
-- Philipp Frauenfelder <pfrauenf@debian.org> Mon, 3 Feb 2003 18:15:57 +0100
plib (1.6.0-2) unstable; urgency=low
* Changed name of binary package to plib1c102, recompiled with gcc 3.2
and added a conflict to plib1
-- Philipp Frauenfelder <pfrauenf@debian.org> Sun, 12 Jan 2003 17:10:11 +0100
plib (1.6.0-1) unstable; urgency=low
* New upstream release
-- Philipp Frauenfelder <pfrauenf@debian.org> Thu, 5 Sep 2002 22:18:18 +0200
plib (1.4.1-1) unstable; urgency=low
* New upstream release
-- Philipp Frauenfelder <pfrauenf@debian.org> Tue, 26 Jun 2001 15:02:49 +0000
plib (1.4.0-1) unstable; urgency=low
* New upstream release
-- Philipp Frauenfelder <pfrauenf@debian.org> Thu, 21 Jun 2001 06:35:36 +0000
plib1.3 (1.3.2-1) unstable; urgency=low
* New upstream release
-- Philipp Frauenfelder <pfrauenf@debian.org> Thu, 14 Jun 2001 10:35:13 +0000
plib1.3 (1.3.1-6) unstable; urgency=low
* Changed names of the libraries from libplib* to libplib1.3*. The
symlinks in the -dev package still have to old libplib* names -- but
they point to libplib1.3* version, of course.
Now plib1.3 no longer conflicts with plib1 and vice-versa. The -dev
packages still do, though. Closes: #87276
-- Philipp Frauenfelder <pfrauenf@debian.org> Tue, 27 Feb 2001 12:54:23 +0000
plib1.3 (1.3.1-5) unstable; urgency=low
* Added patch from Paul Slootman to include float.h in sg.h.
Closes: #86581.
-- Philipp Frauenfelder <pfrauenf@debian.org> Tue, 20 Feb 2001 10:15:08 +0000
plib1.3 (1.3.1-4) unstable; urgency=low
* Adapted shlibs file to -4.
-- Philipp Frauenfelder <pfrauenf@debian.org> Thu, 8 Feb 2001 17:05:47 +0000
plib1.3 (1.3.1-3) unstable; urgency=low
* Recompile with XFree86 4 installed.
-- Philipp Frauenfelder <pfrauenf@debian.org> Wed, 7 Feb 2001 13:29:11 +0000
plib1.3 (1.3.1-2) unstable; urgency=low
* License addendum added to debian/copyright
-- Philipp Frauenfelder <pfrauenf@debian.org> Wed, 15 Nov 2000 13:31:58 +0100
plib1.3 (1.3.1-1) unstable; urgency=low
* New upstream release
-- Philipp Frauenfelder <pfrauenf@debian.org> Mon, 13 Nov 2000 09:59:46 +0100
plib (1.2.0-2) unstable; urgency=low
* Rebuild with new X installed. Closes: #76786
* Takes care of the unstable branch of plib (which is
called plib1.3 and plib1.3-dev: conflicts!)
-- Philipp Frauenfelder <pfrauenf@debian.org> Mon, 13 Nov 2000 09:53:24 +0100
plib (1.2.0-1) unstable; urgency=low
* New upstream release
-- Philipp Frauenfelder <pfrauenf@debian.org> Thu, 6 Jul 2000 08:26:30 +0200
plib (1.1.12-2) unstable; urgency=low
* Added build dependency to debhelper, closes: #66390
-- Philipp Frauenfelder <pfrauenf@debian.org> Fri, 30 Jun 2000 09:14:48 +0200
plib (1.1.12-1) unstable; urgency=low
* New upstream release
* Added build dependencies, bumped standars version number
-- Philipp Frauenfelder <pfrauenf@debian.org> Mon, 26 Jun 2000 08:26:46 +0200
plib (1.1.11-1) unstable; urgency=low
* New upstream release
-- Philipp Frauenfelder <pfrauenf@debian.org> Fri, 11 Feb 2000 18:50:09 +0100
plib (1.1.10-1) unstable; urgency=low
* New upstream release
-- Philipp Frauenfelder <pfrauenf@debian.org> Wed, 9 Feb 2000 11:00:23 +0100
plib (1.1.9-1) unstable; urgency=low
* New upstream release
-- Philipp Frauenfelder <pfrauenf@debian.org> Mon, 31 Jan 2000 15:53:27 +0100
plib (1.1.8-1) unstable; urgency=low
* New upstream release
-- Philipp Frauenfelder <pfrauenf@debian.org> Mon, 24 Jan 2000 10:33:32 +0100
plib (1.1.7-1) unstable; urgency=low
* New upstream release
-- Philipp Frauenfelder <pfrauenf@debian.org> Fri, 21 Jan 2000 08:58:04 +0100
plib (1.1.5-4) frozen unstable; urgency=low
* Update dependencies to point to new virtual package libgl1 and libgl-dev
respectively. Closes: #55128
-- Philipp Frauenfelder <pfrauenf@debian.org> Wed, 19 Jan 2000 08:03:56 +0100
plib (1.1.5-3) unstable; urgency=low
* Forgot to update the shlibs file for the strict dependencies.
-- Philipp Frauenfelder <pfrauenf@debian.org> Wed, 22 Dec 1999 16:48:04 +0100
plib (1.1.5-2) unstable; urgency=low
* Added "#include <string.h>" to src/ssg/ssg.h. Closes: #53250
-- Philipp Frauenfelder <pfrauenf@debian.org> Wed, 22 Dec 1999 09:02:58 +0100
plib (1.1.5-1) unstable; urgency=low
* New upstream release
-- Philipp Frauenfelder <pfrauenf@debian.org> Tue, 21 Dec 1999 17:46:12 +0100
plib (1.1.2-2) unstable; urgency=low
* Commented out call to dh_makeshlibs from rules file in order
to get the promised strict dependencies.
-- Philipp Frauenfelder <pfrauenf@debian.org> Fri, 12 Nov 1999 14:58:23 +0100
plib (1.1.2-1) unstable; urgency=low
* New upstream release.
* Shared libraries are in again but with strict dependencies.
Closes: #49648, #49851 (file overwrite problem due to removal
of plib-dev package which is present again).
* Upstream removed the doc and examples which are in a separate
source package but in the same binary package as before.
* Standards-Version: 3.0.1
-- Philipp Frauenfelder <pfrauenf@debian.org> Fri, 12 Nov 1999 13:55:45 +0100
plib (1.1.1-1) unstable; urgency=low
* New upstream release.
* Removed shared libraries (C++ shared libs are a Bad Thing).
-- Philipp Frauenfelder <pfrauenf@debian.org> Mon, 8 Nov 1999 08:43:23 +0100
plib (1.0.19-1) unstable; urgency=low
* New upstream release.
* Remove static dependency of libc6 from plib1. Closes: #47478.
-- Philipp Frauenfelder <pfrauenf@debian.org> Tue, 19 Oct 1999 09:07:56 +0200
plib (1.0.18-1) unstable; urgency=low
* New upstream release.
-- Philipp Frauenfelder <pfrauenf@debian.org> Thu, 7 Oct 1999 17:23:04 +0200
plib (1.0.16-2) unstable; urgency=low
* 'Depends: mesag3 | mesag3+ggi' (hope this works although I
compiled with mesag3 installed). Closes: #44817.
-- Philipp Frauenfelder <pfrauenf@debian.org> Wed, 29 Sep 1999 14:42:46 +0200
plib (1.0.16-1) unstable; urgency=low
* New upstream release.
-- Philipp Frauenfelder <pfrauenf@debian.org> Sat, 14 Aug 1999 09:26:00 +0200
plib (1.0.14-1) unstable; urgency=low
* New upstream release.
-- Philipp Frauenfelder <pfrauenf@debian.org> Sun, 8 Aug 1999 11:16:52 +0200
plib (1.0.13-1) unstable; urgency=low
* New upstream release.
* Use debhelper v2.
* Changed shared library package name from plib to plib1.
-- Philipp Frauenfelder <pfrauenf@debian.org> Sat, 17 Jul 1999 10:47:26 +0200
plib (1.0.12-1) unstable; urgency=low
* New upstream release.
-- Philipp Frauenfelder <pfrauenf@debian.org> Wed, 7 Jul 1999 18:26:32 +0200
plib (1.0.10-2) unstable; urgency=low
* Added some more documentation to /usr/doc/<package>
-- Philipp Frauenfelder <pfrauenf@debian.org> Sun, 16 May 1999 22:17:36 +0200
plib (1.0.10-1) unstable; urgency=low
* Initial Release.
-- Philipp Frauenfelder <pfrauenf@debian.org> Wed, 12 May 1999 21:10:59 +0200
Local variables:
mode: debian-changelog
End:
+1
View File
@@ -0,0 +1 @@
8
+40
View File
@@ -0,0 +1,40 @@
Source: plib
Section: devel
Priority: extra
Maintainer: Bradley Smith <bradsmith@debian.org>
Standards-Version: 3.8.1
Build-Depends: libgl1-mesa-dev | libgl-dev, freeglut3-dev, libx11-dev, libxmu-dev, debhelper (>= 7), libxi-dev, quilt, autoconf, automake, libtool
Homepage: http://plib.sourceforge.net/
Vcs-Git: http://git.brad-smith.co.uk/git/debian/pkg-plib.git
Vcs-Browser: http://git.brad-smith.co.uk/?p=debian/pkg-plib.git
Package: libplib1
Section: libs
Architecture: any
Depends: freeglut3, libgl1-mesa-glx | libgl1, ${misc:Depends}, ${shlibs:Depends}
Conflicts: plib1.8.4c2
Replaces: plib1.8.4c2
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
graph API built on top of OpenGL.
.
This package provides the shared libraries. It should be installed
automatically by packages which need it.
Package: libplib-dev
Section: libdevel
Architecture: any
Depends: libplib1 (= ${binary:Version}), freeglut3-dev, libgl1-mesa-dev | libgl-dev, ${misc:Depends}
Conflicts: plib1.8.4-dev
Replaces: plib1.8.4-dev
Provides: plib1.8.4-dev
Description: Portability Libraries: Development package
Provides a Joystick interface, a simple GUI built on top of OpenGL,
some standard geometry functions, a sound library and a simple scene
graph API built on top of OpenGL.
.
This package provides the static libraries, the header files and the
development links to the shared libraries. You need this package if you
want to compile software which needs plib.
+46
View File
@@ -0,0 +1,46 @@
Author: Steve Baker, <sjbaker1@airmail.net>
Download: http://plib.sourceforge.net/dist/
Files: *
Copyright: (C) 1998,2002 Steve Baker
License: LGPL-2+
This package is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published by
the Free Software Foundation; either version 2 of the License, or (at your
option) any later version.
.
This package is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
License for more details.
.
License addendum for release 1.3.1 and later:
| As a special exception Steve Baker gives permission to link these
| libraries with proprietary software and distribute the resulting
| executable without including that proprietary code in any distribution
| as the LGPL would normally dictate.
|
| This exception is ONLY granted in the case of an embedded system in
| which there is no possibility of an end user re-linking or recompiling
| against new versions of this library that may appear in the future.
Files: debian/*
Copyright: (C) 2008 Bradley Smith <brad@brad-smith.co.uk>
License: GPL-2+.
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 the Free
Software Foundation; either version 2 of the License, or (at your option)
any later version.
.
This program is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
for more details.
On Debian systems, the complete text of the GNU General Public License
can be found in `/usr/share/common-licenses/GPL-2'.
On Debian GNU/Linux systems, the complete text of the GNU Lesser General
Public License can be found in `/usr/share/common-licenses/LGPL-2'.
+9
View File
@@ -0,0 +1,9 @@
AUTHORS
NOTICE
README
README.GLUT
TODO-1.6
TODO-2.0
TODO_AFTER135
KNOWN_BUGS
+5
View File
@@ -0,0 +1,5 @@
debian/tmp/usr/include
debian/tmp/usr/lib/*.la
debian/tmp/usr/lib/*.a
debian/tmp/usr/lib/*.so
+2
View File
@@ -0,0 +1,2 @@
debian/tmp/usr/lib/*.so.*
+2
View File
@@ -0,0 +1,2 @@
libplib1: package-name-doesnt-match-sonames libplibfnt1 libplibjs1 libplibnet1 libplibpsl1 libplibpu1 libplibpuaux1 libplibpw1 libplibsg1 libplibsl1 libplibsm1 libplibssg1 libplibssgaux1 libplibul1
+48
View File
@@ -0,0 +1,48 @@
Index: plib/src/js/jsBSD.cxx
===================================================================
--- plib.orig/src/js/jsBSD.cxx 2009-06-09 18:18:17.000000000 +0100
+++ plib/src/js/jsBSD.cxx 2009-12-14 22:12:02.000000000 +0000
@@ -47,7 +47,7 @@
#include <string.h>
#include <errno.h>
#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
Index: plib/src/sl/slDSP.cxx
===================================================================
--- plib.orig/src/sl/slDSP.cxx 2009-06-09 18:18:17.000000000 +0100
+++ plib/src/sl/slDSP.cxx 2009-12-14 22:12:02.000000000 +0000
@@ -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 )
{
Index: plib/src/sl/slPortability.h
===================================================================
--- plib.orig/src/sl/slPortability.h 2009-06-09 18:18:17.000000000 +0100
+++ plib/src/sl/slPortability.h 2009-12-14 22:12:02.000000000 +0000
@@ -59,7 +59,7 @@
# if defined(UL_LINUX)
# include <linux/soundcard.h>
# include <sys/ioctl.h>
-# elif defined(__FreeBSD__)
+# elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
# include <sys/soundcard.h>
# else
/*
@@ -75,7 +75,7 @@
#endif
#ifdef UL_BSD
-#ifndef __FreeBSD__
+#if !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__)
# include <sys/audioio.h>
#endif
#endif
+57
View File
@@ -0,0 +1,57 @@
--- a/src/js/jsNone.cxx
+++ b/src/js/jsNone.cxx
@@ -22,7 +22,7 @@
#include "js.h"
-#if defined(UL_IRIX) || defined(UL_SOLARIS) || defined (UL_HPUX)
+#if defined(UL_IRIX) || defined(UL_SOLARIS) || defined (UL_HPUX) || defined(UL_GNU)
struct os_specific_s ;
--- a/src/util/ul.h
+++ b/src/util/ul.h
@@ -92,6 +92,10 @@
#define UL_HPUX 1
+#elif defined(__GNU__)
+
+#define UL_GNU 1
+
#elif (defined(__unix__) || defined(unix)) && !defined(USG)
#define UL_BSD 1
@@ -144,6 +148,12 @@
#define UL_GLX 1
#endif
+#ifdef UL_GNU
+#include <unistd.h>
+#include <dlfcn.h>
+#define UL_GLX 1
+#endif
+
#include <assert.h>
#include <limits.h>
#include <math.h>
--- a/src/sl/slPortability.h
+++ b/src/sl/slPortability.h
@@ -51,7 +51,7 @@
#include <limits.h>
#include <math.h>
-#if (defined(UL_LINUX) || defined(UL_BSD)) && !defined(__NetBSD__)
+#if (defined(UL_LINUX) || defined(UL_BSD) || defined(UL_GNU)) && !defined(__NetBSD__)
#define SL_USING_OSS_AUDIO 1
#endif
@@ -59,7 +59,7 @@
# if defined(UL_LINUX)
# include <linux/soundcard.h>
# include <sys/ioctl.h>
-# elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+# elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(UL_GNU)
# include <sys/soundcard.h>
# else
/*
+287
View File
@@ -0,0 +1,287 @@
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
@@ -36,7 +36,7 @@
AC_PROG_CXX
AC_PROG_CXXCPP
AC_PROG_INSTALL
-AC_PROG_RANLIB
+AC_PROG_LIBTOOL
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
@@ -1,10 +1,12 @@
if BUILD_FNT
-lib_LIBRARIES = libplibfnt.a
+lib_LTLIBRARIES = libplibfnt.la
include_HEADERS = fnt.h
-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 = -version-info 9:5: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
@@ -1,12 +1,15 @@
if BUILD_JS
-lib_LIBRARIES = libplibjs.a
+lib_LTLIBRARIES = libplibjs.la
include_HEADERS = js.h
-libplibjs_a_SOURCES = js.cxx jsLinux.cxx jsLinuxOld.cxx jsMacOS.cxx \
+libplibjs_la_SOURCES = js.cxx jsLinux.cxx jsLinuxOld.cxx jsMacOS.cxx \
jsMacOSX.cxx jsWindows.cxx jsBSD.cxx \
jsNone.cxx
+libplibjs_la_LIBADD = ../util/libplibul.la
+libplibjs_la_LDFLAGS = -version-info 9:5: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
@@ -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
@@ -1,12 +1,14 @@
if BUILD_NET
-lib_LIBRARIES = libplibnet.a
+lib_LTLIBRARIES = libplibnet.la
include_HEADERS = netBuffer.h netChannel.h netChat.h netMessage.h \
netMonitor.h netSocket.h net.h
-libplibnet_a_SOURCES = netBuffer.cxx netChannel.cxx netChat.cxx \
+libplibnet_la_SOURCES = netBuffer.cxx netChannel.cxx netChat.cxx \
netMessage.cxx netMonitor.cxx netSocket.cxx
+libplibnet_la_LIBADD = ../util/libplibul.la
+libplibnet_la_LDFLAGS = -version-info 9:5: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
@@ -1,16 +1,18 @@
if BUILD_PSL
-lib_LIBRARIES = libplibpsl.a
+lib_LTLIBRARIES = libplibpsl.la
include_HEADERS = psl.h
-libplibpsl_a_SOURCES = psl.cxx pslCodeGen.cxx pslContext.cxx \
+libplibpsl_la_SOURCES = psl.cxx pslCodeGen.cxx pslContext.cxx \
pslCompiler.cxx pslSymbols.cxx pslToken.cxx \
pslExpression.cxx pslProgram.cxx pslDump.cxx \
pslError.cxx pslFileIO.cxx pslCompiler.h \
pslContext.h pslFileIO.h pslLocal.h \
pslOpcodes.h pslSymbol.h
+libplibpsl_la_LIBADD = ../util/libplibul.la
+libplibpsl_la_LDFLAGS = -version-info 9:5: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
@@ -1,10 +1,10 @@
if BUILD_PUAUX
-lib_LIBRARIES = libplibpuaux.a
+lib_LTLIBRARIES = libplibpuaux.la
include_HEADERS = puAux.h puAuxLocal.h
-libplibpuaux_a_SOURCES = puAux.cxx \
+libplibpuaux_la_SOURCES = puAux.cxx \
puAuxBiSlider.cxx \
puAuxBiSliderWithEnds.cxx \
puAuxComboBox.cxx \
@@ -19,6 +19,9 @@
puAuxTriSlider.cxx \
puAuxVerticalMenu.cxx \
puAuxChooser.cxx
+libplibpuaux_la_LIBADD = ../util/libplibul.la ../pui/libplibpu.la \
+ ../fnt/libplibfnt.la ../sg/libplibsg.la
+libplibpuaux_la_LDFLAGS = -version-info 9:5: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
@@ -1,10 +1,10 @@
if BUILD_PUI
-lib_LIBRARIES = libplibpu.a
+lib_LTLIBRARIES = libplibpu.la
include_HEADERS = pu.h puGLUT.h puFLTK.h puSDL.h puNative.h puPW.h
-libplibpu_a_SOURCES = \
+libplibpu_la_SOURCES = \
pu.cxx puBox.cxx puButton.cxx puButtonBox.cxx \
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
+libplibpu_la_LIBADD = ../util/libplibul.la ../fnt/libplibfnt.la
+libplibpu_la_LDFLAGS = -version-info 9:5: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
@@ -1,10 +1,11 @@
if BUILD_PW
-lib_LIBRARIES = libplibpw.a
+lib_LTLIBRARIES = libplibpw.la
include_HEADERS = pw.h
-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 = -version-info 9:5: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
@@ -1,12 +1,14 @@
if BUILD_SG
-lib_LIBRARIES = libplibsg.a
+lib_LTLIBRARIES = libplibsg.la
include_HEADERS = sg.h
-libplibsg_a_SOURCES = sg.cxx sgd.cxx \
+libplibsg_la_SOURCES = sg.cxx sgd.cxx \
sgIsect.cxx sgdIsect.cxx \
sgPerlinNoise.cxx
+libplibsg_la_LIBADD = ../util/libplibul.la
+libplibsg_la_LDFLAGS = -version-info 9:5: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
@@ -1,16 +1,19 @@
if BUILD_SL
-lib_LIBRARIES = libplibsl.a libplibsm.a
+lib_LTLIBRARIES = libplibsl.la libplibsm.la
include_HEADERS = sl.h slPortability.h sm.h
-libplibsl_a_SOURCES = \
+libplibsl_la_SOURCES = \
slDSP.cxx slSample.cxx slEnvelope.cxx \
slPlayer.cxx slMODPlayer.cxx slSamplePlayer.cxx \
slScheduler.cxx slMODdacio.cxx slMODfile.cxx \
slMODinst.cxx slMODnote.cxx slMODPrivate.h slMODfile.h
+libplibsl_la_LIBADD = ../util/libplibul.la
+libplibsl_la_LDFLAGS = -version-info 9:5:8
-libplibsm_a_SOURCES = slPortability.h smMixer.cxx
+libplibsm_la_SOURCES = slPortability.h smMixer.cxx
+libplibsm_la_LDFLAGS = -version-info 9:5: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
@@ -1,10 +1,10 @@
if BUILD_SSG
-lib_LIBRARIES = libplibssg.a
+lib_LTLIBRARIES = libplibssg.la
include_HEADERS = ssg.h ssgconf.h ssgMSFSPalette.h ssgKeyFlier.h pcx.h
-libplibssg_a_SOURCES = ssg.cxx ssgAnimation.cxx ssgBase.cxx \
+libplibssg_la_SOURCES = ssg.cxx ssgAnimation.cxx ssgBase.cxx \
ssgBaseTransform.cxx ssgBranch.cxx ssgContext.cxx ssgCutout.cxx \
ssgDList.cxx ssgEntity.cxx ssgIsect.cxx ssgLeaf.cxx ssgList.cxx \
ssgLoadDOF.cxx ssgLoadAC.cxx \
@@ -28,6 +28,8 @@
ssgLoadMDL_BGLTexture.cxx ssgLoadXPlaneObj.cxx ssgLoadASC.cxx ssgSaveASC.cxx \
ssgSaveIV.cxx ssgAnimTransform.cxx\
ssgVertSplitter.h ssgVertSplitter.cxx ssgStatistics.cxx
+libplibssg_la_LIBADD = ../util/libplibul.la ../sg/libplibsg.la
+libplibssg_la_LDFLAGS = -version-info 9:5: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
@@ -1,6 +1,6 @@
if BUILD_SSGAUX
-lib_LIBRARIES = libplibssgaux.a
+lib_LTLIBRARIES = libplibssgaux.la
include_HEADERS = ssgAux.h \
ssgaShapes.h \
@@ -13,7 +13,7 @@
ssgaFire.h \
ssgaBillboards.h
-libplibssgaux_a_SOURCES = ssgAux.cxx \
+libplibssgaux_la_SOURCES = ssgAux.cxx \
ssgaShapes.cxx \
ssgaPatch.cxx \
ssgaParticleSystem.cxx \
@@ -30,6 +30,9 @@
ssgaSky.cxx \
ssgaTeapot.cxx \
ssgaBillboards.cxx
+libplibssgaux_la_LIBADD = ../util/libplibul.la ../ssg/libplibssg.la \
+ ../sg/libplibsg.la
+libplibssgaux_la_LDFLAGS = -version-info 9:5: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
@@ -1,11 +1,12 @@
if BUILD_UL
-lib_LIBRARIES = libplibul.a
+lib_LTLIBRARIES = libplibul.la
include_HEADERS = ul.h ulRTTI.h
-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 = -version-info 9:5:8
endif
+12
View File
@@ -0,0 +1,12 @@
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 20:05:09.000000000 +0100
+++ plib-1.8.5/configure.in 2008-04-17 20:04:50.000000000 +0100
@@ -286,7 +286,7 @@
dnl Reasonable stuff non-windoze variants ... :-)
- AC_CHECK_LIB(pthread, pthread_create)
+# AC_CHECK_LIB(pthread, pthread_create)
AC_CHECK_LIB(GL, glNewList)
if test "x$ac_cv_lib_GL_glNewList" = "xno" ; then
dnl if no GL, check for MesaGL
+5
View File
@@ -0,0 +1,5 @@
00_fix_kfreebsd_FTBFS.diff
01_fix_hurd_FTBFS.diff
02_build_shared_libs.diff
03_remove_pthread_link.diff
+78
View File
@@ -0,0 +1,78 @@
#!/usr/bin/make -f
include /usr/share/quilt/quilt.make
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
CFLAGS = -Wall
LDFLAGS = -Wl,--as-needed
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
CFLAGS += -O0
else
CFLAGS += -O2
endif
ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
MAKEFLAGS += -j$(NUMJOBS)
endif
configure: configure-stamp
configure-stamp: $(QUILT_STAMPFN)
dh_testdir
autoreconf -i
LDFLAGS="$(LDFLAGS)" CFLAGS="$(CFLAGS)" \
./configure --prefix=/usr \
--host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE)
touch "$@"
build: build-stamp
build-stamp: configure
dh_testdir
$(MAKE)
touch $@
pre-clean:
[ ! -f Makefile ] || $(MAKE) maintainer-clean
clean: pre-clean unpatch
dh_testdir
dh_testroot
rm -f build-stamp configure-stamp
find . -name "Makefile.in" | xargs rm -f
rm -f configure ltmain.sh aclocal.m4 config.sub config.guess
dh_clean
install: build
dh_testdir
dh_testroot
dh_prep
$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp/
mkdir -p debian/libplib1/usr/share/lintian/overrides/
cp -a debian/libplib1.lintian-overrides \
debian/libplib1/usr/share/lintian/overrides/libplib1
binary-indep: build install
binary-arch: build install
dh_testdir
dh_testroot
dh_installdirs
dh_installdocs
dh_install --fail-missing
dh_installchangelogs ChangeLog
dh_link
dh_strip
dh_compress
dh_fixperms
dh_makeshlibs -V 'libplib1 (>= 1.8.5-1)'
dh_shlibdeps
dh_installdeb
dh_gencontrol
dh_md5sums
dh_builddeb
binary: binary-indep binary-arch
.PHONY: build clean binary-indep binary-arch binary install patch unpatch pre-clean configure