r6535 - packages/trunk/plib-doc/debian

Bradley Smith brad-guest at alioth.debian.org
Sun Apr 13 13:26:29 UTC 2008


Author: brad-guest
Date: 2008-04-13 13:26:29 +0000 (Sun, 13 Apr 2008)
New Revision: 6535

Added:
   packages/trunk/plib-doc/debian/compat
Removed:
   packages/trunk/plib-doc/debian/postinst
   packages/trunk/plib-doc/debian/postrm
Modified:
   packages/trunk/plib-doc/debian/README.Debian
   packages/trunk/plib-doc/debian/changelog
   packages/trunk/plib-doc/debian/control
   packages/trunk/plib-doc/debian/copyright
   packages/trunk/plib-doc/debian/dirs
   packages/trunk/plib-doc/debian/doc-base
   packages/trunk/plib-doc/debian/install
   packages/trunk/plib-doc/debian/rules
   packages/trunk/plib-doc/debian/watch
Log:
* Tidy up debian/rules.
* Tidy up debian/control.
* Move html docs into debian dir.
* Rename binary package to libplib-doc.
* Correct doc-base section.
* Change way examples build.
* Correct README.Debian.

Modified: packages/trunk/plib-doc/debian/README.Debian
===================================================================
--- packages/trunk/plib-doc/debian/README.Debian	2008-04-13 12:52:14 UTC (rev 6534)
+++ packages/trunk/plib-doc/debian/README.Debian	2008-04-13 13:26:29 UTC (rev 6535)
@@ -6,25 +6,24 @@
 If you want to try some of the examples, you should copy all of them into
 a separate directory (eg. /tmp/plib-doc):
 
-$ cd /usr/share/doc/plib-doc
 $ mkdir /tmp/plib-doc
-$ cp -a examples /tmp/plib-doc
-$ cd configuration
-$ cp install-sh* config.status* configure.in* /tmp/plib-doc
 $ cd /tmp/plib-doc
-$ touch mkinstalldirs missing
-$ mv examples src
-$ echo "am--refresh:" > Makefile
+$ cp -a /usr/share/doc/libplib-doc/examples ./src
+$ cp -a /usr/share/doc/libplib-doc/configuration/* .
 
 And then unzip the compressed files
 
 $ find . -name '*.gz' -exec gunzip {} \;
 
+Then run autoreconf.
+
+$ touch NEWS README AUTHORS ChangeLog
+$ autoreconf -i
+
 And compile the examples
 
-$ cd src
+$ ./configure
 $ make
 
-You can also cd into one of the subdirectories and run make there.
-
  -- Philipp Frauenfelder <pfrauenf at debian.org>, Sat, 19 Oct 2002 16:08:11 +0200
+Adjusted, Bradley Smith <brad at brad-smith.co.uk>, Sun, 13, Apr 2008 11:56:00 +0100

Modified: packages/trunk/plib-doc/debian/changelog
===================================================================
--- packages/trunk/plib-doc/debian/changelog	2008-04-13 12:52:14 UTC (rev 6534)
+++ packages/trunk/plib-doc/debian/changelog	2008-04-13 13:26:29 UTC (rev 6535)
@@ -1,6 +1,12 @@
 plib-doc (1.8.5-2) UNRELEASED; urgency=low
 
-  * Tidy up.
+  * Tidy up debian/rules.
+  * Tidy up debian/control.
+  * Move html docs into debian dir.
+  * Rename binary package to libplib-doc.
+  * Correct doc-base section.
+  * Change way examples build.
+  * Correct README.Debian.
 
  -- Bradley Smith <brad at brad-smith.co.uk>  Sat, 12 Apr 2008 14:48:43 +0100
 

Added: packages/trunk/plib-doc/debian/compat
===================================================================
--- packages/trunk/plib-doc/debian/compat	                        (rev 0)
+++ packages/trunk/plib-doc/debian/compat	2008-04-13 13:26:29 UTC (rev 6535)
@@ -0,0 +1 @@
+5

Modified: packages/trunk/plib-doc/debian/control
===================================================================
--- packages/trunk/plib-doc/debian/control	2008-04-13 12:52:14 UTC (rev 6534)
+++ packages/trunk/plib-doc/debian/control	2008-04-13 13:26:29 UTC (rev 6535)
@@ -2,14 +2,20 @@
 Section: doc
 Priority: extra
 Maintainer: Bradley Smith <brad at brad-smith.co.uk>
-Build-Depends: debhelper (>= 4)
-Build-Depends-Indep: debhelper (>= 4), plib1.8.5-dev | plib-dev, m4, autoconf, automake1.9, xlibmesa-gl-dev | libgl-dev, freeglut3-dev, imagemagick, libx11-dev, libxmu-dev, libxi-dev
-Build-Conflicts: autoconf2.13, automake1.4
+Build-Depends: debhelper (>= 5)
+Build-Depends-Indep: imagemagick
 Standards-Version: 3.7.3
 
-Package: plib-doc
+Package: libplib-doc
 Architecture: all
-Suggests: plib-dev (>> 1.8.0), g++, libxi-dev, libxmu-dev
+Suggests: libplib-dev (>= 1.8.5),
+          g++,
+          autoconf,
+          automake,
+          libxi-dev,
+          libxmu-dev
+Conflicts: plib-doc
+Replaces: plib-doc
 Description: Portability Libraries: documentation and examples
  The Portability Libraries plib provide a Joystick interface, a
  simple GUI built on top of OpenGL, some standard geometry functions,

Modified: packages/trunk/plib-doc/debian/copyright
===================================================================
--- packages/trunk/plib-doc/debian/copyright	2008-04-13 12:52:14 UTC (rev 6534)
+++ packages/trunk/plib-doc/debian/copyright	2008-04-13 13:26:29 UTC (rev 6535)
@@ -1,13 +1,16 @@
 This package was debianized by Philipp Frauenfelder <pfrauenf at debian.org> on
 Sat, 19 Oct 2002 16:08:11 +0200 from scratch. The old version was debianized
-on Tue, 21 Dec 1999 18:56:42 +0100
+on Tue, 21 Dec 1999 18:56:42 +0100. It is now maintained by Bradley Smith
+<brad at brad-smith.co.uk>
 
-It was downloaded from http://plib.sourceforge.net/
+It was downloaded from http://plib.sourceforge.net/dist/
 
 Upstream Author: Steve Baker <sjbaker1 at airmail.net>
 
 Copyright:
 
+Copyright (C) 1998,2002  Steve Baker
+
 These example programs are offered as OpenSource freeware
 under the provisions of the GNU Public
 License (GPL). Those terms and conditions are

Modified: packages/trunk/plib-doc/debian/dirs
===================================================================
--- packages/trunk/plib-doc/debian/dirs	2008-04-13 12:52:14 UTC (rev 6534)
+++ packages/trunk/plib-doc/debian/dirs	2008-04-13 13:26:29 UTC (rev 6535)
@@ -1,3 +1,3 @@
-usr/share/doc/plib-doc/examples
-usr/share/doc/plib-doc/html
-usr/share/doc/plib-doc/configuration
+usr/share/doc/libplib-doc/examples
+usr/share/doc/libplib-doc/html
+usr/share/doc/libplib-doc/configuration

Modified: packages/trunk/plib-doc/debian/doc-base
===================================================================
--- packages/trunk/plib-doc/debian/doc-base	2008-04-13 12:52:14 UTC (rev 6534)
+++ packages/trunk/plib-doc/debian/doc-base	2008-04-13 13:26:29 UTC (rev 6535)
@@ -1,11 +1,11 @@
-Document: plib-doc
+Document: libplib-doc
 Title: Steve's Portable Game Library
 Author: Steve Baker
 Abstract: Description of Steve's Portable Game Library
  Description of all the libraries and the function calls with
  examples such as hello world.
-Section: Apps/Programming
+Section: Programming
 
 Format: HTML
-Index: /usr/share/doc/plib-doc/html/index.html
-Files: /usr/share/doc/plib-doc/html/*.html
+Index: /usr/share/doc/libplib-doc/html/index.html
+Files: /usr/share/doc/libplib-doc/html/*.html

Modified: packages/trunk/plib-doc/debian/install
===================================================================
--- packages/trunk/plib-doc/debian/install	2008-04-13 12:52:14 UTC (rev 6534)
+++ packages/trunk/plib-doc/debian/install	2008-04-13 13:26:29 UTC (rev 6535)
@@ -1,17 +1,3 @@
-debian/html/auxlibs/*.html usr/share/doc/plib-doc/html/auxlibs
-debian/html/pw/*.html usr/share/doc/plib-doc/html/pw
-debian/html/psl/*.html usr/share/doc/plib-doc/html/psl
-debian/html/puAux/*.html usr/share/doc/plib-doc/html/puAux
-debian/html/sg/*.html usr/share/doc/plib-doc/html/sg
-debian/html/ssg/*.html usr/share/doc/plib-doc/html/ssg
-debian/html/ssgAux/*.html usr/share/doc/plib-doc/html/ssgAux
-debian/html/fnt/*.html usr/share/doc/plib-doc/html/fnt
-debian/html/js/*.html usr/share/doc/plib-doc/html/js
-debian/html/net/*.html usr/share/doc/plib-doc/html/net
-debian/html/pui/*.html usr/share/doc/plib-doc/html/pui
-debian/html/sl/*.html usr/share/doc/plib-doc/html/sl
-debian/html/util/*.html usr/share/doc/plib-doc/html/util
-debian/html/*.html usr/share/doc/plib-doc/html
-install-sh usr/share/doc/plib-doc/configuration
-config.status usr/share/doc/plib-doc/configuration
-configure.in usr/share/doc/plib-doc/configuration
+debian/html usr/share/doc/libplib-doc/
+configure.in usr/share/doc/libplib-doc/configuration/
+Makefile.am usr/share/doc/libplib-doc/configuration/

Deleted: packages/trunk/plib-doc/debian/postinst
===================================================================
--- packages/trunk/plib-doc/debian/postinst	2008-04-13 12:52:14 UTC (rev 6534)
+++ packages/trunk/plib-doc/debian/postinst	2008-04-13 13:26:29 UTC (rev 6535)
@@ -1,48 +0,0 @@
-#! /bin/sh
-# postinst script for plib-doc
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-#        * <postinst> `configure' <most-recently-configured-version>
-#        * <old-postinst> `abort-upgrade' <new version>
-#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
-#          <new-version>
-#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
-#          <failed-install-package> <version> `removing'
-#          <conflicting-package> <version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-#
-# quoting from the policy:
-#     Any necessary prompting should almost always be confined to the
-#     post-installation script, and should be protected with a conditional
-#     so that unnecessary prompting doesn't happen if a package's
-#     installation fails and the `postinst' is called with `abort-upgrade',
-#     `abort-remove' or `abort-deconfigure'.
-
-case "$1" in
-    configure)
-
-    ;;
-
-    abort-upgrade|abort-remove|abort-deconfigure)
-
-    ;;
-
-    *)
-        echo "postinst called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
-
-

Deleted: packages/trunk/plib-doc/debian/postrm
===================================================================
--- packages/trunk/plib-doc/debian/postrm	2008-04-13 12:52:14 UTC (rev 6534)
+++ packages/trunk/plib-doc/debian/postrm	2008-04-13 13:26:29 UTC (rev 6535)
@@ -1,38 +0,0 @@
-#! /bin/sh
-# postrm script for plib-doc
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-#        * <postrm> `remove'
-#        * <postrm> `purge'
-#        * <old-postrm> `upgrade' <new-version>
-#        * <new-postrm> `failed-upgrade' <old-version>
-#        * <new-postrm> `abort-install'
-#        * <new-postrm> `abort-install' <old-version>
-#        * <new-postrm> `abort-upgrade' <old-version>
-#        * <disappearer's-postrm> `disappear' <r>overwrit>r> <new-version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-
-case "$1" in
-       purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
-
-
-        ;;
-
-    *)
-        echo "postrm called with unknown argument \`$1'" >&2
-        exit 1
-
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0

Modified: packages/trunk/plib-doc/debian/rules
===================================================================
--- packages/trunk/plib-doc/debian/rules	2008-04-13 12:52:14 UTC (rev 6534)
+++ packages/trunk/plib-doc/debian/rules	2008-04-13 13:26:29 UTC (rev 6535)
@@ -1,18 +1,9 @@
 #!/usr/bin/make -f
-# 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
-
-# This is the debhelper compatibility version to use.
-export DH_COMPAT=4
-
-# 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)
 
+LDFLAGS=-lpthread
 
 ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
 	CFLAGS += -g
@@ -23,31 +14,23 @@
 
 config.status: configure
 	dh_testdir
-	# Add here commands to configure the package.
-	export LDFLAGS=-lpthread ; ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
+#	LDFLAGS="$(LDFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) \
+		--build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr \
+		--mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
 
-
 build: build-stamp
-
 build-stamp:  config.status
 	dh_testdir
 
-	# Add here commands to compile the package.
 	#$(MAKE)
-	#/usr/bin/docbook-to-man debian/plib-doc.sgml > plib-doc.1
 
 	touch build-stamp
 
 clean:
 	dh_testdir
 	dh_testroot
+	[ ! -f Makefile ] || $(MAKE) distclean
 	rm -f build-stamp config.log
-
-	chmod 0755 depcomp
-
-	# Add here commands to clean up after the build process.
-	-$(MAKE) distclean
-
 	dh_clean
 
 install: build
@@ -56,53 +39,36 @@
 	dh_clean -k
 	dh_installdirs
 
-	# Add here commands to install the package into debian/plib-doc.
-	#$(MAKE) install prefix=$(CURDIR)/debian/plib-doc/usr
-# THIS IS DISGUSTING - Brad.
+	#$(MAKE) install DESTDIR=$(CURDIR)/debian/plib-doc/
 	dh_install
-	set -e; cd debian && i=`find html -name '*.xpm'` ;\
-	for j in $$i; do name=`basename $$j .xpm`; dir=`dirname $$j` ;\
-	  convert $$j $(CURDIR)/debian/plib-doc/usr/share/doc/plib-doc/$$dir/$$name.png ;\
+	files=`find $(CURDIR)/debian/libplib-doc/ -name "*.xpm"`;\
+	for file in $$files; do \
+		dir=`dirname $$file`;\
+		convert $$file $$dir/`basename $$file .xpm`.png;\
 	done
 
-	cp -a src/* $(CURDIR)/debian/plib-doc/usr/share/doc/plib-doc/examples
-	rm -rf `find $(CURDIR)/debian/plib-doc/usr/share/doc/plib-doc -name CVS -type d`
-	rm -rf `find $(CURDIR)/debian/plib-doc/usr/share/doc/plib-doc -name .svn -type d`
-	rm -rf `find $(CURDIR)/debian/plib-doc/usr/share/doc/plib-doc -name .deps -type d`
+	find $(CURDIR)/debian/libplib-doc/ -name "*.xpm" | xargs rm -f
 
-# Build architecture-independent files here.
+	cp -a src/* $(CURDIR)/debian/libplib-doc/usr/share/doc/libplib-doc/examples/
+	find $(CURDIR)/debian/libplib-doc/ -name ".svn" -type d | xargs rm -rf
+
 binary-arch: build install
-# We have nothing to do by default.
 
-# Build architecture-dependent files here.
 binary-indep: build install
 	dh_testdir
 	dh_testroot
-#	dh_installdebconf	
 	dh_installdocs
 	dh_installexamples
-#	dh_installmenu
-#	dh_installlogrotate
-#	dh_installemacsen
-#	dh_installpam
-#	dh_installmime
-#	dh_installinit
-#	dh_installcron
-#	dh_installman
-#	dh_installinfo
-#	dh_undocumented
 	dh_installchangelogs ChangeLog
 	dh_link
 	dh_strip
 	dh_compress
 	dh_fixperms
-#	dh_makeshlibs
 	dh_installdeb
-#	dh_perl
 	dh_shlibdeps
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb
 
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install 
+.PHONY: build clean binary-indep binary-arch binary install

Modified: packages/trunk/plib-doc/debian/watch
===================================================================
--- packages/trunk/plib-doc/debian/watch	2008-04-13 12:52:14 UTC (rev 6534)
+++ packages/trunk/plib-doc/debian/watch	2008-04-13 13:26:29 UTC (rev 6535)
@@ -1,2 +1,2 @@
-version=2
-http://plib.sourceforge.net/dist/plib_examples-([^_]*)\.tar\.gz debian uupdate
+version=3
+http://plib.sourceforge.net/dist/plib_examples-([^_]*)\.tar\.gz




More information about the Pkg-games-commits mailing list