[Python-modules-commits] r6156 - in packages/pyogg/trunk (18 files)
morph-guest at users.alioth.debian.org
morph-guest at users.alioth.debian.org
Tue Aug 12 19:16:56 UTC 2008
Date: Tuesday, August 12, 2008 @ 19:16:55
Author: morph-guest
Revision: 6156
[svn-inject] Applying Debian modifications to trunk
Added:
packages/pyogg/trunk/debian/
packages/pyogg/trunk/debian/README.Debian
packages/pyogg/trunk/debian/README.source
packages/pyogg/trunk/debian/changelog
packages/pyogg/trunk/debian/compat
packages/pyogg/trunk/debian/control
packages/pyogg/trunk/debian/copyright
packages/pyogg/trunk/debian/patches/
packages/pyogg/trunk/debian/patches/pyogg-1.3-packetflags.diff
packages/pyogg/trunk/debian/patches/pyogg.diff
packages/pyogg/trunk/debian/patches/python25-fixes.diff
packages/pyogg/trunk/debian/patches/series
packages/pyogg/trunk/debian/pycompat
packages/pyogg/trunk/debian/python-ogg.docs
packages/pyogg/trunk/debian/python-ogg.examples
packages/pyogg/trunk/debian/rules
packages/pyogg/trunk/debian/uscan-repack.sh
packages/pyogg/trunk/debian/watch
Property changes on: packages/pyogg/trunk/debian
___________________________________________________________________
Name: mergeWithUpstream
+ 1
Added: packages/pyogg/trunk/debian/README.Debian
===================================================================
--- packages/pyogg/trunk/debian/README.Debian (rev 0)
+++ packages/pyogg/trunk/debian/README.Debian 2008-08-12 19:16:55 UTC (rev 6156)
@@ -0,0 +1,6 @@
+python-pyogg for Debian
+-----------------------
+
+See README and examples/oggtail.py examples/testogg.py for usage.
+
+ -- Christopher L Cheney <ccheney at debian.org>, Sun, 18 Feb 2001 18:20:43 -0600
Added: packages/pyogg/trunk/debian/README.source
===================================================================
--- packages/pyogg/trunk/debian/README.source (rev 0)
+++ packages/pyogg/trunk/debian/README.source 2008-08-12 19:16:55 UTC (rev 6156)
@@ -0,0 +1,9 @@
+This package needs to repack the upstream tarball in order to remove the
+debian/ directory from it; to obtain the tarball used from this package, run:
+
+ debian/rules get-orig-source
+
+Another point is the patch system: this package uses quilt as patch system,
+you can find some information about it at:
+
+ /usr/share/doc/quilt/README.source
Added: packages/pyogg/trunk/debian/changelog
===================================================================
--- packages/pyogg/trunk/debian/changelog (rev 0)
+++ packages/pyogg/trunk/debian/changelog 2008-08-12 19:16:55 UTC (rev 6156)
@@ -0,0 +1,140 @@
+pyogg (1.3+repack-2) unstable; urgency=low
+
+ * QA upload.
+ * debian/control
+ - Replaces/Conflicts on the right version (1.3+repack-1); thanks to Frans
+ Pop for the report; Closes: #486413
+
+ -- Sandro Tosi <matrixhasu at gmail.com> Mon, 16 Jun 2008 18:37:56 +0200
+
+pyogg (1.3+repack-1) unstable; urgency=low
+
+ * QA upload.
+ * Acknowledging NMU; Closes: #373500
+ * debian/control
+ - set QA Group as Maintainer
+ - bump Standards-Version to 3.8.0 (no changes needed)
+ - Build-Depends all on one line
+ - set extra priority for debug package
+ - updated inter-dependency from debug to standard package using
+ ${binary:Version}
+ - capitalized Python in debug package long description
+ - removed "A " from short descriptions, following devref recommendations
+ - added Homepage field
+ - added quilt build-dep
+ - binary packages rename to python-ogg and python-ogg-dbg (to respect
+ Python Policy), added transitional packages and Replaces/Conflicts
+ * debian/rules
+ - added get-orig-source target
+ - removed DH_COMPAT variable
+ - added quilt stuff
+ - updated for new binary packages names
+ - remove 'build' dir in clean target
+ * debian/watch
+ - added
+ * debian/uscan-repack.sh
+ - added, to remove debian/ directory in upstream tarball
+ * debian/compat
+ - added with value "5"
+ * debian/patches/pyogg.diff
+ - updated
+ * debian/patches/pyogg-1.3-packetflags.diff
+ - added from Oggscrissors website, thanks to Eike von Seggern for the
+ report; Closes: #377728
+ * python-ogg.{docs,examples}
+ - renamed from python-pyogg.{docs,examples} due to packages rename
+ * debian/copyright
+ - copyright info taken from svn repository
+ - clearly identified license, renaming previous "Copyright" section
+ - fixed license to link to LGPLv2 (thanks to Bernd Zeimetz)
+ - indented upstream author and license with 4 spaces
+ * debian/README.source
+ - added to respect Policy 3.8.0, to explain peculiarities of this source
+ package
+
+ -- Sandro Tosi <matrixhasu at gmail.com> Fri, 13 Jun 2008 00:37:35 +0200
+
+pyogg (1.3-1.3) unstable; urgency=low
+
+ * NMU.
+ * Build a python-pyogg-dbg package.
+
+ -- Matthias Klose <doko at debian.org> Fri, 01 Feb 2008 19:14:54 +0100
+
+pyogg (1.3-1.2) unstable; urgency=low
+
+ * NMU.
+ * Merge from Ubuntu:
+ - Change section from interpreters to python.
+ - Fixes for python2.5 memory management.
+
+ -- Matthias Klose <doko at debian.org> Fri, 01 Feb 2008 19:02:29 +0100
+
+pyogg (1.3-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Update package to the last python policy (Closes: #373500).
+
+ -- Pierre Habouzit <madcoder at debian.org> Fri, 30 Jun 2006 11:02:53 +0200
+
+pyogg (1.3-1) unstable; urgency=low
+
+ * Maintainer upload.
+
+ -- Christopher L Cheney <ccheney at debian.org> Thu, 11 Dec 2003 23:00:00 -0600
+
+pyogg (1.3-0.1) unstable; urgency=low
+
+ * NMU.
+ * New upstream release.
+ * Fix README (closes: #201036).
+ * Rebuild for python 2.3 (closes: #205107).
+ * Require debhelper 4.1.62.
+ * Don't distribute the .pyc.
+ * Correct debian/changelog to please lintian.
+ * Standards-version is 3.6.0.
+
+ -- Josselin Mouette <joss at debian.org> Wed, 13 Aug 2003 11:53:31 +0200
+
+pyogg (1.0-1.1) unstable; urgency=low
+
+ * Non Maintainer Upload
+ * Switched to Python-2.2 (Closes: #159303)
+
+ -- Michael Banck <mbanck at debian.org> Tue, 3 Sep 2002 02:38:19 +0200
+
+pyogg (1.0-1) unstable; urgency=low
+
+ * New upstream.
+
+ -- Christopher L Cheney <ccheney at debian.org> Thu, 22 Aug 2002 16:00:00 -0500
+
+pyogg (0.5-1) unstable; urgency=medium
+
+ * Non Maintainer Upload, with permission
+ * New upstream.
+
+ -- Michael Banck <mbanck at gmx.net> Sat, 6 Apr 2002 15:10:10 +0200
+
+pyogg (0.4-1) unstable; urgency=high
+
+ * New upstream. (Closes: #108609)
+ * Updated README.Debian (Closes: #118790)
+ * Updated package to be Debian Python Policy compliant.
+
+ -- Christopher L Cheney <ccheney at debian.org> Sun, 25 Nov 2001 22:26:50 -0600
+
+pyogg (0.3-1) unstable; urgency=low
+
+ * New upstream.
+ * Fixed versioned depends.
+ * Upstream removed dependency on libvorbis-dev (Closes: #89293)
+
+ -- Christopher L Cheney <ccheney at debian.org> Sun, 17 Jun 2001 20:00:00 -0500
+
+pyogg (0.2-1) unstable; urgency=low
+
+ * Initial Release.
+
+ -- Christopher L Cheney <ccheney at debian.org> Mon, 26 Feb 2001 08:00:00 -0600
+
Added: packages/pyogg/trunk/debian/compat
===================================================================
--- packages/pyogg/trunk/debian/compat (rev 0)
+++ packages/pyogg/trunk/debian/compat 2008-08-12 19:16:55 UTC (rev 6156)
@@ -0,0 +1 @@
+5
Added: packages/pyogg/trunk/debian/control
===================================================================
--- packages/pyogg/trunk/debian/control (rev 0)
+++ packages/pyogg/trunk/debian/control 2008-08-12 19:16:55 UTC (rev 6156)
@@ -0,0 +1,52 @@
+Source: pyogg
+Section: python
+Priority: optional
+Maintainer: Debian QA Group <packages at qa.debian.org>
+Build-Depends: debhelper (>= 5.0.37.2), python-all-dev (>= 2.3.5-11), python-all-dbg, python-support (>= 0.3), libogg-dev (>> 1.0.0), quilt
+Standards-Version: 3.8.0
+Homepage: http://ekyo.nerim.net/software/pyogg/index.html
+
+Package: python-ogg
+Architecture: any
+Depends: ${python:Depends}, ${shlibs:Depends}
+Provides: ${python:Provides}
+Replaces: python-pyogg (<< 1.3+repack-1)
+Conflicts: python-pyogg (<< 1.3+repack-1)
+Suggests: python-ogg-dbg
+XB-Python-Version: ${python:Versions}
+Description: Python interface to the Ogg library
+ This module makes the libogg (Ogg) functions available
+ in Python. With this module you can write Python applications
+ that use the ogg library.
+
+Package: python-ogg-dbg
+Architecture: any
+Priority: extra
+Replaces: python-pyogg-dbg (<< 1.3+repack-1)
+Conflicts: python-pyogg-dbg (<< 1.3+repack-1)
+Depends: python-ogg (= ${binary:Version}), python-dbg, ${shlibs:Depends}
+Description: Python interface to the Ogg library (debug extension)
+ This module makes the libogg (Ogg) functions available
+ in Python. With this module you can write Python applications
+ that use the ogg library.
+ .
+ This package contains the extension built for the Python debug interpreter.
+
+Package: python-pyogg
+Architecture: any
+Depends: python-ogg
+Description: transitional dummy package
+ This is a dummy package to ease transition to new package name
+ (python-ogg).
+ .
+ It can be safely removed from your system.
+
+Package: python-pyogg-dbg
+Architecture: any
+Priority: extra
+Depends: python-ogg-dbg
+Description: transitional dummy package
+ This is a dummy package to ease transition to new package name
+ (python-ogg-dbg).
+ .
+ It can be safely removed from your system.
Added: packages/pyogg/trunk/debian/copyright
===================================================================
--- packages/pyogg/trunk/debian/copyright (rev 0)
+++ packages/pyogg/trunk/debian/copyright 2008-08-12 19:16:55 UTC (rev 6156)
@@ -0,0 +1,23 @@
+This package was debianized by Christopher L Cheney <ccheney at debian.org> on
+Sun, 18 Feb 2001 18:20:43 -0600.
+
+It was downloaded from http://www.andrewchatham.com/pyogg/
+
+Upstream Author:
+
+ Andrew Chatham <andrew.chatham at duke.edu>
+
+Copyright:
+
+ Copyright (c) 2000-2006 Andrew Chatham <pyogg at andrewchatham.com>
+ Mike Coleman <mkc at mathdogs.com>
+
+License:
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
+
+On Debian systems, the complete text of the GNU Lesser General Public
+License version2 can be found in /usr/share/common-licenses/LGPL-2 file.
Added: packages/pyogg/trunk/debian/patches/pyogg-1.3-packetflags.diff
===================================================================
--- packages/pyogg/trunk/debian/patches/pyogg-1.3-packetflags.diff (rev 0)
+++ packages/pyogg/trunk/debian/patches/pyogg-1.3-packetflags.diff 2008-08-12 19:16:55 UTC (rev 6156)
@@ -0,0 +1,60 @@
+--- pyogg-1.3.repack.orig/src/general.c Thu Dec 30 19:54:07 2004
++++ pyogg-1.3.repack/src/general.c Thu Dec 30 20:00:11 2004
+@@ -24,3 +24,17 @@
+ }
+ return 1;
+ }
++
++int
++arg_to_long(PyObject *longobj, long *val)
++{
++ if (PyLong_Check(longobj))
++ *val = PyLong_AsLong(longobj);
++ else if (PyInt_Check(longobj))
++ *val = PyInt_AsLong(longobj);
++ else {
++ PyErr_SetString(PyExc_TypeError, "Argument must be int or long");
++ return 0;
++ }
++ return 1;
++}
+--- pyogg-1.3.repack.orig/src/pyoggpacket.c Mon Oct 7 01:04:57 2002
++++ pyogg-1.3.repack/src/pyoggpacket.c Thu Dec 30 20:06:50 2004
+@@ -68,6 +68,10 @@
+ {
+ if (strcmp(name, "granulepos") == 0)
+ return PyLong_FromLongLong(PY_OGG_PACKET(self)->granulepos);
++ if (strcmp(name, "bos") == 0)
++ return PyLong_FromLongLong(PY_OGG_PACKET(self)->b_o_s);
++ if (strcmp(name, "eos") == 0)
++ return PyLong_FromLongLong(PY_OGG_PACKET(self)->e_o_s);
+ return Py_FindMethod(py_ogg_packet_methods, self, name);
+ }
+
+@@ -75,11 +79,26 @@
+ py_ogg_packet_setattr(PyObject *self, char *name, PyObject *value)
+ {
+ ogg_int64_t v;
++ long flagv;
+
+ if (strcmp(name, "granulepos") == 0) {
+ if (!arg_to_int64(value, &v))
+ return -1;
+ PY_OGG_PACKET(self)->granulepos = v;
++ return 0;
++ }
++
++ if (strcmp(name, "bos") == 0) {
++ if (!arg_to_long(value, &flagv))
++ return -1;
++ PY_OGG_PACKET(self)->b_o_s = flagv;
++ return 0;
++ }
++
++ if (strcmp(name, "eos") == 0) {
++ if (!arg_to_long(value, &flagv))
++ return -1;
++ PY_OGG_PACKET(self)->e_o_s = flagv;
+ return 0;
+ }
+
Added: packages/pyogg/trunk/debian/patches/pyogg.diff
===================================================================
--- packages/pyogg/trunk/debian/patches/pyogg.diff (rev 0)
+++ packages/pyogg/trunk/debian/patches/pyogg.diff 2008-08-12 19:16:55 UTC (rev 6156)
@@ -0,0 +1,23 @@
+Index: pyogg-1.3.repack/README
+===================================================================
+--- pyogg-1.3.repack.orig/README 2008-06-07 17:19:44.100116606 +0200
++++ pyogg-1.3.repack/README 2008-06-07 17:20:43.563505227 +0200
+@@ -13,10 +13,10 @@
+ And if anyone is wondering why I have things separated into a main
+ module "ogg" and a submodule "ogg.vorbis", vorbis is the audio subset
+ of the ogg bitstream. In the future there will likely be a video part
+-of the ogg bistream, and nothing in the ogg modulue really has to know
++of the ogg bitstream, and nothing in the ogg module really has to know
+ about anything specific in the vorbis module.
+
+-To build, you need the distutils package, availible from
++To build, you need the distutils package, available from
+ http://www.python.org/sigs/distutils-sig/download.html (it comes with
+ Python 2.0). Run "python setup.py build" to build and then as root run
+ "python setup.py install". You may need to run the config_unix.py
+@@ -28,5 +28,3 @@
+ key = value
+
+ with one pair per line.
+-
+-
Added: packages/pyogg/trunk/debian/patches/python25-fixes.diff
===================================================================
--- packages/pyogg/trunk/debian/patches/python25-fixes.diff (rev 0)
+++ packages/pyogg/trunk/debian/patches/python25-fixes.diff 2008-08-12 19:16:55 UTC (rev 6156)
@@ -0,0 +1,55 @@
+--- pyogg-1.3.orig/src/pyoggstreamstate.c
++++ pyogg-1.3/src/pyoggstreamstate.c
+@@ -77,7 +77,7 @@
+ py_ogg_stream_state_dealloc(PyObject *self)
+ {
+ ogg_stream_clear(PY_OGG_STREAM(self));
+- PyMem_DEL(self);
++ PyObject_Del(self);
+ }
+
+ static PyObject*
+--- pyogg-1.3.orig/src/pyoggsyncstate.c
++++ pyogg-1.3/src/pyoggsyncstate.c
+@@ -88,7 +88,7 @@
+ py_ogg_sync_state_dealloc(PyObject *self)
+ {
+ ogg_sync_clear(PY_OGG_SYNC_STATE(self));
+- PyMem_DEL(self);
++ PyObject_Del(self);
+ }
+
+ static PyObject*
+--- pyogg-1.3.orig/src/pyoggpackbuff.c
++++ pyogg-1.3/src/pyoggpackbuff.c
+@@ -89,7 +89,7 @@
+ static void
+ py_oggpack_buffer_dealloc(PyObject *self)
+ {
+- PyMem_DEL(self);
++ PyObject_Del(self);
+ }
+
+ static PyObject*
+--- pyogg-1.3.orig/src/pyoggpacket.c
++++ pyogg-1.3/src/pyoggpacket.c
+@@ -60,7 +60,7 @@
+ static void
+ py_ogg_packet_dealloc(PyObject *self)
+ {
+- PyMem_DEL(self);
++ PyObject_Del(self);
+ }
+
+ static PyObject*
+--- pyogg-1.3.orig/src/pyoggpage.c
++++ pyogg-1.3/src/pyoggpage.c
+@@ -75,7 +75,7 @@
+ static void
+ py_ogg_page_dealloc(PyObject *self)
+ {
+- PyMem_DEL(self);
++ PyObject_Del(self);
+ }
+
+ static PyObject*
Added: packages/pyogg/trunk/debian/patches/series
===================================================================
--- packages/pyogg/trunk/debian/patches/series (rev 0)
+++ packages/pyogg/trunk/debian/patches/series 2008-08-12 19:16:55 UTC (rev 6156)
@@ -0,0 +1,3 @@
+pyogg.diff
+python25-fixes.diff
+pyogg-1.3-packetflags.diff
Added: packages/pyogg/trunk/debian/pycompat
===================================================================
--- packages/pyogg/trunk/debian/pycompat (rev 0)
+++ packages/pyogg/trunk/debian/pycompat 2008-08-12 19:16:55 UTC (rev 6156)
@@ -0,0 +1 @@
+2
Added: packages/pyogg/trunk/debian/python-ogg.docs
===================================================================
--- packages/pyogg/trunk/debian/python-ogg.docs (rev 0)
+++ packages/pyogg/trunk/debian/python-ogg.docs 2008-08-12 19:16:55 UTC (rev 6156)
@@ -0,0 +1 @@
+README
Added: packages/pyogg/trunk/debian/python-ogg.examples
===================================================================
--- packages/pyogg/trunk/debian/python-ogg.examples (rev 0)
+++ packages/pyogg/trunk/debian/python-ogg.examples 2008-08-12 19:16:55 UTC (rev 6156)
@@ -0,0 +1,2 @@
+test/oggtail.py
+test/testogg.py
Added: packages/pyogg/trunk/debian/rules
===================================================================
--- packages/pyogg/trunk/debian/rules (rev 0)
+++ packages/pyogg/trunk/debian/rules 2008-08-12 19:16:55 UTC (rev 6156)
@@ -0,0 +1,102 @@
+#!/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
+
+include /usr/share/quilt/quilt.make
+
+PYVERS := $(shell pyversions -r)
+
+build: patch build-stamp build-debug-stamp
+build-stamp:
+ dh_testdir
+
+ set -e; \
+ for py in $(PYVERS); do \
+ $$py config_unix.py --prefix /usr; \
+ $$py setup.py build; \
+ done
+
+ touch build-stamp
+
+build-debug-stamp:
+ dh_testdir
+
+ set -e; \
+ for py in $(PYVERS); do \
+ $$py-dbg config_unix.py --prefix /usr; \
+ $$py-dbg setup.py build; \
+ done
+
+ touch build-debug-stamp
+
+clean: unpatch
+ dh_testdir
+ dh_testroot
+ rm -f build*-stamp configure-stamp
+
+ #if [ -f Setup ] ; then python setup.py clean --all ; fi
+ -for py in $(PYVERS); do \
+ $$py setup.py clean --all; \
+ $$py-dbg setup.py clean --all; \
+ done
+ -rm Setup
+
+ [ ! -d build ] || rm -rf build
+
+ dh_clean
+
+install: build
+ dh_testdir
+ dh_testroot
+ dh_clean -k
+ dh_installdirs
+
+ for py in $(PYVERS); do \
+ $$py setup.py install --root=$(CURDIR)/debian/python-ogg; \
+ done
+
+ for py in $(PYVERS); do \
+ $$py-dbg setup.py install --root=$(CURDIR)/debian/python-ogg-dbg; \
+ done
+ find debian/python-*-dbg ! -type d ! -name '*.so' | xargs rm -f
+ find debian/python-*-dbg -depth -empty -exec rmdir {} \;
+ for py in $(PYVERS); do \
+ rm -rf debian/python-ogg-dbg/usr/include/$$py; \
+ mkdir -p debian/python-ogg-dbg/usr/include/$${py}_d; \
+ ln -s ../$$py/pyogg debian/python-ogg-dbg/usr/include/$${py}_d/pyogg; \
+ done
+
+
+# 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_installdocs
+ dh_installexamples
+ dh_installchangelogs ChangeLog
+ dh_pysupport
+ dh_link
+ dh_strip -ppython-ogg --dbg-package=python-ogg-dbg
+ rm -rf debian/python-ogg-dbg/usr/share/doc/python-ogg-dbg
+ ln -s python-ogg debian/python-ogg-dbg/usr/share/doc/python-ogg-dbg
+ dh_compress
+ dh_fixperms
+ dh_makeshlibs -V
+ dh_installdeb
+ dh_shlibdeps
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+
+get-orig-source:
+ uscan --verbose --rename --repack --force-download
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install
Property changes on: packages/pyogg/trunk/debian/rules
___________________________________________________________________
Name: svn:executable
+ *
Added: packages/pyogg/trunk/debian/uscan-repack.sh
===================================================================
--- packages/pyogg/trunk/debian/uscan-repack.sh (rev 0)
+++ packages/pyogg/trunk/debian/uscan-repack.sh 2008-08-12 19:16:55 UTC (rev 6156)
@@ -0,0 +1,28 @@
+#!/bin/sh
+## Taken from ipython package, kudos to maintainer :)
+
+set -e
+
+#command --upstream-version version filename
+
+[ $# -eq 3 ] || exit 255
+
+echo
+
+version="$2"
+filename="$3"
+dfsgfilename=`echo $3 | sed 's,\.orig\.,+repack.orig.,'`
+
+tar xfz ${filename}
+
+dir=`tar tfz ${filename} | head -1 | sed 's,/.*,,g'`
+rm -f ${filename}
+
+rm -rf ${dir}/debian
+mv ${dir} ${dir}+repack.orig
+
+tar cf - ${dir}+repack.orig | gzip -9 > ${dfsgfilename}
+
+rm -rf ${dir}+repack.orig
+
+echo "${dfsgfilename} created."
Added: packages/pyogg/trunk/debian/watch
===================================================================
--- packages/pyogg/trunk/debian/watch (rev 0)
+++ packages/pyogg/trunk/debian/watch 2008-08-12 19:16:55 UTC (rev 6156)
@@ -0,0 +1,3 @@
+version=3
+opts=dversionmangle=s/\+repack// \
+ http://ekyo.nerim.net/software/pyogg/pyogg-(.*)\.tar\.gz debian debian/uscan-repack.sh
More information about the Python-modules-commits
mailing list