[xiph-commits] r3694 - in liboggplay/debian: . debian

johnf at svn.annodex.net johnf at svn.annodex.net
Tue Aug 5 07:30:10 PDT 2008 

Author: johnf
Date: 2008-08-05 07:30:09 -0700 (Tue, 05 Aug 2008)
New Revision: 3694

Added:
   liboggplay/debian/debian/oggplay-tools.dirs
   liboggplay/debian/debian/oggplay-tools.install
Modified:
   liboggplay/debian/
   liboggplay/debian/debian/changelog
   liboggplay/debian/debian/control
   liboggplay/debian/debian/copyright
   liboggplay/debian/debian/liboggplay-dev.install
   liboggplay/debian/debian/rules
   liboggplay/debian/debian/watch
Log:
More packaging work


Property changes on: liboggplay/debian
___________________________________________________________________
Name: bzr:revision-info
   - timestamp: 2008-08-05 21:47:55.519999981 +1000
committer: John Ferlito <johnf at inodes.org>
properties: 
	branch-nick: debian

   + timestamp: 2008-08-06 00:29:51.016999960 +1000
committer: John Ferlito <johnf at inodes.org>
properties: 
	branch-nick: debian

Name: bzr:file-ids
   - .bzr-builddeb	bzrbuilddeb-20080805114743-t19q1yoidldkq4c4-1
.bzr-builddeb/default.conf	default.conf-20080805114743-t19q1yoidldkq4c4-2

   + debian/oggplay-tools.dirs	oggplaytools.dirs-20080805142303-i90g6qg8ma9tjjly-1
debian/oggplay-tools.install	oggplaytools.install-20080805142303-i90g6qg8ma9tjjly-2

Name: bzr:revision-id:v3-single1-bGlib2dncGxheS9kZWJpYW4.
   - 2 johnf at inodes.org-20080805114641-xfmsxspozwt24gl3
3 johnf at inodes.org-20080805114755-26bmt3xw6qlwkigy

   + 2 johnf at inodes.org-20080805114641-xfmsxspozwt24gl3
3 johnf at inodes.org-20080805114755-26bmt3xw6qlwkigy
4 johnf at inodes.org-20080805142951-3ywamfplllqni7dc


Modified: liboggplay/debian/debian/changelog
===================================================================
--- liboggplay/debian/debian/changelog	2008-08-05 14:16:08 UTC (rev 3693)
+++ liboggplay/debian/debian/changelog	2008-08-05 14:30:09 UTC (rev 3694)
@@ -1,4 +1,4 @@
-liboggplay (0.0.1.svn-1) unstable; urgency=low
+liboggplay (0.0.1-1) unstable; urgency=low
 
   * Initial release (Closes: #nnnn)  <nnnn is the bug number of your ITP>
 

Modified: liboggplay/debian/debian/control
===================================================================
--- liboggplay/debian/debian/control	2008-08-05 14:16:08 UTC (rev 3693)
+++ liboggplay/debian/debian/control	2008-08-05 14:30:09 UTC (rev 3694)
@@ -1,21 +1,22 @@
 Source: liboggplay
 Priority: extra
 Maintainer: John Ferlito <johnf at inodes.org>
+DM-Upload-Allowed: yes
 Build-Depends: debhelper (>= 5), autotools-dev
-Standards-Version: 3.7.2
+Standards-Version: 3.8.0
 Section: libs
 
 Package: liboggplay1
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: A library for playing OGG multimedia (development files)
+Depends: ${shlibs:Depends}
+Description: A library for playing OGG multimedia
  <insert long description, indented with spaces>
 
 Package: liboggplay-dev
 Section: libdevel
 Architecture: any
-Depends: liboggplay1 (= ${Source-Version})
+Depends: liboggplay1 (= ${binary:Version})
 Description: A library for playing OGG multimedia (development files)
  <insert long description, indented with spaces>
 
@@ -26,3 +27,10 @@
 Depends: liboggplay1 (= ${binary:Version})
 Description: A library for playing OGG multimedia (debugging symbols)
  <insert long description, indented with spaces>
+
+Package: oggplay-tools
+Section: utils
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: utilitied for manipulating ogg files
+ <insert long description, indented with spaces>

Modified: liboggplay/debian/debian/copyright
===================================================================
--- liboggplay/debian/debian/copyright	2008-08-05 14:16:08 UTC (rev 3693)
+++ liboggplay/debian/debian/copyright	2008-08-05 14:30:09 UTC (rev 3694)
@@ -5,20 +5,62 @@
 
 Upstream Author(s): 
 
-    <put author's name and email here>
-    <likewise for another author>
+  Shane Stephens (shans) <shans at annodex.net>
+        - Design, general implementation
 
-Copyright: 
+  Conrad Parker (kfish) <conrad at metadecks.org>
+        - Design, bug fixes
 
-    <Copyright (C) YYYY Name OfAuthor>
-    <likewise for another author>
+  Marcin Lubonski <marcin at it.uts.edu.au>
+        - Port to windows
 
+  Michael Martin (tahn) <myk.martin at gmail.com>
+        - Port to Max OS X
+
+  Jan Gerber (j^) <jan.gerber at gmail.com>
+  Ralph Giles <giles at xiph.org>
+        - Bug fixes
+
+  Silvia Pfeiffer (ginger) <silvia at annodex.net>
+        - First release, minor bug fixes
+
+  John Ferlito (johnf) <johnf at inodes.org>
+        - Bug fixes, Debian packaging
+
+Copyright:
+
+    Copyright (C) 2003 CSIRO Australia
+
 License:
 
-    <Put the license of the package here indented by 4 spaces>
+    Copyright (C) 2003 CSIRO Australia
 
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions
+    are met:
+
+    - Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+
+    - Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the 
+    documentation and/or other materials provided with the distribution.
+
+    - Neither the name of the CSIRO nor the names of its 
+    contributors may be used to endorse or promote products derived from
+    this software without specific prior written permission.
+
+    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+    ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
+    LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+    PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE ORGANISATION OR
+    CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+    EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
+    PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+    PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
 The Debian packaging is (C) 2008, John Ferlito <johnf at inodes.org> and
 is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
-
-# Please also look if there are files or directories which have a
-# different copyright/license attached and list them here.

Modified: liboggplay/debian/debian/liboggplay-dev.install
===================================================================
--- liboggplay/debian/debian/liboggplay-dev.install	2008-08-05 14:16:08 UTC (rev 3693)
+++ liboggplay/debian/debian/liboggplay-dev.install	2008-08-05 14:30:09 UTC (rev 3694)
@@ -3,4 +3,3 @@
 usr/lib/lib*.so
 usr/lib/pkgconfig/*
 usr/lib/*.la
-usr/share/pkgconfig/*

Added: liboggplay/debian/debian/oggplay-tools.dirs
===================================================================
--- liboggplay/debian/debian/oggplay-tools.dirs	                        (rev 0)
+++ liboggplay/debian/debian/oggplay-tools.dirs	2008-08-05 14:30:09 UTC (rev 3694)
@@ -0,0 +1 @@
+usr/bin

Added: liboggplay/debian/debian/oggplay-tools.install
===================================================================
--- liboggplay/debian/debian/oggplay-tools.install	                        (rev 0)
+++ liboggplay/debian/debian/oggplay-tools.install	2008-08-05 14:30:09 UTC (rev 3694)
@@ -0,0 +1 @@
+usr/bin/*

Modified: liboggplay/debian/debian/rules
===================================================================
--- liboggplay/debian/debian/rules	2008-08-05 14:16:08 UTC (rev 3693)
+++ liboggplay/debian/debian/rules	2008-08-05 14:30:09 UTC (rev 3694)
@@ -15,92 +15,75 @@
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
+CFLAGS = -Wall -g
 
-# shared library versions, option 1
-version=2.0.5
-major=2
-# option 2, assuming the library is created as src/.libs/libfoo.so.2.0.5 or so
-#version=`ls src/.libs/lib*.so.* | \
-# awk '{if (match($$0,/[0-9]+\.[0-9]+\.[0-9]+$$/)) print substr($$0,RSTART)}'`
-#major=`ls src/.libs/lib*.so.* | \
-# awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'`
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+	CFLAGS += -O0
+else
+	CFLAGS += -O2
+endif
+ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
+	CFLAGS += -g
+endif
 
 config.status: 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"
+	./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"
 
 
 build: build-stamp
 build-stamp:  config.status
 	dh_testdir
-
-	# Add here commands to compile the package.
 	$(MAKE)
-
+	$(MAKE) check
 	touch $@
 
 clean:
 	dh_testdir
 	dh_testroot
-	rm -f build-stamp 
-
-	# Add here commands to clean up after the build process.
+	rm -f build-stamp
 	[ ! -f Makefile ] || $(MAKE) distclean
-	rm -f config.sub config.guess
+	dh_clean
 
-	dh_clean 
-
 install: build
 	dh_testdir
 	dh_testroot
-	dh_clean -k 
+	dh_clean -k
 	dh_installdirs
-
-	# Add here commands to install the package into debian/tmp
 	$(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
 
-
 # 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 
-	dh_installdocs
-	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
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
+	dh_install --sourcedir=debian/tmp
+	dh_installchangelogs -a ChangeLog
+	dh_installdocs -a
+	dh_installexamples -a
+	dh_installman -a
+	dh_link -a
+	dh_strip -a --dbg-package=liboggplay1-dbg
+	dh_compress -a
+	dh_fixperms -a
+	dh_makeshlibs -a
+	dh_installdeb -a
+	dh_shlibdeps -a -ldebian/liboggplay1/usr/lib
+	dh_gencontrol -a
+	dh_md5sums -a
+	dh_builddeb -a
 
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install 
+.PHONY: build clean binary-indep binary-arch binary install
+
+
+
+

Modified: liboggplay/debian/debian/watch
===================================================================
--- liboggplay/debian/debian/watch	2008-08-05 14:16:08 UTC (rev 3693)
+++ liboggplay/debian/debian/watch	2008-08-05 14:30:09 UTC (rev 3694)
@@ -1,22 +1,2 @@
-# Example watch control file for uscan
-# Rename this file to "watch" and then you can run the "uscan" command
-# to check for upstream updates and more.
-# See uscan(1) for format
-
-# Compulsory line, this is a version 3 file
-version=3
-
-# Uncomment to examine a Webpage 
-# <Webpage URL> <string match>
-#http://www.example.com/downloads.php liboggplay-(.*)\.tar\.gz
-
-# Uncomment to examine a Webserver directory
-#http://www.example.com/pub/liboggplay-(.*)\.tar\.gz
-
-# Uncommment to examine a FTP server
-#ftp://ftp.example.com/pub/liboggplay-(.*)\.tar\.gz debian uupdate
-
-# Uncomment to find new files on sourceforge, for devscripts >= 2.9
-# http://sf.net/liboggplay/liboggplay-(.*)\.tar\.gz
-
-
+version=2
+http://annodex.net/software/liboggplay/download/ liboggplay-([\d\.]+)\.tar\.gz debian uupdate

More information about the commits mailing list