Author: duncan
Date: Tue Sep 26 11:52:44 2006
New Revision: 8239
Added:
branches/rel-1-5/freevo/contrib/patches/freevo-freq-switzerland-zh.patch
- copied, changed from r8238,
/branches/rel-1-5/freevo/contrib/patches/freevo-1.5.4-zh-tv-freq.patch
branches/rel-1-5/freevo/contrib/patches/freevo-setup-nodocs.patch
branches/rel-1-5/freevo/contrib/patches/mplayer-freq-switzerland-zh.patch
- copied unchanged from r8238,
/branches/rel-1-5/freevo/contrib/patches/mplayer-zh-frequencies.patch
Removed:
branches/rel-1-5/freevo/contrib/patches/freevo-1.5.4-zh-tv-freq.patch
branches/rel-1-5/freevo/contrib/patches/mplayer-zh-frequencies.patch
Log:
Added freevo-setup-nodocs.patch
Renamed Swiss frequencies patches
Copied:
branches/rel-1-5/freevo/contrib/patches/freevo-freq-switzerland-zh.patch (from
r8238, /branches/rel-1-5/freevo/contrib/patches/freevo-1.5.4-zh-tv-freq.patch)
==============================================================================
--- /branches/rel-1-5/freevo/contrib/patches/freevo-1.5.4-zh-tv-freq.patch
(original)
+++ branches/rel-1-5/freevo/contrib/patches/freevo-freq-switzerland-zh.patch
Tue Sep 26 11:52:44 2006
@@ -1,43 +1,7 @@
-diff -Naur freevo-1.5.4.orig/src/setup_freevo.py
freevo-1.5.4/src/setup_freevo.py
---- freevo-1.5.4.orig/src/setup_freevo.py 2005-10-16 11:18:50.000000000
+0200
-+++ freevo-1.5.4/src/setup_freevo.py 2005-11-11 13:56:19.000000000 +0100
-@@ -5,13 +5,13 @@
- # This is an application that is executed by the "./freevo" script
- # after checking for python.
- # -----------------------------------------------------------------------
--# $Id: setup_freevo.py 6944 2005-01-09 10:45:55Z dischi $
-+# $Id: setup_freevo.py,v 1.18.2.1 2005/01/09 10:45:54 dischi Exp $
- #
- # Notes:
- # Todo:
- #
- # -----------------------------------------------------------------------
--# $Log$
-+# $Log: setup_freevo.py,v $
- # Revision 1.18.2.1 2005/01/09 10:45:54 dischi
- # support for russian tv
- #
-@@ -104,7 +104,7 @@
- japan-bcast, japan-cable, europe-west,
- europe-east, italy, newzealand, australia,
- ireland, france, china-bcast, southafrica,
-- argentina, canada-cable
-+ argentina, canada-cable, switzerland
-
- --help display this help and exit
-
-@@ -138,7 +138,7 @@
- 'japan-bcast', 'japan-cable', 'europe-west',
- 'europe-east', 'italy', 'newzealand', 'australia',
- 'ireland', 'france', 'china-bcast', 'southafrica',
-- 'argentina', 'canada-cable','russia']
-+ 'argentina', 'canada-cable', 'russia', 'switzerland']
-
- if not conf.geometry in vals_geometry:
- print 'geometry must be one of: %s' % ' '.join(vals_geometry)
-diff -Naur freevo-1.5.4.orig/src/tv/freq.py freevo-1.5.4/src/tv/freq.py
---- freevo-1.5.4.orig/src/tv/freq.py 2005-10-16 11:18:50.000000000 +0200
-+++ freevo-1.5.4/src/tv/freq.py 2005-11-11 13:54:48.000000000 +0100
+Index: src/tv/freq.py
+===================================================================
+--- src/tv/freq.py (revision 8238)
++++ src/tv/freq.py (working copy)
@@ -1291,6 +1291,54 @@
("69", 855250 ),
]
@@ -99,3 +63,25 @@
"russia" : dict(RUSSIA),
+ "switzerland" : dict(PAL_SWITZERLAND),
}
+Index: src/setup_freevo.py
+===================================================================
+--- src/setup_freevo.py (revision 8238)
++++ src/setup_freevo.py (working copy)
+@@ -105,7 +105,7 @@
+ japan-bcast, japan-cable, europe-west,
+ europe-east, italy, newzealand, australia,
+ ireland, france, china-bcast, southafrica,
+- argentina, canada-cable
++ argentina, canada-cable, switzerland
+
+ --help display this help and exit
+
+@@ -139,7 +139,7 @@
+ 'japan-bcast', 'japan-cable', 'europe-west',
+ 'europe-east', 'italy', 'newzealand', 'australia',
+ 'ireland', 'france', 'china-bcast', 'southafrica',
+- 'argentina', 'canada-cable','russia']
++ 'argentina', 'canada-cable', 'russia', 'switzerland']
+
+ if not conf.geometry in vals_geometry:
+ print 'geometry must be one of: %s' % ' '.join(vals_geometry)
Added: branches/rel-1-5/freevo/contrib/patches/freevo-setup-nodocs.patch
==============================================================================
--- (empty file)
+++ branches/rel-1-5/freevo/contrib/patches/freevo-setup-nodocs.patch Tue Sep
26 11:52:44 2006
@@ -0,0 +1,25 @@
+Index: setup.py
+===================================================================
+--- setup.py (revision 8238)
++++ setup.py (working copy)
+@@ -110,20 +110,12 @@
+ # only add files not in share and src
+
+ data_files = []
+-# add some files to Docs
+-for f in ('COPYING', 'ChangeLog', 'INSTALL', 'README'):
+- data_files.append(('share/doc/freevo-%s' % version.__version__, ['%s' % f
]))
+-data_files.append(('share/doc/freevo-%s' % version.__version__,
['Docs/CREDITS' ]))
+ data_files.append(('share/fxd', ['share/fxd/webradio.fxd']))
+
+ # copy freevo_config.py to share/freevo. It's the best place to put it
+ # for now, but the location should be changed
+ data_files.append(('share/freevo', [ 'freevo_config.py' ]))
+
+-# add docbook style howtos
+-os.path.walk('./Docs/installation', docbook_finder, data_files)
+-os.path.walk('./Docs/plugin_writing', docbook_finder, data_files)
+-
+ # start script
+ scripts = ['freevo']
+
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
