diff -Nru freevo-1.9.0/debian/changelog freevo-1.9.0/debian/changelog --- freevo-1.9.0/debian/changelog 2011-01-27 08:42:46.000000000 +0000 +++ freevo-1.9.0/debian/changelog 2011-01-25 19:21:49.000000000 +0000 @@ -1,10 +1,15 @@ -freevo (1.9.0-10) unstable; urgency=high +freevo (1.9.0-9ubuntu1) natty; urgency=low - * Fix FTBFS: rm: cannot remove - debian/tmp/usr/share/freevo/icons/themes/geexbox/mimetypes/folder.png - thanks to Jakub Wilk (Closes: #611093). + * Merge from debian unstable. Remaining changes: + - debian/control: Replace Depends on mplayer with xine-ui; Remove xine-ui + from Recommends + * Multiple changes to fix FTBFS: + - debian/control: Replace python2.5 Build-Depends with python (>= 2.6) + - debian/pyversion: Replace 2.5,2.6 with 2.6,2.7 + - debian/rules: Dont delete folder.png before creating the new symlink, + as it doesn't seem to be there on our builds - -- A Mennucc1 Thu, 27 Jan 2011 09:07:13 +0100 + -- David Futcher Tue, 25 Jan 2011 18:58:55 +0000 freevo (1.9.0-9) unstable; urgency=medium @@ -45,6 +50,16 @@ -- A Mennucc1 Thu, 23 Dec 2010 10:49:15 +0100 +freevo (1.9.0-6ubuntu1) natty; urgency=low + + * Merge from debian unstable, remaining changes: + - debian/control: Replace Depends on mplayer with xine-ui. + * Dropped changes: + - debian/scripts/freevo: Fix argument handling: change applied in the + debian package + + -- Lorenzo De Liso Sat, 16 Oct 2010 14:37:57 +0200 + freevo (1.9.0-6) unstable; urgency=low * fix Problem running imdb plugin from command line, @@ -55,6 +70,14 @@ -- A Mennucc1 Wed, 29 Sep 2010 21:43:02 +0200 +freevo (1.9.0-5ubuntu1) maverick; urgency=low + + * Merge from debian unstable, remaining changes: + - debian/control: Replace Depends on mplayer with xine-ui. + - debian/scripts/freevo: Fix argument handling. + + -- Lorenzo De Liso Wed, 01 Sep 2010 21:46:43 +0200 + freevo (1.9.0-5) unstable; urgency=low * [INTL:da] Danish translation of the debconf templates freevo, @@ -70,6 +93,14 @@ -- A Mennucc1 Wed, 11 Aug 2010 16:22:47 +0200 +freevo (1.9.0-4ubuntu1) maverick; urgency=low + + * Merge from debian testing, remaining changes: (LP: #593503) + - debian/control: Replace Depends on mplayer with xine-ui. + - debian/scripts/freevo: Fix argument handling. + + -- Charlie Smotherman Sun, 13 Jun 2010 22:51:34 -0500 + freevo (1.9.0-4) unstable; urgency=low * Thanks Sandro Tosi for the NMU @@ -92,6 +123,14 @@ -- A Mennucc1 Fri, 05 Feb 2010 13:52:39 +0100 +freevo (1.9.0-3.1ubuntu1) lucid; urgency=low + + * Merge from debian testing, remaining changes: (LP: #512922) + - debian/control: Replace Depends on mplayer with xine-ui. + - debian/scripts/freevo: Fix argument handling. + + -- Charlie Smotherman Tue, 26 Jan 2010 12:36:32 -0600 + freevo (1.9.0-3.1) unstable; urgency=low * Non-maintainer upload, to drop Python 2.4; thanks to Luca Falavigna for the @@ -111,6 +150,14 @@ -- Sandro Tosi Tue, 12 Jan 2010 23:19:47 +0100 +freevo (1.9.0-3ubuntu1) karmic; urgency=low + + * Merge from debian unstable, remaining changes: + - debian/control: Replace Depends on mplayer with xine-ui. + - debian/scripts/freevo: Fix argument handling. + + -- Alessio Treglia Thu, 27 Aug 2009 11:19:08 +0200 + freevo (1.9.0-3) unstable; urgency=low * Bug fix: "python-xml removal: please drop/replace (build) @@ -121,6 +168,16 @@ -- A Mennucc1 Tue, 25 Aug 2009 22:10:11 +0200 +freevo (1.9.0-2ubuntu1) karmic; urgency=low + + * Merge from debian unstable, remaining changes: LP: #401317 + + debian/control: + - Don't Depend on mplayer, but rather xine-ui + + debian/scripts/freevo: + - Fix argument handling + + -- Bhavani Shankar Sun, 19 Jul 2009 14:34:53 +0530 + freevo (1.9.0-2) unstable; urgency=low * Bug fix: "Video playback fails under some circumstances from files on @@ -145,6 +202,16 @@ -- A Mennucc1 Sat, 18 Jul 2009 17:11:30 +0200 +freevo (1.9.0-1ubuntu1) karmic; urgency=low + + * Merge from debian unstable (LP: #385645), remaining changes: + + debian/control: + - Don't Depend on mplayer, but rather xine-ui + + debian/scripts/freevo: + - Fix argument handling + + -- Michael Terry Wed, 10 Jun 2009 13:51:15 -0400 + freevo (1.9.0-1) unstable; urgency=low * New upstream version. @@ -179,6 +246,29 @@ -- A Mennucc1 Thu, 04 Dec 2008 21:41:04 +0100 +freevo (1.8.1-3ubuntu3) jaunty; urgency=low + + * make it work with python2.6 (LP: #352148) + + -- Michael Vogt Tue, 31 Mar 2009 17:47:43 +0200 + +freevo (1.8.1-3ubuntu2) jaunty; urgency=low + + * Do not let freevo depend on mplayer, so it can be placed in Universe. + Move xine-ui from Recommends to Depends to provide a good alternative. + + -- Luca Falavigna Sat, 31 Jan 2009 11:12:32 +0100 + +freevo (1.8.1-3ubuntu1) jaunty; urgency=low + + * debian/scripts/freevo: + - The arguments expanded by $@ were not interpreted as one string + (as sg requires) but as parts, i.e. only the first argument was + passed to the /usr/bin/freevo.real command and not all arguments, + fixes LP: #314720. + + -- Alessio Treglia Thu, 08 Jan 2009 23:47:05 +0100 + freevo (1.8.1-3) unstable; urgency=low * freevo does not work with python 2.3 ; set diff -Nru freevo-1.9.0/debian/control freevo-1.9.0/debian/control --- freevo-1.9.0/debian/control 2010-12-28 11:07:28.000000000 +0000 +++ freevo-1.9.0/debian/control 2011-01-25 19:15:09.000000000 +0000 @@ -1,10 +1,11 @@ Source: freevo Section: video Priority: optional -Maintainer: Freevo Debian Dream Team +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Freevo Debian Dream Team Uploaders: Georg W. Leonhardt , A Mennucc1 Build-Depends-Indep: po-debconf -Build-Depends: cdbs (>= 0.4.48), python-support (>= 0.90.0), python2.5, python2.6, debhelper (>= 5.0.38), quilt, docbook +Build-Depends: cdbs (>= 0.4.48), python-support (>= 0.90.0), python (>= 2.6), debhelper (>= 5.0.38), quilt, docbook Standards-Version: 3.9.1.0 Vcs-Svn: svn://svn.debian.org/svn/pkg-freevo/packages/freevo/trunk/ Vcs-Browser: http://svn.debian.org/wsvn/pkg-freevo/packages/freevo/trunk/ @@ -12,8 +13,8 @@ Package: freevo Architecture: all -Depends: ${misc:Depends}, python-support (>= 0.90.0), ${python:Depends}, python-freevo (= ${binary:Version}), freevo-data (= ${binary:Version}), mplayer, lsdvd, console-tools | kbd, debconf, adduser, xinit -Recommends: cdparanoia, xine-ui, xmltv-util, libxmltv-perl +Depends: ${misc:Depends}, python-support (>= 0.90.0), ${python:Depends}, python-freevo (= ${binary:Version}), freevo-data (= ${binary:Version}), xine-ui, lsdvd, console-tools | kbd, debconf, adduser, xinit +Recommends: cdparanoia, xmltv-util, libxmltv-perl Suggests: mencoder, libdvdcss2, lame, ttf-liberation | ttf-mscorefonts-installer, fbxine, flac, vorbis-tools, fbset, matrox-tools, nvram-wakeup Description: home theater framework - binaries Freevo is a complete home theater framework. It can operate as a diff -Nru freevo-1.9.0/debian/po/cs.po freevo-1.9.0/debian/po/cs.po --- freevo-1.9.0/debian/po/cs.po 2010-12-28 11:07:28.000000000 +0000 +++ freevo-1.9.0/debian/po/cs.po 2011-01-02 19:12:52.000000000 +0000 @@ -12,10 +12,10 @@ "PO-Revision-Date: 2009-07-04 09:31+0200\n" "Last-Translator: Miroslav Kure \n" "Language-Team: Czech \n" -"Language: cs\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: cs\n" #. Type: select #. Description @@ -351,17 +351,29 @@ msgid "Please choose the services you wish to start on boot." msgstr "Zvolte si služby, které se mají spouštět při zavádění." -#~ msgid "/home/freevo/video" -#~ msgstr "/home/freevo/video" +#. Type: string +#. Default +#: ../freevo.templates:7001 +msgid "/home/freevo/video" +msgstr "/home/freevo/video" -#~ msgid "/home/freevo/audio" -#~ msgstr "/home/freevo/audio" +#. Type: string +#. Default +#: ../freevo.templates:9001 +msgid "/home/freevo/audio" +msgstr "/home/freevo/audio" -#~ msgid "/home/freevo/image" -#~ msgstr "/home/freevo/image" +#. Type: string +#. Default +#: ../freevo.templates:11001 +msgid "/home/freevo/image" +msgstr "/home/freevo/image" -#~ msgid "/home/freevo/recordings" -#~ msgstr "/home/freevo/recordings" +#. Type: string +#. Default +#: ../freevo.templates:12001 +msgid "/home/freevo/recordings" +msgstr "/home/freevo/recordings" #~ msgid "x11, fbdev, dxr3, mga, directfb, dfbmga, dga" #~ msgstr "x11, fbdev, dxr3, mga, directfb, dfbmga, dga" diff -Nru freevo-1.9.0/debian/po/da.po freevo-1.9.0/debian/po/da.po --- freevo-1.9.0/debian/po/da.po 2010-12-28 11:07:28.000000000 +0000 +++ freevo-1.9.0/debian/po/da.po 2011-01-02 19:12:52.000000000 +0000 @@ -12,10 +12,10 @@ "PO-Revision-Date: 2010-07-11 17:34+0000\n" "Last-Translator: Joe Hansen \n" "Language-Team: Danish \n" -"Language: da\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: da\n" #. Type: select #. Description @@ -350,14 +350,26 @@ msgid "Please choose the services you wish to start on boot." msgstr "Vælg venligst tjenesterne du ønsker at starte ved opstart." -#~ msgid "/home/freevo/video" -#~ msgstr "/home/freevo/video" +#. Type: string +#. Default +#: ../freevo.templates:7001 +msgid "/home/freevo/video" +msgstr "/home/freevo/video" -#~ msgid "/home/freevo/audio" -#~ msgstr "/home/freevo/lyd" +#. Type: string +#. Default +#: ../freevo.templates:9001 +msgid "/home/freevo/audio" +msgstr "/home/freevo/lyd" -#~ msgid "/home/freevo/image" -#~ msgstr "/home/freevo/billeder" +#. Type: string +#. Default +#: ../freevo.templates:11001 +msgid "/home/freevo/image" +msgstr "/home/freevo/billeder" -#~ msgid "/home/freevo/recordings" -#~ msgstr "/home/freevo/optagelser" +#. Type: string +#. Default +#: ../freevo.templates:12001 +msgid "/home/freevo/recordings" +msgstr "/home/freevo/optagelser" diff -Nru freevo-1.9.0/debian/po/de.po freevo-1.9.0/debian/po/de.po --- freevo-1.9.0/debian/po/de.po 2010-12-28 11:07:28.000000000 +0000 +++ freevo-1.9.0/debian/po/de.po 2011-01-02 19:12:52.000000000 +0000 @@ -13,10 +13,10 @@ "PO-Revision-Date: 2009-08-27 21:35+0200\n" "Last-Translator: Thomas Mueller \n" "Language-Team: German \n" -"Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: de\n" "X-Generator: KBabel 1.11.4\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" @@ -365,14 +365,26 @@ "Bitte wählen Sie die gewünschten Server aus, die automatisch gestartet " "werden sollen." -#~ msgid "/home/freevo/video" -#~ msgstr "/home/freevo/filme" +#. Type: string +#. Default +#: ../freevo.templates:7001 +msgid "/home/freevo/video" +msgstr "/home/freevo/filme" -#~ msgid "/home/freevo/audio" -#~ msgstr "/home/freevo/musik" +#. Type: string +#. Default +#: ../freevo.templates:9001 +msgid "/home/freevo/audio" +msgstr "/home/freevo/musik" -#~ msgid "/home/freevo/image" -#~ msgstr "/home/freevo/bilder" +#. Type: string +#. Default +#: ../freevo.templates:11001 +msgid "/home/freevo/image" +msgstr "/home/freevo/bilder" -#~ msgid "/home/freevo/recordings" -#~ msgstr "/home/freevo/aufnahmen" +#. Type: string +#. Default +#: ../freevo.templates:12001 +msgid "/home/freevo/recordings" +msgstr "/home/freevo/aufnahmen" diff -Nru freevo-1.9.0/debian/po/es.po freevo-1.9.0/debian/po/es.po --- freevo-1.9.0/debian/po/es.po 2010-12-28 11:07:28.000000000 +0000 +++ freevo-1.9.0/debian/po/es.po 2011-01-02 19:12:52.000000000 +0000 @@ -35,10 +35,10 @@ "PO-Revision-Date: 2009-06-30 09:12+0100\n" "Last-Translator: Francisco Javier Cuadrado \n" "Language-Team: Debian l10n Spanish \n" -"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: \n" #. Type: select #. Description @@ -376,17 +376,29 @@ msgid "Please choose the services you wish to start on boot." msgstr "Escoja los servicios que quiere iniciar en el arranque." -#~ msgid "/home/freevo/video" -#~ msgstr "/home/freevo/video" +#. Type: string +#. Default +#: ../freevo.templates:7001 +msgid "/home/freevo/video" +msgstr "/home/freevo/video" -#~ msgid "/home/freevo/audio" -#~ msgstr "/home/freevo/audio" +#. Type: string +#. Default +#: ../freevo.templates:9001 +msgid "/home/freevo/audio" +msgstr "/home/freevo/audio" -#~ msgid "/home/freevo/image" -#~ msgstr "/home/freevo/image" +#. Type: string +#. Default +#: ../freevo.templates:11001 +msgid "/home/freevo/image" +msgstr "/home/freevo/image" -#~ msgid "/home/freevo/recordings" -#~ msgstr "/home/freevo/recordings" +#. Type: string +#. Default +#: ../freevo.templates:12001 +msgid "/home/freevo/recordings" +msgstr "/home/freevo/recordings" #~ msgid "x11, fbdev, dxr3, mga, directfb, dfbmga, dga" #~ msgstr "x11, fbdev, dxr3, mga, directfb, dfbmga, dga" diff -Nru freevo-1.9.0/debian/po/eu.po freevo-1.9.0/debian/po/eu.po --- freevo-1.9.0/debian/po/eu.po 2010-12-28 11:07:28.000000000 +0000 +++ freevo-1.9.0/debian/po/eu.po 2011-01-02 19:12:52.000000000 +0000 @@ -11,10 +11,10 @@ "PO-Revision-Date: 2009-06-29 09:59+0200\n" "Last-Translator: Piarres Beobide \n" "Language-Team: Euskara \n" -"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: \n" "X-Generator: KBabel 1.11.4\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" @@ -352,14 +352,26 @@ msgid "Please choose the services you wish to start on boot." msgstr "Mesedez hautatu sistemanabioan abiarazi nahi dituzun zerbitzuak." -#~ msgid "/home/freevo/video" -#~ msgstr "/home/freevo/bideoa" +#. Type: string +#. Default +#: ../freevo.templates:7001 +msgid "/home/freevo/video" +msgstr "/home/freevo/bideoa" -#~ msgid "/home/freevo/audio" -#~ msgstr "/home/freevo/audioa" +#. Type: string +#. Default +#: ../freevo.templates:9001 +msgid "/home/freevo/audio" +msgstr "/home/freevo/audioa" -#~ msgid "/home/freevo/image" -#~ msgstr "/home/freevo/irudiak" +#. Type: string +#. Default +#: ../freevo.templates:11001 +msgid "/home/freevo/image" +msgstr "/home/freevo/irudiak" -#~ msgid "/home/freevo/recordings" -#~ msgstr "/home/freevo/grabaketak" +#. Type: string +#. Default +#: ../freevo.templates:12001 +msgid "/home/freevo/recordings" +msgstr "/home/freevo/grabaketak" diff -Nru freevo-1.9.0/debian/po/fi.po freevo-1.9.0/debian/po/fi.po --- freevo-1.9.0/debian/po/fi.po 2010-12-28 11:07:28.000000000 +0000 +++ freevo-1.9.0/debian/po/fi.po 2011-01-02 19:12:52.000000000 +0000 @@ -10,10 +10,10 @@ "PO-Revision-Date: 2009-06-29 22:53+0300\n" "Last-Translator: Esko Arajärvi \n" "Language-Team: Finnish \n" -"Language: fi\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: fi\n" "X-Generator: Lokalize 0.3\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" @@ -351,14 +351,26 @@ msgid "Please choose the services you wish to start on boot." msgstr "Valitse palvelut, jotka käynnistetään järjestelmän käynnistyessä." -#~ msgid "/home/freevo/video" -#~ msgstr "/home/freevo/video" +#. Type: string +#. Default +#: ../freevo.templates:7001 +msgid "/home/freevo/video" +msgstr "/home/freevo/video" -#~ msgid "/home/freevo/audio" -#~ msgstr "/home/freevo/audio" +#. Type: string +#. Default +#: ../freevo.templates:9001 +msgid "/home/freevo/audio" +msgstr "/home/freevo/audio" -#~ msgid "/home/freevo/image" -#~ msgstr "/home/freevo/image" +#. Type: string +#. Default +#: ../freevo.templates:11001 +msgid "/home/freevo/image" +msgstr "/home/freevo/image" -#~ msgid "/home/freevo/recordings" -#~ msgstr "/home/freevo/recordings" +#. Type: string +#. Default +#: ../freevo.templates:12001 +msgid "/home/freevo/recordings" +msgstr "/home/freevo/recordings" diff -Nru freevo-1.9.0/debian/po/fr.po freevo-1.9.0/debian/po/fr.po --- freevo-1.9.0/debian/po/fr.po 2010-12-28 11:07:28.000000000 +0000 +++ freevo-1.9.0/debian/po/fr.po 2011-01-02 19:12:52.000000000 +0000 @@ -11,10 +11,10 @@ "PO-Revision-Date: 2008-02-26 20:42+0100\n" "Last-Translator: Steve Petruzzello \n" "Language-Team: French \n" -"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: \n" #. Type: select #. Description @@ -351,17 +351,29 @@ msgid "Please choose the services you wish to start on boot." msgstr "Veuillez choisir les services à démarrer au lancement de la machine." -#~ msgid "/home/freevo/video" -#~ msgstr "/home/freevo/video" +#. Type: string +#. Default +#: ../freevo.templates:7001 +msgid "/home/freevo/video" +msgstr "/home/freevo/video" -#~ msgid "/home/freevo/audio" -#~ msgstr "/home/freevo/audio" +#. Type: string +#. Default +#: ../freevo.templates:9001 +msgid "/home/freevo/audio" +msgstr "/home/freevo/audio" -#~ msgid "/home/freevo/image" -#~ msgstr "/home/freevo/image" +#. Type: string +#. Default +#: ../freevo.templates:11001 +msgid "/home/freevo/image" +msgstr "/home/freevo/image" -#~ msgid "/home/freevo/recordings" -#~ msgstr "/home/freevo/recordings" +#. Type: string +#. Default +#: ../freevo.templates:12001 +msgid "/home/freevo/recordings" +msgstr "/home/freevo/recordings" #~ msgid "x11, fbdev, dxr3, mga, directfb, dfbmga, dga" #~ msgstr "x11, fbdev, dxr3, mga, directfb, dfbmga, dga" diff -Nru freevo-1.9.0/debian/po/gl.po freevo-1.9.0/debian/po/gl.po --- freevo-1.9.0/debian/po/gl.po 2010-12-28 11:07:28.000000000 +0000 +++ freevo-1.9.0/debian/po/gl.po 2011-01-02 19:12:52.000000000 +0000 @@ -10,10 +10,10 @@ "PO-Revision-Date: 2009-07-16 21:23+0200\n" "Last-Translator: Marce Villarino \n" "Language-Team: Galician \n" -"Language: gl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: gl\n" "X-Generator: Lokalize 0.3\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" @@ -350,14 +350,26 @@ msgid "Please choose the services you wish to start on boot." msgstr "Escolla os servizos que desexa iniciar durante o arrinque." -#~ msgid "/home/freevo/video" -#~ msgstr "/home/freevo/video" +#. Type: string +#. Default +#: ../freevo.templates:7001 +msgid "/home/freevo/video" +msgstr "/home/freevo/video" -#~ msgid "/home/freevo/audio" -#~ msgstr "/home/freevo/audio" +#. Type: string +#. Default +#: ../freevo.templates:9001 +msgid "/home/freevo/audio" +msgstr "/home/freevo/audio" -#~ msgid "/home/freevo/image" -#~ msgstr "/home/freevo/image" +#. Type: string +#. Default +#: ../freevo.templates:11001 +msgid "/home/freevo/image" +msgstr "/home/freevo/image" -#~ msgid "/home/freevo/recordings" -#~ msgstr "/home/freevo/recordings" +#. Type: string +#. Default +#: ../freevo.templates:12001 +msgid "/home/freevo/recordings" +msgstr "/home/freevo/recordings" diff -Nru freevo-1.9.0/debian/po/ja.po freevo-1.9.0/debian/po/ja.po --- freevo-1.9.0/debian/po/ja.po 2010-12-28 11:07:28.000000000 +0000 +++ freevo-1.9.0/debian/po/ja.po 2011-01-02 19:12:52.000000000 +0000 @@ -10,10 +10,10 @@ "PO-Revision-Date: 2009-10-04 17:32+0900\n" "Last-Translator: Hideki Yamane (Debian-JP) \n" "Language-Team: Japanese \n" -"Language: ja\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: ja\n" #. Type: select #. Description @@ -348,14 +348,26 @@ msgid "Please choose the services you wish to start on boot." msgstr "起動の際に開始するサービスを選んでください。" -#~ msgid "/home/freevo/video" -#~ msgstr "/home/freevo/video" +#. Type: string +#. Default +#: ../freevo.templates:7001 +msgid "/home/freevo/video" +msgstr "/home/freevo/video" -#~ msgid "/home/freevo/audio" -#~ msgstr "/home/freevo/audio" +#. Type: string +#. Default +#: ../freevo.templates:9001 +msgid "/home/freevo/audio" +msgstr "/home/freevo/audio" -#~ msgid "/home/freevo/image" -#~ msgstr "/home/freevo/image" +#. Type: string +#. Default +#: ../freevo.templates:11001 +msgid "/home/freevo/image" +msgstr "/home/freevo/image" -#~ msgid "/home/freevo/recordings" -#~ msgstr "/home/freevo/recordings" +#. Type: string +#. Default +#: ../freevo.templates:12001 +msgid "/home/freevo/recordings" +msgstr "/home/freevo/recordings" diff -Nru freevo-1.9.0/debian/po/pt.po freevo-1.9.0/debian/po/pt.po --- freevo-1.9.0/debian/po/pt.po 2010-12-28 11:07:28.000000000 +0000 +++ freevo-1.9.0/debian/po/pt.po 2011-01-02 19:12:52.000000000 +0000 @@ -11,10 +11,10 @@ "PO-Revision-Date: 2009-06-29 21:18+0100\n" "Last-Translator: Américo Monteiro \n" "Language-Team: Portuguese \n" -"Language: pt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: pt\n" "X-Generator: KBabel 1.11.4\n" #. Type: select @@ -356,14 +356,26 @@ msgstr "" "Por favor escolha os serviços que deseja iniciar no arranque do sistema." -#~ msgid "/home/freevo/video" -#~ msgstr "/home/freevo/video" +#. Type: string +#. Default +#: ../freevo.templates:7001 +msgid "/home/freevo/video" +msgstr "/home/freevo/video" -#~ msgid "/home/freevo/audio" -#~ msgstr "/home/freevo/audio" +#. Type: string +#. Default +#: ../freevo.templates:9001 +msgid "/home/freevo/audio" +msgstr "/home/freevo/audio" -#~ msgid "/home/freevo/image" -#~ msgstr "/home/freevo/image" +#. Type: string +#. Default +#: ../freevo.templates:11001 +msgid "/home/freevo/image" +msgstr "/home/freevo/image" -#~ msgid "/home/freevo/recordings" -#~ msgstr "/home/freevo/recordings" +#. Type: string +#. Default +#: ../freevo.templates:12001 +msgid "/home/freevo/recordings" +msgstr "/home/freevo/recordings" diff -Nru freevo-1.9.0/debian/po/ru.po freevo-1.9.0/debian/po/ru.po --- freevo-1.9.0/debian/po/ru.po 2010-12-28 11:07:28.000000000 +0000 +++ freevo-1.9.0/debian/po/ru.po 2011-01-02 19:12:52.000000000 +0000 @@ -14,13 +14,13 @@ "PO-Revision-Date: 2009-06-29 21:03+0400\n" "Last-Translator: Yuri Kozlov \n" "Language-Team: Russian \n" -"Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: ru\n" "X-Generator: KBabel 1.11.4\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" -"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" +"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" #. Type: select #. Description @@ -354,14 +354,26 @@ msgid "Please choose the services you wish to start on boot." msgstr "Выберите службы, которые нужно запускать при включении компьютера." -#~ msgid "/home/freevo/video" -#~ msgstr "/home/freevo/video" +#. Type: string +#. Default +#: ../freevo.templates:7001 +msgid "/home/freevo/video" +msgstr "/home/freevo/video" -#~ msgid "/home/freevo/audio" -#~ msgstr "/home/freevo/audio" +#. Type: string +#. Default +#: ../freevo.templates:9001 +msgid "/home/freevo/audio" +msgstr "/home/freevo/audio" -#~ msgid "/home/freevo/image" -#~ msgstr "/home/freevo/image" +#. Type: string +#. Default +#: ../freevo.templates:11001 +msgid "/home/freevo/image" +msgstr "/home/freevo/image" -#~ msgid "/home/freevo/recordings" -#~ msgstr "/home/freevo/recordings" +#. Type: string +#. Default +#: ../freevo.templates:12001 +msgid "/home/freevo/recordings" +msgstr "/home/freevo/recordings" diff -Nru freevo-1.9.0/debian/po/sv.po freevo-1.9.0/debian/po/sv.po --- freevo-1.9.0/debian/po/sv.po 2010-12-28 11:07:28.000000000 +0000 +++ freevo-1.9.0/debian/po/sv.po 2011-01-02 19:12:52.000000000 +0000 @@ -12,10 +12,10 @@ "PO-Revision-Date: 2009-07-06 23:16+0100\n" "Last-Translator: Martin Bagge \n" "Language-Team: swedish \n" -"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: \n" "X-Generator: KBabel 1.11.4\n" #. Type: select @@ -352,17 +352,29 @@ msgid "Please choose the services you wish to start on boot." msgstr "Ange de tjänster du vill starta vid uppstarten." -#~ msgid "/home/freevo/video" -#~ msgstr "/home/freevo/video" +#. Type: string +#. Default +#: ../freevo.templates:7001 +msgid "/home/freevo/video" +msgstr "/home/freevo/video" -#~ msgid "/home/freevo/audio" -#~ msgstr "/home/freevo/audio" +#. Type: string +#. Default +#: ../freevo.templates:9001 +msgid "/home/freevo/audio" +msgstr "/home/freevo/audio" -#~ msgid "/home/freevo/image" -#~ msgstr "/home/freevo/image" +#. Type: string +#. Default +#: ../freevo.templates:11001 +msgid "/home/freevo/image" +msgstr "/home/freevo/image" -#~ msgid "/home/freevo/recordings" -#~ msgstr "/home/freevo/recordings" +#. Type: string +#. Default +#: ../freevo.templates:12001 +msgid "/home/freevo/recordings" +msgstr "/home/freevo/recordings" #~ msgid "x11, fbdev, dxr3, mga, directfb, dfbmga, dga" #~ msgstr "x11, fbdev, dxr3, mga, directfb, dfbmga, dga" diff -Nru freevo-1.9.0/debian/po/templates.pot freevo-1.9.0/debian/po/templates.pot --- freevo-1.9.0/debian/po/templates.pot 2010-12-28 11:07:28.000000000 +0000 +++ freevo-1.9.0/debian/po/templates.pot 2011-01-02 19:12:51.000000000 +0000 @@ -338,3 +338,27 @@ #: ../freevo.templates:13002 msgid "Please choose the services you wish to start on boot." msgstr "" + +#. Type: string +#. Default +#: ../freevo.templates:7001 +msgid "/home/freevo/video" +msgstr "" + +#. Type: string +#. Default +#: ../freevo.templates:9001 +msgid "/home/freevo/audio" +msgstr "" + +#. Type: string +#. Default +#: ../freevo.templates:11001 +msgid "/home/freevo/image" +msgstr "" + +#. Type: string +#. Default +#: ../freevo.templates:12001 +msgid "/home/freevo/recordings" +msgstr "" diff -Nru freevo-1.9.0/debian/po/vi.po freevo-1.9.0/debian/po/vi.po --- freevo-1.9.0/debian/po/vi.po 2010-12-28 11:07:28.000000000 +0000 +++ freevo-1.9.0/debian/po/vi.po 2011-01-02 19:12:52.000000000 +0000 @@ -10,10 +10,10 @@ "PO-Revision-Date: 2009-09-23 00:38+0930\n" "Last-Translator: Clytie Siddall \n" "Language-Team: Vietnamese \n" -"Language: vi\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: vi\n" "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: LocFactoryEditor 1.8\n" @@ -353,14 +353,26 @@ msgid "Please choose the services you wish to start on boot." msgstr "Hãy chọn những dịch vụ bạn muốn khởi chạy khi khởi động." -#~ msgid "/home/freevo/video" -#~ msgstr "/home/freevo/video" +#. Type: string +#. Default +#: ../freevo.templates:7001 +msgid "/home/freevo/video" +msgstr "/home/freevo/video" -#~ msgid "/home/freevo/audio" -#~ msgstr "/home/freevo/audio" +#. Type: string +#. Default +#: ../freevo.templates:9001 +msgid "/home/freevo/audio" +msgstr "/home/freevo/audio" -#~ msgid "/home/freevo/image" -#~ msgstr "/home/freevo/image" +#. Type: string +#. Default +#: ../freevo.templates:11001 +msgid "/home/freevo/image" +msgstr "/home/freevo/image" -#~ msgid "/home/freevo/recordings" -#~ msgstr "/home/freevo/recordings" +#. Type: string +#. Default +#: ../freevo.templates:12001 +msgid "/home/freevo/recordings" +msgstr "/home/freevo/recordings" diff -Nru freevo-1.9.0/debian/pyversions freevo-1.9.0/debian/pyversions --- freevo-1.9.0/debian/pyversions 2010-12-28 11:07:28.000000000 +0000 +++ freevo-1.9.0/debian/pyversions 2011-01-25 19:09:21.000000000 +0000 @@ -1 +1 @@ -2.5,2.6 +2.6,2.7 diff -Nru freevo-1.9.0/debian/rules freevo-1.9.0/debian/rules --- freevo-1.9.0/debian/rules 2011-01-27 08:43:05.000000000 +0000 +++ freevo-1.9.0/debian/rules 2011-01-25 19:17:13.000000000 +0000 @@ -52,7 +52,7 @@ install $(CURDIR)/debian/scripts/freevo+log $(CURDIR)/debian/tmp/usr/share/freevo/contrib/freevo+log #clean up dreaded folder.png problem - rm -f debian/tmp/usr/share/freevo/icons/themes/geexbox/mimetypes/folder.png + #rm debian/tmp/usr/share/freevo/icons/themes/geexbox/mimetypes/folder.png ln -sv folder_image.png debian/tmp/usr/share/freevo/icons/themes/geexbox/mimetypes/folder.png dh_installinit -pfreevo --no-start --name=freevo_xserver