glbsp (2.24-1) debian-dir only changes

Summary

 debian/changelog            |   64 +++++++++++++++++++++++++++++
 debian/compat               |    1 
 debian/control              |   48 +++++++++++++++++++++
 debian/copyright            |   25 +++++++++++
 debian/dirs                 |    1 
 debian/docs                 |    4 +
 debian/glbsp.install        |    1 
 debian/glbsp.manpages       |    1 
 debian/libglbsp-dev.dirs    |    2 
 debian/libglbsp-dev.install |    4 +
 debian/libglbsp3.dirs       |    1 
 debian/libglbsp3.install    |    1 
 debian/makefile             |   79 +++++++++++++++++++++++++++++++++++
 debian/rules                |   97 ++++++++++++++++++++++++++++++++++++++++++++
 debian/version.ld           |   12 +++++
 15 files changed, 341 insertions(+)

    
download this patch

Patch contents

--- glbsp-2.24.orig/debian/libglbsp-dev.install
+++ glbsp-2.24/debian/libglbsp-dev.install
@@ -0,0 +1,4 @@
+debian/tmp/usr/include/glbsp.h
+debian/tmp/usr/include/glbsp/glbsp.h
+debian/tmp/usr/lib/lib*.a
+debian/tmp/usr/lib/lib*.so
--- glbsp-2.24.orig/debian/copyright
+++ glbsp-2.24/debian/copyright
@@ -0,0 +1,25 @@
+This package was debianized by Darren Salt <linux@youmustbejoking.demon.co.uk> on
+Sun, 26 Oct 2003 16:56:50 +0000.
+
+It was downloaded from http://glbsp.sourceforge.net/
+
+Upstream Author: Andrew Apted <ajapted@users.sourceforge.net>
+
+  Based on BSP 2.3, (C) Colin Reed and Lee Killough, which was created from
+  the basic theory stated in DEU5 (OBJECTS.C) by Raphael Quinet.
+
+  The GUI version (glBSPX) is based in part on the work of the FLTK
+  project, see http://www.fltk.org.
+
+  All trademarks are the propriety of their owners.
+
+Copyright: (c) 2000-2005 Andrew Apted
+	   (c) Andy Baker
+	   BSP 2.3 (c) Lee Killough, Colin Reed
+	   (See also README.txt)
+
+Licence:
+  GPL version 2 or later. See /usr/share/common-licenses/GPL
+
+This packaging was created by Darren Salt
+<linux@youmustbejoking.demon.co.uk> and is licensed under GPL v2 or later.
\ No newline at end of file
--- glbsp-2.24.orig/debian/rules
+++ glbsp-2.24/debian/rules
@@ -0,0 +1,97 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+# GNU copyright 1997 to 1999 by Joey Hess.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+CC = $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)-gcc
+CFLAGS = -Wall -g
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+	CFLAGS += -O0
+else
+	CFLAGS += -O2
+endif
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+	INSTALL_PROGRAM += -s
+endif
+
+# shared library versions
+version=3.0.0
+major=3
+
+export CC
+export CFLAGS
+export version
+export major
+
+configure: configure-stamp
+configure-stamp:
+	dh_testdir
+	touch configure-stamp
+
+
+build: build-stamp
+build-stamp: configure-stamp
+	dh_testdir
+	$(MAKE) -f debian/makefile
+	touch build-stamp
+
+clean:
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp configure-stamp
+	$(MAKE) -f debian/makefile clean
+	dh_clean
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+	$(MAKE) -f debian/makefile install DESTDIR=$(CURDIR)/debian/tmp
+
+# Build architecture-independent files here.
+binary-indep: build install
+# We have nothing to do by default.
+
+# Build architecture-dependent files here.
+binary-arch: build install
+	dh_testdir
+	dh_testroot
+	dh_installchangelogs CHANGES.txt
+	dh_installdocs
+	rm -rf debian/*/usr/share/doc/libglbsp-dev debian/*/usr/share/doc/glbsp
+	install -d debian/libglbsp-dev/usr/share/doc debian/glbsp/usr/share/doc
+	ln -s libglbsp$(major) debian/libglbsp-dev/usr/share/doc/libglbsp-dev
+	ln -s libglbsp$(major) debian/glbsp/usr/share/doc/glbsp
+#	dh_installexamples
+	dh_install
+#	dh_installmenu
+#	dh_installdebconf	
+#	dh_installlogrotate
+#	dh_installemacsen
+#	dh_installpam
+#	dh_installmime
+#	dh_installinit
+#	dh_installcron
+#	dh_installinfo
+	dh_installman
+	dh_link
+	dh_strip
+	dh_compress
+	dh_fixperms
+#	dh_perl
+#	dh_python
+	dh_makeshlibs -V
+	dh_installdeb
+	dh_shlibdeps -L libglbsp$(major) -l debian/libglbsp$(major)/usr/lib
+#	sed -i -e 's/libglbsp'$(major)'/& (>= $${source:Version})/' debian/glbsp.substvars
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install configure
--- glbsp-2.24.orig/debian/libglbsp-dev.dirs
+++ glbsp-2.24/debian/libglbsp-dev.dirs
@@ -0,0 +1,2 @@
+usr/lib
+usr/include
--- glbsp-2.24.orig/debian/compat
+++ glbsp-2.24/debian/compat
@@ -0,0 +1 @@
+4
--- glbsp-2.24.orig/debian/version.ld
+++ glbsp-2.24/debian/version.ld
@@ -0,0 +1,12 @@
+{
+  global:
+    default_buildinfo;
+    default_buildcomms;
+    GlbspParseArgs;
+    GlbspCheckInfo;
+    GlbspBuildNodes;
+    GlbspStrDup;
+    GlbspFree;
+  local:
+    *;
+};
--- glbsp-2.24.orig/debian/dirs
+++ glbsp-2.24/debian/dirs
@@ -0,0 +1 @@
+usr/bin
--- glbsp-2.24.orig/debian/control
+++ glbsp-2.24/debian/control
@@ -0,0 +1,48 @@
+Source: glbsp
+Section: utils
+Priority: optional
+Maintainer: Darren Salt <linux@youmustbejoking.demon.co.uk>
+Build-Depends: debhelper (>= 4.0.0), zlib1g-dev | libz-dev
+Standards-Version: 3.7.3
+
+Package: libglbsp-dev
+Section: libdevel
+Architecture: any
+Depends: libglbsp3 (>= ${source:Version})
+Description: node builder library for OpenGL-based Doom-style games (headers)
+ glBSP is a node builder specially designed to be used with OpenGL ports of
+ the DOOM game engine. It adheres to the "GL-Friendly Nodes" specification,
+ which means it adds some new special nodes to a WAD file that makes it very
+ easy (and fast!) for an OpenGL DOOM engine to compute the polygons needed
+ for drawing the levels.
+ .
+ There are many DOOM ports that understand the GL Nodes which glBSP creates,
+ including EDGE, the Doomsday engine (JDOOM), Doom3D, PrBoom, and Vavoom.
+
+Package: libglbsp3
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: node builder library for OpenGL-based Doom-style games
+ glBSP is a node builder specially designed to be used with OpenGL ports of
+ the DOOM game engine. It adheres to the "GL-Friendly Nodes" specification,
+ which means it adds some new special nodes to a WAD file that makes it very
+ easy (and fast!) for an OpenGL DOOM engine to compute the polygons needed
+ for drawing the levels.
+ .
+ There are many DOOM ports that understand the GL Nodes which glBSP creates,
+ including EDGE, the Doomsday engine (JDOOM), Doom3D, PrBoom, and Vavoom.
+
+Package: glbsp
+Section: utils
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: nodes builder for Doom-style games; has support for OpenGL
+ glBSP is a node builder specially designed to be used with OpenGL ports of
+ the DOOM game engine. It adheres to the "GL-Friendly Nodes" specification,
+ which means it adds some new special nodes to a WAD file that makes it very
+ easy (and fast!) for an OpenGL DOOM engine to compute the polygons needed
+ for drawing the levels.
+ .
+ There are many DOOM ports that understand the GL Nodes which glBSP creates,
+ including EDGE, the Doomsday engine (JDOOM), Doom3D, PrBoom, and Vavoom.
--- glbsp-2.24.orig/debian/libglbsp3.install
+++ glbsp-2.24/debian/libglbsp3.install
@@ -0,0 +1 @@
+debian/tmp/usr/lib/lib*.so.*
--- glbsp-2.24.orig/debian/glbsp.manpages
+++ glbsp-2.24/debian/glbsp.manpages
@@ -0,0 +1 @@
+glbsp.1
--- glbsp-2.24.orig/debian/changelog
+++ glbsp-2.24/debian/changelog
@@ -0,0 +1,64 @@
+glbsp (2.24-1) unstable; urgency=low
+
+  * New upstream release.
+  * Bumped the lib soname and the library package name due to one silly
+    little binary incompatibility caused by changes in an exported struct.
+    (Safe; nothing else currently in the archive has ever used libglbsp2.)
+  * Removed my patches since they're all applied upstream.
+  * Updated the list of documentation files.
+  * Build-time changes:
+    - Switched from dh_movefiles to dh_install.
+    - Updated my makefile to cope with upstream changes.
+    - Corrected for debian-rules-ignores-make-clean-error.
+    - Corrected for substvar-source-version-is-deprecated.
+    - Link libglbsp, rather than glbsp, with libm and libz.
+  * Fixed shlibdeps. (Closes: #460387)
+  * Bumped standards version to 3.7.3 (no other changes).
+
+ -- Darren Salt <linux@youmustbejoking.demon.co.uk>  Wed, 30 Jan 2008 13:33:49 +0000
+
+glbsp (2.20-4) unstable; urgency=low
+
+  * Uploaded to Debian (closes: #368221)
+  * Bumped standards version to 3.7.2 (no other changes).
+  * Converted to dpatch.
+  * Added a patch to fix assumption about map data lump order, allowing
+    correct processing of an example WAD supplied by Jon Dowland.
+  * Added a patch to get rid of sprintf(), vsprintf(), strcpy() and strcat(),
+    preferring the likes of asprintf(), where there is the possibility of
+    buffer overflow.
+
+ -- Darren Salt <linux@youmustbejoking.demon.co.uk>  Sun, 13 Aug 2006 12:38:26 +0100
+
+glbsp (2.20-3) unstable; urgency=low
+
+  * Tweaked the package descriptions slightly.
+
+ -- Darren Salt <linux@youmustbejoking.demon.co.uk>  Sat, 20 May 2006 17:46:06 +0100
+
+glbsp (2.20-2) unstable; urgency=low
+
+  * Moved glbsp.h into /usr/include/glbsp/; symlink in the old location.
+
+ -- Darren Salt <linux@youmustbejoking.demon.co.uk>  Thu, 26 Jan 2006 00:10:58 +0000
+
+glbsp (2.20-1) unstable; urgency=low
+
+  * New upstream release.
+  * Added a version script to remove namespace pollution.
+
+ -- Darren Salt <linux@youmustbejoking.demon.co.uk>  Sun, 18 Sep 2005 18:59:53 +0100
+
+glbsp (2.10c-1) unstable; urgency=low
+
+  * New upstream release.
+  * Removed debian/glbsp.1.
+
+ -- Darren Salt <linux@youmustbejoking.demon.co.uk>  Fri, 01 Oct 2004 21:59:41 +0100
+
+glbsp (2.05-1) unstable; urgency=low
+
+  * Initial Release.
+
+ -- Darren Salt <linux@youmustbejoking.demon.co.uk>  Thu, 05 Feb 2004 20:00:15 +0000
+
--- glbsp-2.24.orig/debian/makefile
+++ glbsp-2.24/debian/makefile
@@ -0,0 +1,79 @@
+COMMONFLAGS = -DUNIX -DINLINE_G=inline -D_GNU_SOURCE
+CMD_FLAGS = -DGLBSP_TEXT $(COMMONFLAGS)
+LIB_FLAGS = -DGLBSP_PLUGIN $(COMMONFLAGS)
+AR = ar rc
+RANLIB = ranlib
+
+version ?= 3.0.0
+major ?= 3
+CFLAGS ?= -O2 -Wall
+
+LIB_OBJS=\
+	analyze.o  \
+	blockmap.o \
+	glbsp.o    \
+	level.o    \
+	node.o     \
+	reject.o   \
+	seg.o      \
+	system.o   \
+	util.o     \
+	wad.o
+
+LIB_LIBS = -lm -lz
+
+SHARED_OBJS=$(addprefix shared/,$(LIB_OBJS))
+STATIC_OBJS=$(addprefix static/,$(LIB_OBJS))
+
+CMD_OBJS=display.o main.o
+
+all: libglbsp.so.$(version) libglbsp.a glbsp
+
+clean:
+	rm -rf libglbsp.* shared static glbsp cmdline/*.o
+
+shared static:
+	mkdir -p $@
+	cd $@ && ln -s ../src/*.[ch] .
+
+libglbsp.so.$(version): shared/libglbsp.so
+	ln -s $< $@
+shared/libglbsp.so: shared
+	$(MAKE) -C shared -f ../debian/makefile libglbsp.so \
+		CFLAGS="$(CFLAGS) $(LIB_FLAGS) -shared -fPIC"
+libglbsp.so: $(LIB_OBJS)
+	$(CC) $^ -o $@ $(LIB_LIBS) -shared -fPIC -Wl,-soname,$@.$(major) \
+		-Wl,--version-script=../debian/version.ld
+
+libglbsp.a: static/libglbsp.o
+	ln $< $@
+static/libglbsp.o: static
+	$(MAKE) -C static -f ../debian/makefile libglbsp.o \
+		CFLAGS="$(CFLAGS) $(LIB_FLAGS) -static"
+libglbsp.o: $(LIB_OBJS)
+	$(AR) $@ $^
+	$(RANLIB) $@
+
+glbsp: cmdline/_glbsp.o libglbsp.so.$(version)
+	$(CC) $^ -o $@
+cmdline/_glbsp.o:
+	$(MAKE) -C cmdline -f ../debian/makefile _glbsp.o \
+		CFLAGS="-I../src $(CFLAGS) $(CMD_FLAGS)"
+_glbsp.o: $(CMD_OBJS)
+	$(AR) $@ $^
+	$(RANLIB) $@
+
+install: all
+	install -d $(DESTDIR)/usr/bin
+	install -d $(DESTDIR)/usr/include/glbsp
+	install -d $(DESTDIR)/usr/lib
+	install libglbsp.so.$(version) libglbsp.a $(DESTDIR)/usr/lib
+	ln -s libglbsp.so.$(version) $(DESTDIR)/usr/lib/libglbsp.so.$(major)
+	ln -s libglbsp.so.$(major) $(DESTDIR)/usr/lib/libglbsp.so
+	install glbsp $(DESTDIR)/usr/bin
+	install -m644 src/glbsp.h $(DESTDIR)/usr/include/glbsp
+	ln -s glbsp/glbsp.h $(DESTDIR)/usr/include/glbsp.h
+
+.PHONY: all clean
+
+.NOTPARALLEL:
--- glbsp-2.24.orig/debian/glbsp.install
+++ glbsp-2.24/debian/glbsp.install
@@ -0,0 +1 @@
+debian/tmp/usr/bin/glbsp
--- glbsp-2.24.orig/debian/libglbsp3.dirs
+++ glbsp-2.24/debian/libglbsp3.dirs
@@ -0,0 +1 @@
+usr/lib
--- glbsp-2.24.orig/debian/docs
+++ glbsp-2.24/debian/docs
@@ -0,0 +1,4 @@
+AUTHORS.txt
+README.txt
+TRICKS.txt
+USAGE.txt