[pkg-freevo-commits] r188 - in packages/freevo/trunk/debian: . patches source
Andrea Mennucci
mennucc1 at alioth.debian.org
Fri Feb 5 22:34:33 UTC 2010
Author: mennucc1
Date: 2010-02-05 22:34:29 +0000 (Fri, 05 Feb 2010)
New Revision: 188
Added:
packages/freevo/trunk/debian/source/
packages/freevo/trunk/debian/source/format
Modified:
packages/freevo/trunk/debian/changelog
packages/freevo/trunk/debian/patches/config_py.diff
packages/freevo/trunk/debian/patches/encodingcore_no_print.diff
packages/freevo/trunk/debian/patches/encodingcore_report_failures.diff
packages/freevo/trunk/debian/patches/encodingcore_video_copy_noargs.diff
packages/freevo/trunk/debian/patches/freevo_config_py_remarks.diff
packages/freevo/trunk/debian/patches/local_conf_py_example_remarks.diff
packages/freevo/trunk/debian/patches/nocheck
packages/freevo/trunk/debian/patches/source_etc_freevo_debconf_py.diff
packages/freevo/trunk/debian/patches/umask.diff
packages/freevo/trunk/debian/rules
Log:
refresh quilt patches, then switch to dpkg-source 3.0 (quilt) format
Modified: packages/freevo/trunk/debian/changelog
===================================================================
--- packages/freevo/trunk/debian/changelog 2010-02-05 14:56:05 UTC (rev 187)
+++ packages/freevo/trunk/debian/changelog 2010-02-05 22:34:29 UTC (rev 188)
@@ -16,6 +16,7 @@
* switch to pysupport, thanks to Sandro Tosi
* debian/control, Vcs-* fields point to where development is (trunk),
thanks to Sandro Tosi (Closes: #568021).
+ * Switch to dpkg-source 3.0 (quilt) format
-- A Mennucc1 <mennucc1 at debian.org> Fri, 05 Feb 2010 13:52:39 +0100
Modified: packages/freevo/trunk/debian/patches/config_py.diff
===================================================================
--- packages/freevo/trunk/debian/patches/config_py.diff 2010-02-05 14:56:05 UTC (rev 187)
+++ packages/freevo/trunk/debian/patches/config_py.diff 2010-02-05 22:34:29 UTC (rev 188)
@@ -1,6 +1,8 @@
---- freevo-1.8.0/src/config.py 2008-03-19 08:06:04.000000000 +0100
-+++ freevo-1.8.0/src/config.py 2008-03-25 14:42:47.000000000 +0100
-@@ -293,7 +293,8 @@
+Index: freevo-1.9.0/src/config.py
+===================================================================
+--- freevo-1.9.0.orig/src/config.py 2010-02-05 23:11:04.000000000 +0100
++++ freevo-1.9.0/src/config.py 2010-02-05 23:12:30.000000000 +0100
+@@ -276,7 +276,8 @@
print 'about the parameter. Based on the information in that file, Freevo will guess'
print 'some settings for your system. This takes place in a file called '
print '\'freevo_config.py\'. Since this file may change from time to time, you should'
@@ -10,7 +12,7 @@
print 'called \'local_conf.py\'. You can overwrite the variables from \'freevo_config.py\''
print 'in here. There is an example for \'local_conf.py\' called \'local_conf.py.example\''
print 'in the Freevo distribution.'
-@@ -502,7 +503,10 @@
+@@ -497,7 +498,10 @@
#
# Config file handling
#
@@ -22,8 +24,8 @@
#
-@@ -635,6 +639,12 @@
- print
+@@ -573,6 +577,12 @@
+ print_help()
sys.exit(1)
+#Debian specific /etc/freevo/debconf.py file, to read configurations
@@ -34,4 +36,4 @@
+ execfile(overridefile, globals(), locals())
#
- # Search for local_conf.py:
+ # search missing programs at runtime
Modified: packages/freevo/trunk/debian/patches/encodingcore_no_print.diff
===================================================================
--- packages/freevo/trunk/debian/patches/encodingcore_no_print.diff 2010-02-05 14:56:05 UTC (rev 187)
+++ packages/freevo/trunk/debian/patches/encodingcore_no_print.diff 2010-02-05 22:34:29 UTC (rev 188)
@@ -1,7 +1,9 @@
#Bug: https://sourceforge.net/tracker/?func=detail&aid=2943181&group_id=46652&atid=446895
#Author: A Mennucc
---- freevo/src/encodingcore.py.orig 2010-01-24 16:43:34.339159956 +0100
-+++ freevo/src/encodingcore.py 2010-01-24 16:54:14.343159417 +0100
+Index: freevo-1.9.0/src/encodingcore.py
+===================================================================
+--- freevo-1.9.0.orig/src/encodingcore.py 2010-02-05 23:13:06.000000000 +0100
++++ freevo-1.9.0/src/encodingcore.py 2010-02-05 23:13:21.000000000 +0100
@@ -37,7 +37,7 @@
from time import sleep
import sys, os, re #, ConfigParser, copy
@@ -38,7 +40,7 @@
re_crop = re.compile('.*-vf crop=(\d*:\d*:\d*:\d*).*')
re_ntscprog = re.compile('24fps progressive NTSC content detected')
-@@ -1070,12 +1068,10 @@
+@@ -1065,12 +1063,10 @@
#get the first queued object
self.currentjob = self.qlist[0]
Modified: packages/freevo/trunk/debian/patches/encodingcore_report_failures.diff
===================================================================
--- packages/freevo/trunk/debian/patches/encodingcore_report_failures.diff 2010-02-05 14:56:05 UTC (rev 187)
+++ packages/freevo/trunk/debian/patches/encodingcore_report_failures.diff 2010-02-05 22:34:29 UTC (rev 188)
@@ -1,8 +1,11 @@
#Bug: https://sourceforge.net/tracker/?func=detail&aid=2943182&group_id=46652&atid=446895
#Author: A Mennucc
---- freevo/src/encodingcore.py.orig 2010-01-24 17:46:35.883938016 +0100
-+++ freevo/src/encodingcore.py 2010-01-24 18:00:37.163163577 +0100
-@@ -1080,4 +1077,14 @@
+Index: freevo-1.9.0/src/encodingcore.py
+===================================================================
+--- freevo-1.9.0.orig/src/encodingcore.py 2010-02-05 23:13:21.000000000 +0100
++++ freevo-1.9.0/src/encodingcore.py 2010-02-05 23:13:35.000000000 +0100
+@@ -1074,6 +1074,16 @@
+ # check eventually that there is no file by the same name
unique_output = uniquify_filename(output)
+ if hasattr(self.currentjob,'thread'):
@@ -17,3 +20,4 @@
+
if self.currentjob.status == status.vpassfinal:
_debug_('Job %s finished' % self.currentjob.idnr, DINFO)
+ if self.currentjob.rmsource:
Modified: packages/freevo/trunk/debian/patches/encodingcore_video_copy_noargs.diff
===================================================================
--- packages/freevo/trunk/debian/patches/encodingcore_video_copy_noargs.diff 2010-02-05 14:56:05 UTC (rev 187)
+++ packages/freevo/trunk/debian/patches/encodingcore_video_copy_noargs.diff 2010-02-05 22:34:29 UTC (rev 188)
@@ -1,8 +1,10 @@
#Bug: https://sourceforge.net/tracker/?func=detail&aid=2943184&group_id=46652&atid=446895
#Author: A Mennucc
---- x/src/encodingcore.py.orig 2009-09-20 18:24:53.000000000 +0200
-+++ x/src/encodingcore.py 2009-10-04 15:00:57.000000000 +0200
-@@ -811,8 +812,9 @@
+Index: freevo-1.9.0/src/encodingcore.py
+===================================================================
+--- freevo-1.9.0.orig/src/encodingcore.py 2009-05-26 18:15:08.000000000 +0200
++++ freevo-1.9.0/src/encodingcore.py 2010-02-05 23:13:06.000000000 +0100
+@@ -805,8 +805,9 @@
# set video encoder options
if self.altprofile is None:
Modified: packages/freevo/trunk/debian/patches/freevo_config_py_remarks.diff
===================================================================
--- packages/freevo/trunk/debian/patches/freevo_config_py_remarks.diff 2010-02-05 14:56:05 UTC (rev 187)
+++ packages/freevo/trunk/debian/patches/freevo_config_py_remarks.diff 2010-02-05 22:34:29 UTC (rev 188)
@@ -1,5 +1,7 @@
---- freevo/freevo_config.py.orig 2008-01-19 17:52:57.000000000 +0100
-+++ freevo/freevo_config.py 2008-01-19 18:06:32.000000000 +0100
+Index: freevo-1.9.0/freevo_config.py
+===================================================================
+--- freevo-1.9.0.orig/freevo_config.py 2010-02-05 23:10:25.000000000 +0100
++++ freevo-1.9.0/freevo_config.py 2010-02-05 23:11:34.000000000 +0100
@@ -31,6 +31,13 @@
# the format "MAJOR.MINOR", e.g. "2.3". The version number reflects the
# config file format, *not* the Freevo version number.
@@ -14,7 +16,7 @@
# 4) local_conf.py is searched for in ['$cwd/', '~/.freevo',
# '/etc/freevo/', $freevo-bindir/]. The first one found is loaded. It is
# not a required file. The search is independent of where freevo.conf was
-@@ -1003,6 +1010,7 @@
+@@ -1098,6 +1105,7 @@
# Directory myserver:/files/server-stuff will show the item for the
# directory /files/server-stuff if the computer myserver is alive.
#
@@ -22,7 +24,7 @@
VIDEO_ITEMS = None
#
-@@ -1079,6 +1087,7 @@
+@@ -1181,6 +1189,7 @@
#
# To add webradio support, add fxd/webradio.fxd to this list
#
@@ -30,7 +32,7 @@
AUDIO_ITEMS = None
#
-@@ -1122,6 +1131,7 @@
+@@ -1226,6 +1235,7 @@
# This is a list of items (e.g. directories, fxd files). The items itself
# can also be a list of (title, file)
#
@@ -38,7 +40,7 @@
IMAGE_ITEMS = None
#
-@@ -1629,6 +1639,8 @@
+@@ -1774,6 +1784,8 @@
# This is where recorded video is written.
#
# XXX the path doesn't work from the www cgi scripts!
Modified: packages/freevo/trunk/debian/patches/local_conf_py_example_remarks.diff
===================================================================
--- packages/freevo/trunk/debian/patches/local_conf_py_example_remarks.diff 2010-02-05 14:56:05 UTC (rev 187)
+++ packages/freevo/trunk/debian/patches/local_conf_py_example_remarks.diff 2010-02-05 22:34:29 UTC (rev 188)
@@ -1,5 +1,7 @@
---- freevo-1.8.0/local_conf.py.example 2008-03-12 08:24:34.000000000 +0100
-+++ freevo-1.8.0/local_conf.py.example 2008-03-25 14:50:23.000000000 +0100
+Index: freevo-1.9.0/local_conf.py.example
+===================================================================
+--- freevo-1.9.0.orig/local_conf.py.example 2010-02-05 23:10:23.000000000 +0100
++++ freevo-1.9.0/local_conf.py.example 2010-02-05 23:12:45.000000000 +0100
@@ -11,6 +11,13 @@
# /usr/share/freevo, contains all the core settings. To change the settings copy
# this file to ~/.freevo/local_conf.py or /etc/freevo/local_conf.py
@@ -14,7 +16,7 @@
# It does not contain all the possible settings that you can change, see
# freevo_config.py for all the possible settings. Also it does not contain
# settings for the plug-ins, plug-ins contain their configuration information and
-@@ -627,6 +634,8 @@
+@@ -654,6 +661,8 @@
# This is a list of items (e.g. directories, fxd files). The items themselves
# can also be a list of (title, file)
#
@@ -23,7 +25,7 @@
# VIDEO_ITEMS = [
# ('action movies', '/freevo/movies/action'),
# ('funny stuff', '/freevo/movies/comedy'),
-@@ -707,6 +716,8 @@
+@@ -742,6 +751,8 @@
#
# To add webradio support, add fxd/webradio.fxd to this list
#
@@ -32,7 +34,7 @@
# AUDIO_ITEMS = [
# ('Music Collection', '/freevo/audio/mp3'),
# 'fxd/webradio.fxd',
-@@ -753,6 +764,8 @@
+@@ -790,6 +801,8 @@
# This is a list of items (e.g. directories, fxd files). The items itself
# can also be a list of (title, file)
#
@@ -41,7 +43,7 @@
# IMAGE_ITEMS = [
# ('My Photos', '/freevo/images'),
# ]
-@@ -1155,6 +1168,9 @@
+@@ -1219,6 +1232,9 @@
# This is where recorded video is written.
#
# XXX the path doesn't work from the www cgi scripts!
Modified: packages/freevo/trunk/debian/patches/nocheck
===================================================================
--- packages/freevo/trunk/debian/patches/nocheck 2010-02-05 14:56:05 UTC (rev 187)
+++ packages/freevo/trunk/debian/patches/nocheck 2010-02-05 22:34:29 UTC (rev 188)
@@ -1,8 +1,8 @@
-Index: freevo-1.8.3/setup.py
+Index: freevo-1.9.0/setup.py
===================================================================
---- freevo-1.8.3.orig/setup.py 2008-11-16 18:56:51.000000000 +0100
-+++ freevo-1.8.3/setup.py 2008-12-04 22:16:40.000000000 +0100
-@@ -32,7 +32,7 @@
+--- freevo-1.9.0.orig/setup.py 2010-02-05 23:10:30.000000000 +0100
++++ freevo-1.9.0/setup.py 2010-02-05 23:10:36.000000000 +0100
+@@ -36,7 +36,7 @@
if sys.hexversion < 0x2050000:
libs_to_check.append(('elementtree', 'http://effbot.org/zone/elementtree.htm'))
Modified: packages/freevo/trunk/debian/patches/source_etc_freevo_debconf_py.diff
===================================================================
--- packages/freevo/trunk/debian/patches/source_etc_freevo_debconf_py.diff 2010-02-05 14:56:05 UTC (rev 187)
+++ packages/freevo/trunk/debian/patches/source_etc_freevo_debconf_py.diff 2010-02-05 22:34:29 UTC (rev 188)
@@ -1,6 +1,8 @@
---- freevo.orig/src/config.py.orig 2008-01-19 17:46:34.000000000 +0100
-+++ freevo/src/config.py 2008-01-19 17:48:40.000000000 +0100
-@@ -608,6 +608,12 @@
+Index: freevo-1.9.0/src/config.py
+===================================================================
+--- freevo-1.9.0.orig/src/config.py 2010-02-05 23:10:26.000000000 +0100
++++ freevo-1.9.0/src/config.py 2010-02-05 23:11:04.000000000 +0100
+@@ -628,6 +628,12 @@
print
sys.exit(1)
Modified: packages/freevo/trunk/debian/patches/umask.diff
===================================================================
--- packages/freevo/trunk/debian/patches/umask.diff 2010-02-05 14:56:05 UTC (rev 187)
+++ packages/freevo/trunk/debian/patches/umask.diff 2010-02-05 22:34:29 UTC (rev 188)
@@ -1,6 +1,8 @@
---- freevo/freevo_config.py 2008-01-24 15:59:10.000000000 +0100
-+++ tmp/freevo_config.py 2008-01-24 16:30:15.000000000 +0100
-@@ -698,7 +698,9 @@
+Index: freevo-1.9.0/freevo_config.py
+===================================================================
+--- freevo-1.9.0.orig/freevo_config.py 2010-02-05 23:11:34.000000000 +0100
++++ freevo-1.9.0/freevo_config.py 2010-02-05 23:12:19.000000000 +0100
+@@ -781,7 +781,9 @@
# 022 means only the user has write access. If you share your Freevo
# installation with different users, set this to 002
#
Modified: packages/freevo/trunk/debian/rules
===================================================================
--- packages/freevo/trunk/debian/rules 2010-02-05 14:56:05 UTC (rev 187)
+++ packages/freevo/trunk/debian/rules 2010-02-05 22:34:29 UTC (rev 188)
@@ -16,12 +16,10 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/python-distutils.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
# this is already copied in debian/copyright
DEB_DH_INSTALL_ARGS= -XAquaFusion_Icons_LICENSE -XCOPYING
-
install/freevo::
: # Replace all '#!' calls to python with /usr/bin/python
Added: packages/freevo/trunk/debian/source/format
===================================================================
--- packages/freevo/trunk/debian/source/format (rev 0)
+++ packages/freevo/trunk/debian/source/format 2010-02-05 22:34:29 UTC (rev 188)
@@ -0,0 +1 @@
+3.0 (quilt)
More information about the Pkg-freevo-commits
mailing list