[Python-modules-commits] r7601 - in packages/pyofa/trunk (11 files)
andrewgee-guest at users.alioth.debian.org
andrewgee-guest at users.alioth.debian.org
Tue Feb 17 16:39:59 UTC 2009
Date: Tuesday, February 17, 2009 @ 16:39:58
Author: andrewgee-guest
Revision: 7601
[svn-inject] Applying Debian modifications to trunk
Added:
packages/pyofa/trunk/debian/
packages/pyofa/trunk/debian/changelog
packages/pyofa/trunk/debian/compat
packages/pyofa/trunk/debian/control
packages/pyofa/trunk/debian/copyright
packages/pyofa/trunk/debian/docs
packages/pyofa/trunk/debian/patches/
packages/pyofa/trunk/debian/patches/00list
packages/pyofa/trunk/debian/patches/01_ffmpeg-location-change.dpatch
packages/pyofa/trunk/debian/pycompat
packages/pyofa/trunk/debian/rules
Property changes on: packages/pyofa/trunk/debian
___________________________________________________________________
Name: mergeWithUpstream
+ 1
Added: packages/pyofa/trunk/debian/changelog
===================================================================
--- packages/pyofa/trunk/debian/changelog (rev 0)
+++ packages/pyofa/trunk/debian/changelog 2009-02-17 16:39:58 UTC (rev 7601)
@@ -0,0 +1,6 @@
+pyofa (1.0.3+hg20090101-1) unstable; urgency=low
+
+ * Initial release (Closes: #513293)
+
+ -- Andrew Gee <andrew at andrewgee.org> Sat, 24 Jan 2009 18:44:23 +0000
+
Added: packages/pyofa/trunk/debian/compat
===================================================================
--- packages/pyofa/trunk/debian/compat (rev 0)
+++ packages/pyofa/trunk/debian/compat 2009-02-17 16:39:58 UTC (rev 7601)
@@ -0,0 +1 @@
+5
Added: packages/pyofa/trunk/debian/control
===================================================================
--- packages/pyofa/trunk/debian/control (rev 0)
+++ packages/pyofa/trunk/debian/control 2009-02-17 16:39:58 UTC (rev 7601)
@@ -0,0 +1,41 @@
+Source: pyofa
+Section: python
+Priority: optional
+Maintainer: Andrew Gee <andrew at andrewgee.org>
+Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
+Build-Depends: cdbs (>= 0.4.49),
+ debhelper (>= 5.0.38),
+ libavcodec-dev,
+ libavformat-dev,
+ libofa0-dev,
+ python-central (>= 0.5.6),
+ python-all-dev (>= 2.5),
+ python-elementtree,
+ pkg-config,
+ dpatch
+Vcs-Svn: svn://svn.debian.org/python-modules/packages/pyofa/trunk/
+Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/pyofa/trunk/
+XS-Python-Version: >= 2.5
+Standards-Version: 3.8.0
+Homepage: http://furius.ca/pyofa/
+
+Package: python-musicdns
+Architecture: any
+Depends: ${misc:Depends}, ${python:Depends}, python-mutagen, python (>= 2.5)
+XB-Python-Version: ${python:Versions}
+Description: Provides Python bindings for the MusicIP service
+ This package uses the MusicDNS service to generate a PUID (audio fingerprint)
+ that can then be used to look up the track on services such as MusicBrainz.
+ .
+ This packages provides the Python bindings for libofa0.
+
+Package: python-musicdns-dbg
+Section: python
+Priority: extra
+Architecture: any
+Depends: python-musicdns (= ${binary:Version})
+Description: Debug Symbols for the MusicIP Python Bindings
+ This package uses the MusicDNS service to generate a PUID (audio fingerprint)
+ that can then be used to look up the track on services such as MusicBrainz.
+ .
+ This packages provides the Debug Symbols for the MusicIP Python bindings.
Added: packages/pyofa/trunk/debian/copyright
===================================================================
--- packages/pyofa/trunk/debian/copyright (rev 0)
+++ packages/pyofa/trunk/debian/copyright 2009-02-17 16:39:58 UTC (rev 7601)
@@ -0,0 +1,32 @@
+This package was debianized by Andrew Gee <andrew at andrewgee.org> on
+Sat, 24 Jan 2009 18:44:23 +0000.
+
+It was downloaded from http://furius.ca/pyofa/
+
+Upstream Authors:
+
+ Martin Blais <blais at furius.ca>
+ Lukáš Lalinský <lalinsky at gmail.com>
+
+Copyright:
+
+ Copyright (C) 2007 Martin Blais
+ Copyright (C) 2006 Lukáš Lalinský
+
+License:
+
+ 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 file.
+
+The Debian packaging is Copyright (C) 2009, Andrew Gee <andrew at andrewgee.org> and
+is licensed under the GPL, see `/usr/share/common-licenses/GPL-2'.
Added: packages/pyofa/trunk/debian/docs
===================================================================
--- packages/pyofa/trunk/debian/docs (rev 0)
+++ packages/pyofa/trunk/debian/docs 2009-02-17 16:39:58 UTC (rev 7601)
@@ -0,0 +1,2 @@
+README
+CREDITS
Added: packages/pyofa/trunk/debian/patches/00list
===================================================================
--- packages/pyofa/trunk/debian/patches/00list (rev 0)
+++ packages/pyofa/trunk/debian/patches/00list 2009-02-17 16:39:58 UTC (rev 7601)
@@ -0,0 +1 @@
+01_ffmpeg-location-change.dpatch
Added: packages/pyofa/trunk/debian/patches/01_ffmpeg-location-change.dpatch
===================================================================
--- packages/pyofa/trunk/debian/patches/01_ffmpeg-location-change.dpatch (rev 0)
+++ packages/pyofa/trunk/debian/patches/01_ffmpeg-location-change.dpatch 2009-02-17 16:39:58 UTC (rev 7601)
@@ -0,0 +1,75 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_ffmpeg-location-change.dpatch by Andrew Gee <andrew at andrewgee.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: In a recent update to libavcodec-dev and libavformat-dev, the location of the header files moved.
+
+ at DPATCH@
+diff -urNad pyofa-1.0.3+hg20090101~/lib/python/musicdns/avcodec.c pyofa-1.0.3+hg20090101/lib/python/musicdns/avcodec.c
+--- pyofa-1.0.3+hg20090101~/lib/python/musicdns/avcodec.c 2009-02-15 17:28:27.000000000 +0000
++++ pyofa-1.0.3+hg20090101/lib/python/musicdns/avcodec.c 2009-02-15 17:28:38.000000000 +0000
+@@ -24,8 +24,13 @@
+ #define inline __inline
+ #endif
+
++#ifdef USE_OLD_FFMPEG_LOCATIONS
+ #include <avcodec.h>
+ #include <avformat.h>
++#else
++#include <libavcodec/avcodec.h>
++#include <libavformat/avformat.h>
++#endif
+ #include <Python.h>
+
+ #ifdef _WIN32
+@@ -279,7 +284,8 @@
+ data = packet.data;
+
+ while (size > 0) {
+- len = avcodec_decode_audio(codec_context, (int16_t *)buffer_ptr, &output_size, data, size);
++ output_size = buffer_size + AVCODEC_MAX_AUDIO_FRAME_SIZE;
++ len = avcodec_decode_audio2(codec_context, (int16_t *)buffer_ptr, &output_size, data, size);
+
+ if (len < 0)
+ break;
+diff -urNad pyofa-1.0.3+hg20090101~/setup.py pyofa-1.0.3+hg20090101/setup.py
+--- pyofa-1.0.3+hg20090101~/setup.py 2009-02-15 17:28:27.000000000 +0000
++++ pyofa-1.0.3+hg20090101/setup.py 2009-02-15 17:29:57.000000000 +0000
+@@ -72,6 +72,13 @@
+ extra_compile_args=cfg.get('avcodec', 'cflags').split(),
+ extra_link_args=cfg.get('avcodec', 'libs').split()))
+
++def cflags_to_include_dirs(cflags):
++ cflags = cflags.split()
++ include_dirs = []
++ for cflag in cflags:
++ if cflag.startswith('-I'):
++ include_dirs.append(cflag[2:])
++ return include_dirs
+
+ class pyofa_config(config):
+
+@@ -92,7 +99,10 @@
+
+ print 'checking for libavcodec/libavformat...',
+ if have_pkgconfig:
+- self.pkgconfig_check_module('avcodec', 'libavcodec libavformat')
++ if self.pkgconfig_check_module('avcodec', 'libavcodec libavformat'):
++ include_dirs = cflags_to_include_dirs(cfg.get('avcodec', 'cflags'))
++ if self.try_compile('#include <avcodec.h>', include_dirs=include_dirs):
++ cfg.set('avcodec', 'cflags', cfg.get('avcodec', 'cflags') + ' -DUSE_OLD_FFMPEG_LOCATIONS')
+ else:
+ self.check_lib('avcodec', 'av_open_input_file', ['avcodec.h', 'avformat.h'], [['avcodec', 'avformat'], ['avcodec-51', 'avformat-51']])
+
+@@ -133,9 +143,11 @@
+ cfg.set('build', 'with-' + name, True)
+ cfg.set(name, 'cflags', self.pkgconfig_cflags(module))
+ cfg.set(name, 'libs', self.pkgconfig_libs(module))
++ return True
+ else:
+ print 'no'
+ cfg.set('build', 'with-' + name, False)
++ return False
+
+ def check_lib(self, name, function, includes, libraries):
+ for libs in libraries:
Property changes on: packages/pyofa/trunk/debian/patches/01_ffmpeg-location-change.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: packages/pyofa/trunk/debian/pycompat
===================================================================
--- packages/pyofa/trunk/debian/pycompat (rev 0)
+++ packages/pyofa/trunk/debian/pycompat 2009-02-17 16:39:58 UTC (rev 7601)
@@ -0,0 +1 @@
+2
Added: packages/pyofa/trunk/debian/rules
===================================================================
--- packages/pyofa/trunk/debian/rules (rev 0)
+++ packages/pyofa/trunk/debian/rules 2009-02-17 16:39:58 UTC (rev 7601)
@@ -0,0 +1,28 @@
+#!/usr/bin/make -f
+
+DEB_PYTHON_SYSTEM=pycentral
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/python-distutils.mk
+include /usr/share/cdbs/1/rules/dpatch.mk
+include /usr/share/dpatch/dpatch.make
+
+DEB_DH_STRIP_ARGS := --dbg-package=python-musicdns
+
+DEB_ORIG_DIRECTORY=$(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION)
+DEB_ORIG_FILENAME=$(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_VERSION).orig.tar.gz
+DEB_REPOS_VERSION = "a08112357b80"
+
+.PHONY: get-orig-source
+get-orig-source:
+ hg clone -r $(DEB_REPOS_VERSION) https://hg.furius.ca/public/pyofa/ pyofa
+ mv pyofa $(DEB_ORIG_DIRECTORY)
+ tar -czf $(DEB_ORIG_FILENAME) $(DEB_ORIG_DIRECTORY) --exclude .hg
+ rm -fr $(DEB_ORIG_DIRECTORY)
+
+clean::
+ rm -f build.cfg
+ rm -f patch-stamp
+
+makebuilddir:: patch
+ ./setup.py config
Property changes on: packages/pyofa/trunk/debian/rules
___________________________________________________________________
Name: svn:executable
+ *
More information about the Python-modules-commits
mailing list