Merge branch 'master' of jpgarch@complete.org:git/hpodder

jgoerzen · Jan 25, 2009 · 8491555 · 8491555
2 parents 14bb33b + b295763
commit 8491555
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 14 deletions.
diff --git a/Config.hs b/Config.hs
@@ -74,7 +74,7 @@ getDefaultCP =
                  cp <- set cp "DEFAULT" "renametypes" "audio/mpeg:.mp3,audio/mp3:.mp3,x-audio/mp3:.mp3"
                  cp <- set cp "DEFAULT" "postproctypes" "audio/mpeg,audio/mp3,x-audio/mp3"
                  cp <- set cp "DEFAULT" "gettypecommand" "file -b -i \"${EPFILENAME}\""
-                 cp <- set cp "DEFAULT" "postproccommand" "id3v2 -T \"${EPID}\" -A \"${CASTTITLE}\" -t \"${EPTITLE}\" --WOAF \"${EPURL}\" --WOAS \"${FEEDURL}\" \"${EPFILENAME}\""
+                 cp <- set cp "DEFAULT" "postproccommand" "mid3v2 -T \"${EPID}\" -A \"${CASTTITLE}\" -t \"${EPTITLE}\" --WOAF \"${EPURL}\" --WOAS \"${FEEDURL}\" \"${EPFILENAME}\""
                  return cp
 
 startingcp = emptyCP {accessfunc = interpolatingAccess 10}

diff --git a/INSTALL b/INSTALL
@@ -3,16 +3,16 @@ Sorry, I need to work on this some more...
 
 PREREQUISITES:
 
- * GHC 6.6          http://www.haskell.org/ghc
- * Curl             http://curl.haxx.se
- * id3v2            http://download.sourceforge.net/id3v2/id3v2-0.1.11.tar.gz
- * hslogger         http://software.complete.org/hslogger
- * MissingH 0.18.0  http://software.complete.org/missingh
+ * GHC 6.8              http://www.haskell.org/ghc
+ * Curl                 http://curl.haxx.se
+ * mid3v2 from Mutagen  http://www.sacredchao.net/quodlibet/wiki/Development/Mutagen
+ * hslogger             http://software.complete.org/hslogger
+ * MissingH 0.18.0      http://software.complete.org/missingh
    hpodder also uses these libraries that MissingH also depends upon:
    FilePath, mtl
- * ConfigFile       http://software.complete.org/configfile
- * Sqlite3          http://www.sqlite.org/
- * HDBC-sqlite3     http://quux.org/devel/hdbc
- * HaXml>=1.13.2    http://www.cs.york.ac.uk/fp/HaXml/
- * HDBC             http://quux.org/devel/hdbc
+ * ConfigFile           http://software.complete.org/configfile
+ * Sqlite3              http://www.sqlite.org/
+ * HDBC-sqlite3         http://quux.org/devel/hdbc
+ * HaXml>=1.13.2        http://www.cs.york.ac.uk/fp/HaXml/
+ * HDBC                 http://quux.org/devel/hdbc
 
diff --git a/debian/control b/debian/control
@@ -10,7 +10,7 @@ Vcs-Git: git://git.complete.org/hpodder
 
 Package: hpodder
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${haskell:Depends}, curl, id3v2
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${haskell:Depends}, curl, python-mutagen
 Description: Tool to scan and download podcasts (podcatcher)
  Podcasting is a method of publishing radio-like programs on the
  Internet.  Through podcasting, almost anyone can produce their own

diff --git a/doc/hpodder-manpage.sgml b/doc/hpodder-manpage.sgml
@@ -1025,7 +1025,7 @@ podcastfaildays = 5
               </para>
               <para>
                 The default value adds ID3 tags to MP3 files.  It is:
-                <literal>id3v2 -T "${EPID}" -A "${CASTTITLE}" -t "${EPTITLE}" --WOAF
+                <literal>mid3v2 -T "${EPID}" -A "${CASTTITLE}" -t "${EPTITLE}" --WOAF
                   "${EPURL}" --WOAS "${FEEDURL}" "${EPFILENAME}"</literal>
               </para>
             </listitem>
@@ -1225,7 +1225,7 @@ podcastfaildays = 5
     <title>See Also</title>
     <para>
       <application>curl</application>(1),
-      <application>id3v2</application>(1)
+      <application>mid3v2</application>(1)
     </para>
     <para>
       The &hpodder; homepage at <ulink