flock: updated to 2.5

4 files changed, 17 insertions, 11 deletions

diff --git a/flock/.footprint b/flock/.footprint
index 3dedaf083..cd271b394 100644
--- a/flock/.footprint
+++ b/flock/.footprint
@@ -31,8 +31,6 @@ drwxr-xr-x	root/root	usr/lib/flock/chrome/icons/default/
 -rwxr-xr-x	root/root	usr/lib/flock/chrome/icons/default/default48.png
 -rw-r--r--	root/root	usr/lib/flock/chrome/pippki.jar
 -rw-r--r--	root/root	usr/lib/flock/chrome/pippki.manifest
--rw-r--r--	root/root	usr/lib/flock/chrome/reporter.jar
--rw-r--r--	root/root	usr/lib/flock/chrome/reporter.manifest
 -rw-r--r--	root/root	usr/lib/flock/chrome/toolkit.jar
 -rw-r--r--	root/root	usr/lib/flock/chrome/toolkit.manifest
 drwxr-xr-x	root/root	usr/lib/flock/components/
@@ -46,6 +44,7 @@ drwxr-xr-x	root/root	usr/lib/flock/components/
 -rw-r--r--	root/root	usr/lib/flock/components/flockAccountService.js
 -rw-r--r--	root/root	usr/lib/flock/components/flockAccountUtils.js
 -rw-r--r--	root/root	usr/lib/flock/components/flockAuthManager.js
+-rw-r--r--	root/root	usr/lib/flock/components/flockBeboService.js
 -rw-r--r--	root/root	usr/lib/flock/components/flockBlogService.js
 -rw-r--r--	root/root	usr/lib/flock/components/flockBlogWebServiceAtom.js
 -rw-r--r--	root/root	usr/lib/flock/components/flockBlogWebServiceMetaweblog.js
@@ -68,10 +67,10 @@ drwxr-xr-x	root/root	usr/lib/flock/components/
 -rw-r--r--	root/root	usr/lib/flock/components/flockHousekeeper.js
 -rw-r--r--	root/root	usr/lib/flock/components/flockIndexer.js
 -rw-r--r--	root/root	usr/lib/flock/components/flockLivejournalService.js
--rw-r--r--	root/root	usr/lib/flock/components/flockMagnoliaService.js
 -rw-r--r--	root/root	usr/lib/flock/components/flockMediaChannel.js
 -rw-r--r--	root/root	usr/lib/flock/components/flockMetricsService.js
 -rw-r--r--	root/root	usr/lib/flock/components/flockMigrateMisc.js
+-rw-r--r--	root/root	usr/lib/flock/components/flockMigrateMyWorld.js
 -rw-r--r--	root/root	usr/lib/flock/components/flockMigrateRDF.js
 -rw-r--r--	root/root	usr/lib/flock/components/flockMigrateToolbars.js
 -rw-r--r--	root/root	usr/lib/flock/components/flockMigrationManager.js
@@ -80,7 +79,6 @@ drwxr-xr-x	root/root	usr/lib/flock/components/
 -rw-r--r--	root/root	usr/lib/flock/components/flockOpmlService.js
 -rw-r--r--	root/root	usr/lib/flock/components/flockPeopleRefreshListener.js
 -rw-r--r--	root/root	usr/lib/flock/components/flockPeopleService.js
--rw-r--r--	root/root	usr/lib/flock/components/flockPeopleUtils.js
 -rw-r--r--	root/root	usr/lib/flock/components/flockPhoto.js
 -rw-r--r--	root/root	usr/lib/flock/components/flockPhotoAPIManager.js
 -rw-r--r--	root/root	usr/lib/flock/components/flockPhotoAlbum.js
@@ -100,6 +98,7 @@ drwxr-xr-x	root/root	usr/lib/flock/components/
 -rw-r--r--	root/root	usr/lib/flock/components/flockSearchAPIGoogle.js
 -rw-r--r--	root/root	usr/lib/flock/components/flockSearchAPITVRss.js
 -rw-r--r--	root/root	usr/lib/flock/components/flockSearchAPITechnorati.js
+-rw-r--r--	root/root	usr/lib/flock/components/flockSearchAPITwitter.js
 -rw-r--r--	root/root	usr/lib/flock/components/flockSearchAPIYahoo.js
 -rw-r--r--	root/root	usr/lib/flock/components/flockSearchManager.js
 -rw-r--r--	root/root	usr/lib/flock/components/flockSearchMigratable.js
@@ -178,7 +177,6 @@ drwxr-xr-x	root/root	usr/lib/flock/defaults/pref/
 -rw-r--r--	root/root	usr/lib/flock/defaults/pref/fbranding-prefs.js
 -rw-r--r--	root/root	usr/lib/flock/defaults/pref/firefox-l10n.js
 -rw-r--r--	root/root	usr/lib/flock/defaults/pref/flock.js
--rw-r--r--	root/root	usr/lib/flock/defaults/pref/reporter.js
 drwxr-xr-x	root/root	usr/lib/flock/defaults/profile/
 -rw-r--r--	root/root	usr/lib/flock/defaults/profile/bookmarks.html
 drwxr-xr-x	root/root	usr/lib/flock/defaults/profile/chrome/
@@ -225,18 +223,24 @@ drwxr-xr-x	root/root	usr/lib/flock/icons/
 -rwxr-xr-x	root/root	usr/lib/flock/libxul.so
 drwxr-xr-x	root/root	usr/lib/flock/modules/
 -rw-r--r--	root/root	usr/lib/flock/modules/DownloadUtils.jsm
+-rw-r--r--	root/root	usr/lib/flock/modules/FlockCastUtils.jsm
 -rw-r--r--	root/root	usr/lib/flock/modules/FlockCryptoHash.jsm
 -rw-r--r--	root/root	usr/lib/flock/modules/FlockDateFormatter.jsm
 -rw-r--r--	root/root	usr/lib/flock/modules/FlockDeliciousApi.jsm
+-rw-r--r--	root/root	usr/lib/flock/modules/FlockFlickrAPI.jsm
 -rw-r--r--	root/root	usr/lib/flock/modules/FlockFlickrStrings.jsm
 -rw-r--r--	root/root	usr/lib/flock/modules/FlockGoogleAuth.jsm
 -rw-r--r--	root/root	usr/lib/flock/modules/FlockLiveSearchProvider.jsm
+-rw-r--r--	root/root	usr/lib/flock/modules/FlockMediaUtils.jsm
 -rw-r--r--	root/root	usr/lib/flock/modules/FlockOAuthLib.jsm
 -rw-r--r--	root/root	usr/lib/flock/modules/FlockOnlineFavsUtils.jsm
+-rw-r--r--	root/root	usr/lib/flock/modules/FlockPhotoUploader.jsm
 -rw-r--r--	root/root	usr/lib/flock/modules/FlockPrefsUtils.jsm
 -rw-r--r--	root/root	usr/lib/flock/modules/FlockScheduler.jsm
 -rw-r--r--	root/root	usr/lib/flock/modules/FlockStringBundleHelpers.jsm
 -rw-r--r--	root/root	usr/lib/flock/modules/FlockSvcUtils.jsm
+-rw-r--r--	root/root	usr/lib/flock/modules/FlockTemplates.jsm
+-rw-r--r--	root/root	usr/lib/flock/modules/FlockURLUtils.jsm
 -rw-r--r--	root/root	usr/lib/flock/modules/FlockUploadUtils.jsm
 -rw-r--r--	root/root	usr/lib/flock/modules/FlockWebmailUtils.jsm
 -rw-r--r--	root/root	usr/lib/flock/modules/FlockXMLUtils.jsm
@@ -248,6 +252,7 @@ drwxr-xr-x	root/root	usr/lib/flock/modules/
 -rw-r--r--	root/root	usr/lib/flock/modules/XPCOMUtils.jsm
 -rw-r--r--	root/root	usr/lib/flock/modules/debug.js
 -rw-r--r--	root/root	usr/lib/flock/modules/distribution.js
+-rw-r--r--	root/root	usr/lib/flock/modules/json_parse.jsm
 -rw-r--r--	root/root	usr/lib/flock/modules/utils.js
 -rwxr-xr-x	root/root	usr/lib/flock/mozilla-xremote-client
 -rw-r--r--	root/root	usr/lib/flock/platform.ini
@@ -265,16 +270,17 @@ drwxr-xr-x	root/root	usr/lib/flock/res/
 -rw-r--r--	root/root	usr/lib/flock/res/designmode.css
 drwxr-xr-x	root/root	usr/lib/flock/res/detect/
 -rw-r--r--	root/root	usr/lib/flock/res/detect/aolmail.xml
+-rw-r--r--	root/root	usr/lib/flock/res/detect/bebo.xml
 -rw-r--r--	root/root	usr/lib/flock/res/detect/blogger.xml
 -rw-r--r--	root/root	usr/lib/flock/res/detect/blogsome.xml
 -rw-r--r--	root/root	usr/lib/flock/res/detect/delicious.xml
 -rw-r--r--	root/root	usr/lib/flock/res/detect/digg.xml
 -rw-r--r--	root/root	usr/lib/flock/res/detect/facebook.xml
+-rw-r--r--	root/root	usr/lib/flock/res/detect/facebookchat.xml
 -rw-r--r--	root/root	usr/lib/flock/res/detect/flickr.xml
 -rw-r--r--	root/root	usr/lib/flock/res/detect/flockoobe.xml
 -rw-r--r--	root/root	usr/lib/flock/res/detect/gmail.xml
 -rw-r--r--	root/root	usr/lib/flock/res/detect/livejournal.xml
--rw-r--r--	root/root	usr/lib/flock/res/detect/magnolia.xml
 -rw-r--r--	root/root	usr/lib/flock/res/detect/myspace.xml
 -rw-r--r--	root/root	usr/lib/flock/res/detect/photobucket.xml
 -rw-r--r--	root/root	usr/lib/flock/res/detect/picasa.xml
@@ -344,6 +350,7 @@ drwxr-xr-x	root/root	usr/lib/flock/searchplugins/
 -rw-r--r--	root/root	usr/lib/flock/searchplugins/eBay.xml
 -rw-r--r--	root/root	usr/lib/flock/searchplugins/google.xml
 -rw-r--r--	root/root	usr/lib/flock/searchplugins/technorati.xml
+-rw-r--r--	root/root	usr/lib/flock/searchplugins/twitter.xml
 -rw-r--r--	root/root	usr/lib/flock/searchplugins/wikipedia.xml
 -rw-r--r--	root/root	usr/lib/flock/searchplugins/wink-people.xml
 -rw-r--r--	root/root	usr/lib/flock/searchplugins/yahoo.xml
diff --git a/flock/.md5sum b/flock/.md5sum
index e6c2c70fd..8c3432f48 100644
--- a/flock/.md5sum
+++ b/flock/.md5sum
@@ -1,3 +1,3 @@
-f814048d76ad3b75b1ba9413e958f1bd  flock-2.0.3.en-US.linux-i686.tar.bz2
+6e82b98e8b890c908215bacedf1a484c  flock-2.5.en-US.linux-i686.tar.bz2
 4a70a26ea3a92e78810daaf8c330d214  flock.desktop
 d6fd21c8b508ff29f38c9d9aa06c231c  flock.png
diff --git a/flock/Pkgfile b/flock/Pkgfile
index ccc854b43..3e598dc5f 100644
--- a/flock/Pkgfile
+++ b/flock/Pkgfile
@@ -5,10 +5,9 @@
 # Depends on: gtk
 
 name=flock
-version=2.0.3
+version=2.5
 release=1
-source=(http://mirror2.flock.com/releases/$version/$name-$version.en-US.linux-i686.tar.bz2 \
-        $name.desktop $name.png)
+source=(http://mirror2.flock.com/releases/$version/$name-$version.en-US.linux-i686.tar.bz2)
 
 build() {
   install -d $PKG/usr/{bin,lib}
@@ -16,5 +15,5 @@ build() {
   mv $name $PKG/usr/lib
   ln -sf /usr/lib/$name/$name $PKG/usr/bin/$name-browser
   install -D -m 0644 $SRC/$name.desktop $PKG/usr/share/applications/$name.desktop
-  install -D -m 0644 $SRC/$name.png $PKG/usr/share/pixmaps/$name.png
+  install -D -m 0644 $PKG/usr/lib/flock/chrome/icons/default/default48.png $PKG/usr/share/pixmaps/$name.png
 }
diff --git a/flock/flock.png b/flock/flock.png
deleted file mode 100644
index 910f083e4..000000000
--- a/flock/flock.png
+++ /dev/null