[pkg-freevo-commits] r218 - in packages/freevo/trunk/debian: . patches
Andrea Mennucci
mennucc1 at alioth.debian.org
Sun Oct 23 20:08:59 UTC 2011
Author: mennucc1
Date: 2011-10-23 20:08:58 +0000 (Sun, 23 Oct 2011)
New Revision: 218
Added:
packages/freevo/trunk/debian/patches/rc.py.diff
Removed:
packages/freevo/trunk/debian/pyversions
Modified:
packages/freevo/trunk/debian/changelog
packages/freevo/trunk/debian/compat
packages/freevo/trunk/debian/control
packages/freevo/trunk/debian/patches/config_py.diff
packages/freevo/trunk/debian/patches/exit_0_if_running.diff
packages/freevo/trunk/debian/patches/local_conf_py_example_remarks.diff
packages/freevo/trunk/debian/patches/nocheck
packages/freevo/trunk/debian/patches/series
packages/freevo/trunk/debian/patches/source_etc_freevo_debconf_py.diff
packages/freevo/trunk/debian/patches/umask.diff
packages/freevo/trunk/debian/rules
Log:
new freevo
Modified: packages/freevo/trunk/debian/changelog
===================================================================
--- packages/freevo/trunk/debian/changelog 2011-10-23 20:04:24 UTC (rev 217)
+++ packages/freevo/trunk/debian/changelog 2011-10-23 20:08:58 UTC (rev 218)
@@ -1,3 +1,14 @@
+freevo (1.9.2b2-1) unstable; urgency=low
+
+ * new upstream version
+ * do not use python-support
+ * Bug fix: "not compatible with Python 2.7?", thanks to Jakub Wilk
+ (Closes: #629085).
+ * Bug fix: "Please update freevo imdb plugin", thanks to alex (Closes:
+ #511020).
+
+ -- A Mennucc1 <mennucc1 at debian.org> Sun, 23 Oct 2011 17:18:40 +0200
+
freevo (1.9.0-10.1) unstable; urgency=low
* Non-maintainer upload.
Modified: packages/freevo/trunk/debian/compat
===================================================================
--- packages/freevo/trunk/debian/compat 2011-10-23 20:04:24 UTC (rev 217)
+++ packages/freevo/trunk/debian/compat 2011-10-23 20:08:58 UTC (rev 218)
@@ -1 +1 @@
-5
+8
Modified: packages/freevo/trunk/debian/control
===================================================================
--- packages/freevo/trunk/debian/control 2011-10-23 20:04:24 UTC (rev 217)
+++ packages/freevo/trunk/debian/control 2011-10-23 20:08:58 UTC (rev 218)
@@ -4,8 +4,9 @@
Maintainer: Freevo Debian Dream Team <pkg-freevo-maint at lists.alioth.debian.org>
Uploaders: Georg W. Leonhardt <leonhardt at geole.info>, A Mennucc1 <mennucc1 at debian.org>
Build-Depends-Indep: po-debconf
-Build-Depends: cdbs (>= 0.4.48), python-support (>= 0.90.0), python2.6, debhelper (>= 5.0.38), docbook
+Build-Depends: cdbs (>= 0.4.90), python-all-dev, debhelper (>= 5.0.38), docbook
Standards-Version: 3.9.1.0
+X-Python-Version: >= 2.6
Vcs-Svn: svn://svn.debian.org/svn/pkg-freevo/packages/freevo/trunk/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-freevo/packages/freevo/trunk/
Homepage: http://freevo.org/
Modified: packages/freevo/trunk/debian/patches/config_py.diff
===================================================================
--- packages/freevo/trunk/debian/patches/config_py.diff 2011-10-23 20:04:24 UTC (rev 217)
+++ packages/freevo/trunk/debian/patches/config_py.diff 2011-10-23 20:08:58 UTC (rev 218)
@@ -1,18 +1,16 @@
-Index: freevo-1.9.0/src/config.py
+Index: freevo-1.9.2b2/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'
-- print 'not edit this file. After freevo_config.py is loaded, Freevo will look for a file'
-+ print 'not edit this file. After freevo_config.py is loaded, Freevo will load'
-+ print 'load the Debian specific \'/etc/freevo/debconf.py\', and then it will look for a file'
- 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.'
-@@ -497,7 +498,10 @@
+--- freevo-1.9.2b2.orig/src/config.py 2011-10-23 17:38:26.945039874 +0200
++++ freevo-1.9.2b2/src/config.py 2011-10-23 17:42:50.530504424 +0200
+@@ -277,6 +277,7 @@
+ guess some settings for your system. This takes place in a file called
+ 'freevo_config.py'. Since this file may change from time to time, you
+ should not edit this file. After freevo_config.py is loaded, Freevo will
++ load the Debian specific '/etc/freevo/debconf.py', and then it will
+ look for a file called 'local_conf.py'. You can overwrite the variables
+ from 'freevo_config.py' in here. There is an example for 'local_conf.py'
+ called 'local_conf.py.example' in the Freevo distribution.
+@@ -501,7 +502,10 @@
#
# Config file handling
#
@@ -24,7 +22,7 @@
#
-@@ -573,6 +577,12 @@
+@@ -576,6 +580,12 @@
print_help()
sys.exit(1)
Modified: packages/freevo/trunk/debian/patches/exit_0_if_running.diff
===================================================================
--- packages/freevo/trunk/debian/patches/exit_0_if_running.diff 2011-10-23 20:04:24 UTC (rev 217)
+++ packages/freevo/trunk/debian/patches/exit_0_if_running.diff 2011-10-23 20:08:58 UTC (rev 218)
@@ -1,8 +1,8 @@
-Index: freevo-1.9.0/freevo
+Index: freevo-1.9.2b2/freevo
===================================================================
---- freevo-1.9.0.orig/freevo 2010-08-10 17:11:52.000000000 +0200
-+++ freevo-1.9.0/freevo 2010-08-10 17:13:13.000000000 +0200
-@@ -657,7 +657,8 @@
+--- freevo-1.9.2b2.orig/freevo 2010-12-05 21:41:53.000000000 +0100
++++ freevo-1.9.2b2/freevo 2011-10-23 17:51:05.782598410 +0200
+@@ -654,7 +654,8 @@
sys.exit("Can't find helper %s" % name)
if check and getpid(name, python + proc)[1]:
Modified: packages/freevo/trunk/debian/patches/local_conf_py_example_remarks.diff
===================================================================
--- packages/freevo/trunk/debian/patches/local_conf_py_example_remarks.diff 2011-10-23 20:04:24 UTC (rev 217)
+++ packages/freevo/trunk/debian/patches/local_conf_py_example_remarks.diff 2011-10-23 20:08:58 UTC (rev 218)
@@ -1,7 +1,7 @@
-Index: freevo-1.9.0/local_conf.py.example
+Index: freevo-1.9.2b2/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
+--- freevo-1.9.2b2.orig/local_conf.py.example 2010-11-12 18:54:09.000000000 +0100
++++ freevo-1.9.2b2/local_conf.py.example 2011-10-23 17:43:18.785374946 +0200
@@ -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
@@ -16,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
-@@ -654,6 +661,8 @@
+@@ -574,6 +581,8 @@
# This is a list of items (e.g. directories, fxd files). The items themselves
# can also be a list of (title, file)
#
@@ -25,7 +25,7 @@
# VIDEO_ITEMS = [
# ('action movies', '/freevo/movies/action'),
# ('funny stuff', '/freevo/movies/comedy'),
-@@ -742,6 +751,8 @@
+@@ -662,6 +671,8 @@
#
# To add webradio support, add fxd/webradio.fxd to this list
#
@@ -34,7 +34,7 @@
# AUDIO_ITEMS = [
# ('Music Collection', '/freevo/audio/mp3'),
# 'fxd/webradio.fxd',
-@@ -790,6 +801,8 @@
+@@ -710,6 +721,8 @@
# This is a list of items (e.g. directories, fxd files). The items itself
# can also be a list of (title, file)
#
@@ -43,7 +43,7 @@
# IMAGE_ITEMS = [
# ('My Photos', '/freevo/images'),
# ]
-@@ -1219,6 +1232,9 @@
+@@ -1139,6 +1152,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 2011-10-23 20:04:24 UTC (rev 217)
+++ packages/freevo/trunk/debian/patches/nocheck 2011-10-23 20:08:58 UTC (rev 218)
@@ -1,13 +1,13 @@
-Index: freevo-1.9.0/setup.py
+Index: freevo-1.9.2b2/setup.py
===================================================================
---- 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 @@
+--- freevo-1.9.2b2.orig/setup.py 2011-02-17 21:49:16.000000000 +0100
++++ freevo-1.9.2b2/setup.py 2011-10-23 17:34:47.789797503 +0200
+@@ -45,7 +45,7 @@
if sys.hexversion < 0x2050000:
libs_to_check.append(('elementtree', 'http://effbot.org/zone/elementtree.htm'))
-check_libs(libs_to_check)
+#check_libs(libs_to_check)
-
- class Runtime(core.Command):
+ class CustomInstall(install.install):
+ def run(self):
Added: packages/freevo/trunk/debian/patches/rc.py.diff
===================================================================
--- packages/freevo/trunk/debian/patches/rc.py.diff (rev 0)
+++ packages/freevo/trunk/debian/patches/rc.py.diff 2011-10-23 20:08:58 UTC (rev 218)
@@ -0,0 +1,21 @@
+--- x/src/rc.py.orig 2011-03-04 10:51:55.000000000 +0100
++++ x/src/rc.py 2011-10-23 15:52:44.031558233 +0200
+@@ -199,9 +199,15 @@
+ Handle input events from input helper over stderr
+ """
+ data = self.input.stderr.read(self.wire_format.size)
+- t, key = self.wire_format.unpack(data)
+- if time.time() - t < 0.5:
+- self.rc.post_key(key)
++ if data:
++ t, key = self.wire_format.unpack(data)
++ if time.time() - t < 0.5:
++ self.rc.post_key(key)
++ else:
++ #NO DATA, probably the helper exited!
++ self.input.poll()
++ if self.input.returncode != None:
++ self.monitor.unregister()
+
+ def __send_cmd(self, cmd):
+ """
Modified: packages/freevo/trunk/debian/patches/series
===================================================================
--- packages/freevo/trunk/debian/patches/series 2011-10-23 20:04:24 UTC (rev 217)
+++ packages/freevo/trunk/debian/patches/series 2011-10-23 20:08:58 UTC (rev 218)
@@ -5,14 +5,16 @@
umask.diff
config_py.diff
local_conf_py_example_remarks.diff
-cdrom.patch
-weather.diff
-dvbstreamer_spaces_in_service.diff
-encodingcore_video_copy_noargs.diff
-encodingcore_no_print.diff
-encodingcore_report_failures.diff
-imdb-html5lib.patch
-twisted-web-9.diff
exit_0_if_running.diff
-force-python2.5.diff
-svn11693-py2.6-exceptions.diff
+rc.py.diff
+
+#cdrom.patch
+#weather.diff
+#dvbstreamer_spaces_in_service.diff
+#encodingcore_video_copy_noargs.diff
+#encodingcore_no_print.diff
+#encodingcore_report_failures.diff
+#imdb-html5lib.patch
+#twisted-web-9.diff
+#force-python2.5.diff
+#svn11693-py2.6-exceptions.diff
Modified: packages/freevo/trunk/debian/patches/source_etc_freevo_debconf_py.diff
===================================================================
--- packages/freevo/trunk/debian/patches/source_etc_freevo_debconf_py.diff 2011-10-23 20:04:24 UTC (rev 217)
+++ packages/freevo/trunk/debian/patches/source_etc_freevo_debconf_py.diff 2011-10-23 20:08:58 UTC (rev 218)
@@ -1,8 +1,8 @@
-Index: freevo-1.9.0/src/config.py
+Index: freevo-1.9.2b2/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 @@
+--- freevo-1.9.2b2.orig/src/config.py 2010-11-11 11:30:23.000000000 +0100
++++ freevo-1.9.2b2/src/config.py 2011-10-23 17:38:26.945039874 +0200
+@@ -631,6 +631,12 @@
print
sys.exit(1)
Modified: packages/freevo/trunk/debian/patches/umask.diff
===================================================================
--- packages/freevo/trunk/debian/patches/umask.diff 2011-10-23 20:04:24 UTC (rev 217)
+++ packages/freevo/trunk/debian/patches/umask.diff 2011-10-23 20:08:58 UTC (rev 218)
@@ -1,8 +1,8 @@
-Index: freevo-1.9.0/freevo_config.py
+Index: freevo-1.9.2b2/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 @@
+--- freevo-1.9.2b2.orig/freevo_config.py 2011-10-23 17:38:57.911802302 +0200
++++ freevo-1.9.2b2/freevo_config.py 2011-10-23 17:39:31.554457722 +0200
+@@ -672,7 +672,9 @@
# 022 means only the user has write access. If you share your Freevo
# installation with different users, set this to 002
#
Deleted: packages/freevo/trunk/debian/pyversions
===================================================================
--- packages/freevo/trunk/debian/pyversions 2011-10-23 20:04:24 UTC (rev 217)
+++ packages/freevo/trunk/debian/pyversions 2011-10-23 20:08:58 UTC (rev 218)
@@ -1 +0,0 @@
-2.6
Modified: packages/freevo/trunk/debian/rules
===================================================================
--- packages/freevo/trunk/debian/rules 2011-10-23 20:04:24 UTC (rev 217)
+++ packages/freevo/trunk/debian/rules 2011-10-23 20:08:58 UTC (rev 218)
@@ -1,11 +1,9 @@
#!/usr/bin/make -f
-DEB_PYTHON_SYSTEM=pysupport
-DEB_DH_INSTALL_SOURCEDIR=$(CURDIR)/debian/tmp
+DEB_PYTHON2_MODULE_PACKAGES=freevo python-freevo
DEBIAN_VERSION:=$(shell head -1 debian/changelog | cut -d\( -f2 | cut -d\) -f1)
-UPSTREAM_VERSION:=1.9.0
-#$(shell echo "$(DEBIAN_VERSION)"| cut -d- -f1 | sed 's/~//')
+UPSTREAM_VERSION:=1.9.2b2
#configure/freevo::
# #this is needed in SVN versions to build documentations
@@ -20,6 +18,11 @@
# this is already copied in debian/copyright
DEB_DH_INSTALL_ARGS= -XAquaFusion_Icons_LICENSE -XCOPYING
+build/freevo::
+ ./autogen.sh
+ #this is broken at this point
+ echo "__revision__ = 'upstream'" > src/revision.py
+
install/freevo::
: # Replace all '#!' calls to python with /usr/bin/python
@@ -42,11 +45,6 @@
mv $(CURDIR)/debian/tmp/usr/share/doc/freevo-$(UPSTREAM_VERSION) \
$(CURDIR)/debian/tmp/usr/share/doc/freevo
- mv $(CURDIR)/README \
- $(CURDIR)/debian/freevo-doc/usr/share/doc/freevo
- mv $(CURDIR)/TODO \
- $(CURDIR)/debian/freevo-doc/usr/share/doc/freevo
-
mv $(CURDIR)/debian/tmp/usr/bin/freevo $(CURDIR)/debian/tmp/usr/bin/freevo.real
install $(CURDIR)/debian/scripts/freevo $(CURDIR)/debian/tmp/usr/bin/freevo
install $(CURDIR)/debian/scripts/freevo+log $(CURDIR)/debian/tmp/usr/share/freevo/contrib/freevo+log
@@ -61,14 +59,11 @@
dh_installinit -pfreevo --no-start --name=freevo_webserver
dh_installinit -pfreevo --no-start --name=freevo_rssserver
-$(patsubst %,install/%,$(DEB_PACKAGES)) ::
- if [ -e debian/$(cdbs_curpkg).linda-overrides ] ; then \
- mkdir -p debian/$(cdbs_curpkg)/usr/share/linda/overrides/ ; \
- cp debian/$(cdbs_curpkg).linda-overrides debian/$(cdbs_curpkg)/usr/share/linda/overrides/$(cdbs_curpkg) ; \
- fi
+binary-install/freevo-doc::
+ cd debian/freevo-doc/usr/share/doc/freevo/ && rm README RELEASE_NOTES INSTALL
binary-install/freevo-data::
- for i in `cd debian/freevo-data/usr/share/freevo/fonts ; echo Vera*`; do \
+ for i in VeraBd.ttf VeraBI.ttf VeraIt.ttf VeraMoBd.ttf VeraMoBI.ttf VeraMoIt.ttf VeraMono.ttf VeraSeBd.ttf VeraSe.ttf Vera.ttf ; do \
rm -v debian/freevo-data/usr/share/freevo/fonts/$$i ;\
dh_link -pfreevo-data /usr/share/fonts/truetype/ttf-bitstream-vera/$$i \
/usr/share/freevo/fonts/$$i ;\
@@ -86,5 +81,6 @@
debian/freevo-data/usr/share/freevo/skins/osd/base.fxd
find debian/freevo-data/usr/share/freevo -type f -name '*.png' -print0 | xargs -0 chmod a-x
+
clean::
rm -f version.pyc
More information about the Pkg-freevo-commits
mailing list