Date: Friday, October 12, 2012 @ 15:21:24
  Author: heftig
Revision: 168500

db-move: moved thunderbird from [testing] to [extra] (i686, x86_64)

Added:
  thunderbird/repos/extra-i686/PKGBUILD
    (from rev 168497, thunderbird/repos/testing-i686/PKGBUILD)
  thunderbird/repos/extra-i686/mozconfig
    (from rev 168497, thunderbird/repos/testing-i686/mozconfig)
  thunderbird/repos/extra-i686/thunderbird-install-dir.patch
    (from rev 168497, 
thunderbird/repos/testing-i686/thunderbird-install-dir.patch)
  thunderbird/repos/extra-i686/thunderbird.desktop
    (from rev 168497, thunderbird/repos/testing-i686/thunderbird.desktop)
  thunderbird/repos/extra-i686/thunderbird.install
    (from rev 168497, thunderbird/repos/testing-i686/thunderbird.install)
  thunderbird/repos/extra-i686/vendor.js
    (from rev 168497, thunderbird/repos/testing-i686/vendor.js)
  thunderbird/repos/extra-x86_64/PKGBUILD
    (from rev 168497, thunderbird/repos/testing-x86_64/PKGBUILD)
  thunderbird/repos/extra-x86_64/mozconfig
    (from rev 168497, thunderbird/repos/testing-x86_64/mozconfig)
  thunderbird/repos/extra-x86_64/thunderbird-install-dir.patch
    (from rev 168497, 
thunderbird/repos/testing-x86_64/thunderbird-install-dir.patch)
  thunderbird/repos/extra-x86_64/thunderbird.desktop
    (from rev 168497, thunderbird/repos/testing-x86_64/thunderbird.desktop)
  thunderbird/repos/extra-x86_64/thunderbird.install
    (from rev 168497, thunderbird/repos/testing-x86_64/thunderbird.install)
  thunderbird/repos/extra-x86_64/vendor.js
    (from rev 168497, thunderbird/repos/testing-x86_64/vendor.js)
Deleted:
  thunderbird/repos/extra-i686/PKGBUILD
  thunderbird/repos/extra-i686/mozconfig
  thunderbird/repos/extra-i686/thunderbird-install-dir.patch
  thunderbird/repos/extra-i686/thunderbird.desktop
  thunderbird/repos/extra-i686/thunderbird.install
  thunderbird/repos/extra-i686/vendor.js
  thunderbird/repos/extra-x86_64/PKGBUILD
  thunderbird/repos/extra-x86_64/mozconfig
  thunderbird/repos/extra-x86_64/thunderbird-install-dir.patch
  thunderbird/repos/extra-x86_64/thunderbird.desktop
  thunderbird/repos/extra-x86_64/thunderbird.install
  thunderbird/repos/extra-x86_64/vendor.js
  thunderbird/repos/testing-i686/
  thunderbird/repos/testing-x86_64/

--------------------------------------------+
 extra-i686/PKGBUILD                        |  124 +++++++++++++--------------
 extra-i686/mozconfig                       |   80 ++++++++---------
 extra-i686/thunderbird-install-dir.patch   |   86 +++++++++---------
 extra-i686/thunderbird.desktop             |   26 ++---
 extra-i686/thunderbird.install             |   24 ++---
 extra-i686/vendor.js                       |   18 +--
 extra-x86_64/PKGBUILD                      |  124 +++++++++++++--------------
 extra-x86_64/mozconfig                     |   80 ++++++++---------
 extra-x86_64/thunderbird-install-dir.patch |   86 +++++++++---------
 extra-x86_64/thunderbird.desktop           |   26 ++---
 extra-x86_64/thunderbird.install           |   24 ++---
 extra-x86_64/vendor.js                     |   18 +--
 12 files changed, 360 insertions(+), 356 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2012-10-12 19:21:10 UTC (rev 168499)
+++ extra-i686/PKGBUILD 2012-10-12 19:21:24 UTC (rev 168500)
@@ -1,62 +0,0 @@
-# $Id$
-# Maintainer : Ionut Biru <ib...@archlinux.org>
-# Contributor: Alexander Baldeck <alexan...@archlinux.org>
-# Contributor: Dale Blount <d...@archlinux.org>
-# Contributor: Anders Bostrom <anders.bost...@home.se>
-
-pkgname=thunderbird
-pkgver=15.0.1
-pkgrel=1
-pkgdesc="Standalone Mail/News reader"
-arch=('i686' 'x86_64')
-license=('MPL' 'GPL')
-url="http://www.mozilla.org/thunderbird/";
-depends=('alsa-lib' 'dbus-glib' 'desktop-file-utils' 'gtk2' 
'hicolor-icon-theme' 'hunspell' 'libevent' 'libnotify' 'libvpx' 'libxt' 
'mime-types' 'mozilla-common' 'nss' 'sqlite' 'startup-notification')
-makedepends=('unzip' 'zip' 'pkg-config' 'python2' 'wireless_tools' 'yasm' 
'mesa' 'autoconf2.13')
-optdepends=('libcanberra: for sound support')
-install=thunderbird.install
-source=(ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/$pkgver/source/thunderbird-$pkgver.source.tar.bz2
-        mozconfig
-        thunderbird.desktop
-        thunderbird-install-dir.patch
-        vendor.js)
-options=(!emptydirs)
-md5sums=('c84b83502892a34ecfe2d7a0fa58034f'
-         '41511a6bcdd04cf56706218e4670e631'
-         'af3e5b344d2edf1c7d61bb0a5a96de9a'
-         'aea906acf72c43dd82ead2fabcc1c6db'
-         '5a53179d14ae9631b7afe5e4d0fc0b25')
-
-build() {
-  cd comm-release
-  patch -Np1 -i "$srcdir/thunderbird-install-dir.patch"
-
-  cp "$srcdir/mozconfig" .mozconfig
-
-  export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/thunderbird"
-  export PYTHON="/usr/bin/python2"
-
-  make -j1 -f client.mk build MOZ_MAKE_FLAGS="$MAKEFLAGS"
-}
-
-package() {
-  cd comm-release
-  make -j1 -f client.mk DESTDIR="$pkgdir" install
-
-  install -Dm644 "$srcdir"/vendor.js 
"$pkgdir/usr/lib/thunderbird/defaults/preferences/vendor.js"
-
-  for i in 16x16 22x22 24x24 32x32 48x48 256x256; do
-      install -Dm644 other-licenses/branding/thunderbird/mailicon${i/x*/}.png \
-          "$pkgdir/usr/share/icons/hicolor/$i/apps/thunderbird.png"
-  done
-
-  install -Dm644 "$srcdir/thunderbird.desktop" \
-      "$pkgdir/usr/share/applications/thunderbird.desktop"
-
-  rm -rf "$pkgdir"/usr/lib/thunderbird/{dictionaries,hyphenation}
-  ln -sf /usr/share/hunspell "$pkgdir/usr/lib/thunderbird/dictionaries"
-  ln -sf /usr/share/hyphen "$pkgdir/usr/lib/thunderbird/hyphenation"
-
-  # We don't want the development stuff
-  rm -r "$pkgdir"/usr/{include,lib/thunderbird-devel,share/idl}
-}

Copied: thunderbird/repos/extra-i686/PKGBUILD (from rev 168497, 
thunderbird/repos/testing-i686/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD                         (rev 0)
+++ extra-i686/PKGBUILD 2012-10-12 19:21:24 UTC (rev 168500)
@@ -0,0 +1,62 @@
+# $Id$
+# Maintainer : Ionut Biru <ib...@archlinux.org>
+# Contributor: Alexander Baldeck <alexan...@archlinux.org>
+# Contributor: Dale Blount <d...@archlinux.org>
+# Contributor: Anders Bostrom <anders.bost...@home.se>
+
+pkgname=thunderbird
+pkgver=16.0.1
+pkgrel=1
+pkgdesc="Standalone Mail/News reader"
+arch=('i686' 'x86_64')
+license=('MPL' 'GPL')
+url="http://www.mozilla.org/thunderbird/";
+depends=('alsa-lib' 'dbus-glib' 'desktop-file-utils' 'gtk2' 
'hicolor-icon-theme' 'hunspell' 'libevent' 'libnotify' 'libvpx' 'libxt' 
'mime-types' 'mozilla-common' 'nss' 'sqlite' 'startup-notification')
+makedepends=('unzip' 'zip' 'pkg-config' 'python2' 'wireless_tools' 'yasm' 
'mesa' 'autoconf2.13')
+optdepends=('libcanberra: for sound support')
+install=thunderbird.install
+source=(ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/$pkgver/source/thunderbird-$pkgver.source.tar.bz2
+        mozconfig
+        thunderbird.desktop
+        thunderbird-install-dir.patch
+        vendor.js)
+options=(!emptydirs)
+md5sums=('5b0ceb8d403b607fc0330e276b2e7c65'
+         '41511a6bcdd04cf56706218e4670e631'
+         'af3e5b344d2edf1c7d61bb0a5a96de9a'
+         '2e15662c756fa799d9d328f7125257be'
+         '5a53179d14ae9631b7afe5e4d0fc0b25')
+
+build() {
+  cd comm-release
+  patch -Np1 -i "$srcdir/thunderbird-install-dir.patch"
+
+  cp "$srcdir/mozconfig" .mozconfig
+
+  export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/thunderbird"
+  export PYTHON="/usr/bin/python2"
+
+  make -j1 -f client.mk build MOZ_MAKE_FLAGS="$MAKEFLAGS"
+}
+
+package() {
+  cd comm-release
+  make -j1 -f client.mk DESTDIR="$pkgdir" install
+
+  install -Dm644 "$srcdir"/vendor.js 
"$pkgdir/usr/lib/thunderbird/defaults/preferences/vendor.js"
+
+  for i in 16x16 22x22 24x24 32x32 48x48 256x256; do
+      install -Dm644 other-licenses/branding/thunderbird/mailicon${i/x*/}.png \
+          "$pkgdir/usr/share/icons/hicolor/$i/apps/thunderbird.png"
+  done
+
+  install -Dm644 "$srcdir/thunderbird.desktop" \
+      "$pkgdir/usr/share/applications/thunderbird.desktop"
+
+  rm -rf "$pkgdir"/usr/lib/thunderbird/{dictionaries,hyphenation}
+  ln -sf /usr/share/hunspell "$pkgdir/usr/lib/thunderbird/dictionaries"
+  ln -sf /usr/share/hyphen "$pkgdir/usr/lib/thunderbird/hyphenation"
+
+  # We don't want the development stuff
+  rm -r "$pkgdir"/usr/{include,lib/thunderbird-devel,share/idl}
+}

Deleted: extra-i686/mozconfig
===================================================================
--- extra-i686/mozconfig        2012-10-12 19:21:10 UTC (rev 168499)
+++ extra-i686/mozconfig        2012-10-12 19:21:24 UTC (rev 168500)
@@ -1,40 +0,0 @@
-mk_add_options MOZ_CO_PROJECT=mail
-ac_add_options --enable-application=mail
-
-ac_add_options --prefix=/usr
-ac_add_options --libdir=/usr/lib
-
-# System libraries
-ac_add_options --with-system-nspr
-ac_add_options --with-system-nss
-ac_add_options --with-system-jpeg
-ac_add_options --with-system-zlib
-ac_add_options --with-system-bz2
-ac_add_options --with-system-png
-ac_add_options --with-system-libevent
-ac_add_options --with-system-libvpx
-ac_add_options --enable-system-hunspell
-ac_add_options --enable-system-sqlite
-ac_add_options --enable-system-ffi
-#ac_add_options --enable-system-cairo
-ac_add_options --enable-system-pixman
-ac_add_options --with-pthreads
-
-# Features
-ac_add_options --enable-official-branding
-ac_add_options --enable-safe-browsing
-ac_add_options --enable-startup-notification
-ac_add_options --enable-gio
-
-ac_add_options --disable-gnomevfs
-ac_add_options --disable-crashreporter
-ac_add_options --disable-updater
-ac_add_options --disable-tests
-ac_add_options --disable-mochitest
-ac_add_options --disable-installer
-
-# Optimization
-ac_add_options --enable-optimize
-
-export MOZILLA_OFFICIAL=1
-mk_add_options MOZILLA_OFFICIAL=1

Copied: thunderbird/repos/extra-i686/mozconfig (from rev 168497, 
thunderbird/repos/testing-i686/mozconfig)
===================================================================
--- extra-i686/mozconfig                                (rev 0)
+++ extra-i686/mozconfig        2012-10-12 19:21:24 UTC (rev 168500)
@@ -0,0 +1,40 @@
+mk_add_options MOZ_CO_PROJECT=mail
+ac_add_options --enable-application=mail
+
+ac_add_options --prefix=/usr
+ac_add_options --libdir=/usr/lib
+
+# System libraries
+ac_add_options --with-system-nspr
+ac_add_options --with-system-nss
+ac_add_options --with-system-jpeg
+ac_add_options --with-system-zlib
+ac_add_options --with-system-bz2
+ac_add_options --with-system-png
+ac_add_options --with-system-libevent
+ac_add_options --with-system-libvpx
+ac_add_options --enable-system-hunspell
+ac_add_options --enable-system-sqlite
+ac_add_options --enable-system-ffi
+#ac_add_options --enable-system-cairo
+ac_add_options --enable-system-pixman
+ac_add_options --with-pthreads
+
+# Features
+ac_add_options --enable-official-branding
+ac_add_options --enable-safe-browsing
+ac_add_options --enable-startup-notification
+ac_add_options --enable-gio
+
+ac_add_options --disable-gnomevfs
+ac_add_options --disable-crashreporter
+ac_add_options --disable-updater
+ac_add_options --disable-tests
+ac_add_options --disable-mochitest
+ac_add_options --disable-installer
+
+# Optimization
+ac_add_options --enable-optimize
+
+export MOZILLA_OFFICIAL=1
+mk_add_options MOZILLA_OFFICIAL=1

Deleted: extra-i686/thunderbird-install-dir.patch
===================================================================
--- extra-i686/thunderbird-install-dir.patch    2012-10-12 19:21:10 UTC (rev 
168499)
+++ extra-i686/thunderbird-install-dir.patch    2012-10-12 19:21:24 UTC (rev 
168500)
@@ -1,42 +0,0 @@
-diff -Nur comm-beta.orig/config/autoconf.mk.in comm-beta/config/autoconf.mk.in
---- comm-beta.orig/config/autoconf.mk.in       2011-11-06 14:39:51.064983780 
+0000
-+++ comm-beta/config/autoconf.mk.in    2011-11-06 14:42:57.216735333 +0000
-@@ -65,8 +65,8 @@
- mandir                = @mandir@
- idldir                = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
- 
--installdir    = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
--sdkdir                = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
-+installdir    = $(libdir)/$(MOZ_APP_NAME)
-+sdkdir                = $(libdir)/$(MOZ_APP_NAME)-devel
- 
- MOZDEPTH      = $(DEPTH)/mozilla
- DIST          = $(MOZDEPTH)/dist
-diff -Nur comm-beta.orig/mozilla/config/autoconf.mk.in 
comm-beta/mozilla/config/autoconf.mk.in
---- comm-beta.orig/mozilla/config/autoconf.mk.in       2011-11-06 
14:39:41.771562967 +0000
-+++ comm-beta/mozilla/config/autoconf.mk.in    2011-11-06 14:44:18.404165515 
+0000
-@@ -68,8 +68,8 @@
- mandir                = @mandir@
- idldir                = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
- 
--installdir    = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
--sdkdir                = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
-+installdir    = $(libdir)/$(MOZ_APP_NAME)
-+sdkdir                = $(libdir)/$(MOZ_APP_NAME)-devel
- 
- DIST          = $(DEPTH)/dist
- LIBXUL_SDK      = @LIBXUL_SDK@
-diff -Nur comm-beta.orig/mozilla/js/src/config/autoconf.mk.in 
comm-beta/mozilla/js/src/config/autoconf.mk.in
---- comm-beta.orig/mozilla/js/src/config/autoconf.mk.in        2011-11-06 
14:39:48.014955070 +0000
-+++ comm-beta/mozilla/js/src/config/autoconf.mk.in     2011-11-06 
14:44:32.977635875 +0000
-@@ -61,8 +61,8 @@
- datadir               = @datadir@
- mandir                = @mandir@
- 
--installdir    = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
--sdkdir                = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
-+installdir    = $(libdir)/$(MOZ_APP_NAME)
-+sdkdir                = $(libdir)/$(MOZ_APP_NAME)-devel
- 
- TOP_DIST      = @TOP_DIST@
- ifneq (,$(filter /%,$(TOP_DIST)))

Copied: thunderbird/repos/extra-i686/thunderbird-install-dir.patch (from rev 
168497, thunderbird/repos/testing-i686/thunderbird-install-dir.patch)
===================================================================
--- extra-i686/thunderbird-install-dir.patch                            (rev 0)
+++ extra-i686/thunderbird-install-dir.patch    2012-10-12 19:21:24 UTC (rev 
168500)
@@ -0,0 +1,44 @@
+diff -upr comm-release.orig/config/autoconf.mk.in 
comm-release/config/autoconf.mk.in
+--- comm-release.orig/config/autoconf.mk.in    2012-10-12 06:33:25.000000000 
+0300
++++ comm-release/config/autoconf.mk.in 2012-10-12 06:40:17.000000000 +0300
+@@ -36,8 +36,8 @@ datadir              = @datadir@
+ mandir                = @mandir@
+ idldir                = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+ 
+-installdir    = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+-sdkdir                = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
++installdir    = $(libdir)/$(MOZ_APP_NAME)
++sdkdir                = $(libdir)/$(MOZ_APP_NAME)-devel
+ 
+ MOZDEPTH      = $(DEPTH)/mozilla
+ DIST          = $(MOZDEPTH)/dist
+diff -upr comm-release.orig/mozilla/config/baseconfig.mk 
comm-release/mozilla/config/baseconfig.mk
+--- comm-release.orig/mozilla/config/baseconfig.mk     2012-10-12 
06:33:27.000000000 +0300
++++ comm-release/mozilla/config/baseconfig.mk  2012-10-12 06:37:04.000000000 
+0300
+@@ -1,9 +1,9 @@
+ INCLUDED_AUTOCONF_MK = 1
+ 
+-includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+-idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+-sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
++includedir := $(includedir)/$(MOZ_APP_NAME)
++idldir = $(datadir)/idl/$(MOZ_APP_NAME)
++installdir = $(libdir)/$(MOZ_APP_NAME)
++sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel
+ DIST = $(DEPTH)/dist
+ 
+ # We do magic with OBJ_SUFFIX in config.mk, the following ensures we don't
+diff -upr comm-release.orig/mozilla/js/src/config/baseconfig.mk 
comm-release/mozilla/js/src/config/baseconfig.mk
+--- comm-release.orig/mozilla/js/src/config/baseconfig.mk      2012-10-12 
06:33:26.000000000 +0300
++++ comm-release/mozilla/js/src/config/baseconfig.mk   2012-10-12 
06:37:49.000000000 +0300
+@@ -1,7 +1,7 @@
+ INCLUDED_AUTOCONF_MK = 1
+ 
+-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+-sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
++installdir = $(libdir)/$(MOZ_APP_NAME)
++sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel
+ 
+ ifneq (,$(filter /%,$(TOP_DIST)))
+ DIST = $(TOP_DIST)

Deleted: extra-i686/thunderbird.desktop
===================================================================
--- extra-i686/thunderbird.desktop      2012-10-12 19:21:10 UTC (rev 168499)
+++ extra-i686/thunderbird.desktop      2012-10-12 19:21:24 UTC (rev 168500)
@@ -1,13 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=Thunderbird
-Comment=Mail & News Reader
-GenericName=Mail Client & News Reader
-Exec=thunderbird %u
-TryExec=thunderbird
-Icon=thunderbird
-Terminal=false
-Type=Application
-Categories=Network;Email;
-MimeType=message/rfc822;x-scheme-handler/mailto;
-StartupNotify=true

Copied: thunderbird/repos/extra-i686/thunderbird.desktop (from rev 168497, 
thunderbird/repos/testing-i686/thunderbird.desktop)
===================================================================
--- extra-i686/thunderbird.desktop                              (rev 0)
+++ extra-i686/thunderbird.desktop      2012-10-12 19:21:24 UTC (rev 168500)
@@ -0,0 +1,13 @@
+[Desktop Entry]
+Version=1.0
+Name=Thunderbird
+Comment=Mail & News Reader
+GenericName=Mail Client & News Reader
+Exec=thunderbird %u
+TryExec=thunderbird
+Icon=thunderbird
+Terminal=false
+Type=Application
+Categories=Network;Email;
+MimeType=message/rfc822;x-scheme-handler/mailto;
+StartupNotify=true

Deleted: extra-i686/thunderbird.install
===================================================================
--- extra-i686/thunderbird.install      2012-10-12 19:21:10 UTC (rev 168499)
+++ extra-i686/thunderbird.install      2012-10-12 19:21:24 UTC (rev 168500)
@@ -1,12 +0,0 @@
-post_install() {
-    update-desktop-database -q
-    gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}

Copied: thunderbird/repos/extra-i686/thunderbird.install (from rev 168497, 
thunderbird/repos/testing-i686/thunderbird.install)
===================================================================
--- extra-i686/thunderbird.install                              (rev 0)
+++ extra-i686/thunderbird.install      2012-10-12 19:21:24 UTC (rev 168500)
@@ -0,0 +1,12 @@
+post_install() {
+    update-desktop-database -q
+    gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}

Deleted: extra-i686/vendor.js
===================================================================
--- extra-i686/vendor.js        2012-10-12 19:21:10 UTC (rev 168499)
+++ extra-i686/vendor.js        2012-10-12 19:21:24 UTC (rev 168500)
@@ -1,9 +0,0 @@
-// Use LANG environment variable to choose locale
-pref("intl.locale.matchOS", true);
-
-// Disable default mailer checking.
-pref("mail.shell.checkDefaultMail", false);
-
-// Don't disable our bundled extensions in the application directory
-pref("extensions.autoDisableScopes", 11);
-pref("extensions.shownSelectionUI", true);

Copied: thunderbird/repos/extra-i686/vendor.js (from rev 168497, 
thunderbird/repos/testing-i686/vendor.js)
===================================================================
--- extra-i686/vendor.js                                (rev 0)
+++ extra-i686/vendor.js        2012-10-12 19:21:24 UTC (rev 168500)
@@ -0,0 +1,9 @@
+// Use LANG environment variable to choose locale
+pref("intl.locale.matchOS", true);
+
+// Disable default mailer checking.
+pref("mail.shell.checkDefaultMail", false);
+
+// Don't disable our bundled extensions in the application directory
+pref("extensions.autoDisableScopes", 11);
+pref("extensions.shownSelectionUI", true);

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD       2012-10-12 19:21:10 UTC (rev 168499)
+++ extra-x86_64/PKGBUILD       2012-10-12 19:21:24 UTC (rev 168500)
@@ -1,62 +0,0 @@
-# $Id$
-# Maintainer : Ionut Biru <ib...@archlinux.org>
-# Contributor: Alexander Baldeck <alexan...@archlinux.org>
-# Contributor: Dale Blount <d...@archlinux.org>
-# Contributor: Anders Bostrom <anders.bost...@home.se>
-
-pkgname=thunderbird
-pkgver=15.0.1
-pkgrel=1
-pkgdesc="Standalone Mail/News reader"
-arch=('i686' 'x86_64')
-license=('MPL' 'GPL')
-url="http://www.mozilla.org/thunderbird/";
-depends=('alsa-lib' 'dbus-glib' 'desktop-file-utils' 'gtk2' 
'hicolor-icon-theme' 'hunspell' 'libevent' 'libnotify' 'libvpx' 'libxt' 
'mime-types' 'mozilla-common' 'nss' 'sqlite' 'startup-notification')
-makedepends=('unzip' 'zip' 'pkg-config' 'python2' 'wireless_tools' 'yasm' 
'mesa' 'autoconf2.13')
-optdepends=('libcanberra: for sound support')
-install=thunderbird.install
-source=(ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/$pkgver/source/thunderbird-$pkgver.source.tar.bz2
-        mozconfig
-        thunderbird.desktop
-        thunderbird-install-dir.patch
-        vendor.js)
-options=(!emptydirs)
-md5sums=('c84b83502892a34ecfe2d7a0fa58034f'
-         '41511a6bcdd04cf56706218e4670e631'
-         'af3e5b344d2edf1c7d61bb0a5a96de9a'
-         'aea906acf72c43dd82ead2fabcc1c6db'
-         '5a53179d14ae9631b7afe5e4d0fc0b25')
-
-build() {
-  cd comm-release
-  patch -Np1 -i "$srcdir/thunderbird-install-dir.patch"
-
-  cp "$srcdir/mozconfig" .mozconfig
-
-  export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/thunderbird"
-  export PYTHON="/usr/bin/python2"
-
-  make -j1 -f client.mk build MOZ_MAKE_FLAGS="$MAKEFLAGS"
-}
-
-package() {
-  cd comm-release
-  make -j1 -f client.mk DESTDIR="$pkgdir" install
-
-  install -Dm644 "$srcdir"/vendor.js 
"$pkgdir/usr/lib/thunderbird/defaults/preferences/vendor.js"
-
-  for i in 16x16 22x22 24x24 32x32 48x48 256x256; do
-      install -Dm644 other-licenses/branding/thunderbird/mailicon${i/x*/}.png \
-          "$pkgdir/usr/share/icons/hicolor/$i/apps/thunderbird.png"
-  done
-
-  install -Dm644 "$srcdir/thunderbird.desktop" \
-      "$pkgdir/usr/share/applications/thunderbird.desktop"
-
-  rm -rf "$pkgdir"/usr/lib/thunderbird/{dictionaries,hyphenation}
-  ln -sf /usr/share/hunspell "$pkgdir/usr/lib/thunderbird/dictionaries"
-  ln -sf /usr/share/hyphen "$pkgdir/usr/lib/thunderbird/hyphenation"
-
-  # We don't want the development stuff
-  rm -r "$pkgdir"/usr/{include,lib/thunderbird-devel,share/idl}
-}

Copied: thunderbird/repos/extra-x86_64/PKGBUILD (from rev 168497, 
thunderbird/repos/testing-x86_64/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD                               (rev 0)
+++ extra-x86_64/PKGBUILD       2012-10-12 19:21:24 UTC (rev 168500)
@@ -0,0 +1,62 @@
+# $Id$
+# Maintainer : Ionut Biru <ib...@archlinux.org>
+# Contributor: Alexander Baldeck <alexan...@archlinux.org>
+# Contributor: Dale Blount <d...@archlinux.org>
+# Contributor: Anders Bostrom <anders.bost...@home.se>
+
+pkgname=thunderbird
+pkgver=16.0.1
+pkgrel=1
+pkgdesc="Standalone Mail/News reader"
+arch=('i686' 'x86_64')
+license=('MPL' 'GPL')
+url="http://www.mozilla.org/thunderbird/";
+depends=('alsa-lib' 'dbus-glib' 'desktop-file-utils' 'gtk2' 
'hicolor-icon-theme' 'hunspell' 'libevent' 'libnotify' 'libvpx' 'libxt' 
'mime-types' 'mozilla-common' 'nss' 'sqlite' 'startup-notification')
+makedepends=('unzip' 'zip' 'pkg-config' 'python2' 'wireless_tools' 'yasm' 
'mesa' 'autoconf2.13')
+optdepends=('libcanberra: for sound support')
+install=thunderbird.install
+source=(ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/$pkgver/source/thunderbird-$pkgver.source.tar.bz2
+        mozconfig
+        thunderbird.desktop
+        thunderbird-install-dir.patch
+        vendor.js)
+options=(!emptydirs)
+md5sums=('5b0ceb8d403b607fc0330e276b2e7c65'
+         '41511a6bcdd04cf56706218e4670e631'
+         'af3e5b344d2edf1c7d61bb0a5a96de9a'
+         '2e15662c756fa799d9d328f7125257be'
+         '5a53179d14ae9631b7afe5e4d0fc0b25')
+
+build() {
+  cd comm-release
+  patch -Np1 -i "$srcdir/thunderbird-install-dir.patch"
+
+  cp "$srcdir/mozconfig" .mozconfig
+
+  export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/thunderbird"
+  export PYTHON="/usr/bin/python2"
+
+  make -j1 -f client.mk build MOZ_MAKE_FLAGS="$MAKEFLAGS"
+}
+
+package() {
+  cd comm-release
+  make -j1 -f client.mk DESTDIR="$pkgdir" install
+
+  install -Dm644 "$srcdir"/vendor.js 
"$pkgdir/usr/lib/thunderbird/defaults/preferences/vendor.js"
+
+  for i in 16x16 22x22 24x24 32x32 48x48 256x256; do
+      install -Dm644 other-licenses/branding/thunderbird/mailicon${i/x*/}.png \
+          "$pkgdir/usr/share/icons/hicolor/$i/apps/thunderbird.png"
+  done
+
+  install -Dm644 "$srcdir/thunderbird.desktop" \
+      "$pkgdir/usr/share/applications/thunderbird.desktop"
+
+  rm -rf "$pkgdir"/usr/lib/thunderbird/{dictionaries,hyphenation}
+  ln -sf /usr/share/hunspell "$pkgdir/usr/lib/thunderbird/dictionaries"
+  ln -sf /usr/share/hyphen "$pkgdir/usr/lib/thunderbird/hyphenation"
+
+  # We don't want the development stuff
+  rm -r "$pkgdir"/usr/{include,lib/thunderbird-devel,share/idl}
+}

Deleted: extra-x86_64/mozconfig
===================================================================
--- extra-x86_64/mozconfig      2012-10-12 19:21:10 UTC (rev 168499)
+++ extra-x86_64/mozconfig      2012-10-12 19:21:24 UTC (rev 168500)
@@ -1,40 +0,0 @@
-mk_add_options MOZ_CO_PROJECT=mail
-ac_add_options --enable-application=mail
-
-ac_add_options --prefix=/usr
-ac_add_options --libdir=/usr/lib
-
-# System libraries
-ac_add_options --with-system-nspr
-ac_add_options --with-system-nss
-ac_add_options --with-system-jpeg
-ac_add_options --with-system-zlib
-ac_add_options --with-system-bz2
-ac_add_options --with-system-png
-ac_add_options --with-system-libevent
-ac_add_options --with-system-libvpx
-ac_add_options --enable-system-hunspell
-ac_add_options --enable-system-sqlite
-ac_add_options --enable-system-ffi
-#ac_add_options --enable-system-cairo
-ac_add_options --enable-system-pixman
-ac_add_options --with-pthreads
-
-# Features
-ac_add_options --enable-official-branding
-ac_add_options --enable-safe-browsing
-ac_add_options --enable-startup-notification
-ac_add_options --enable-gio
-
-ac_add_options --disable-gnomevfs
-ac_add_options --disable-crashreporter
-ac_add_options --disable-updater
-ac_add_options --disable-tests
-ac_add_options --disable-mochitest
-ac_add_options --disable-installer
-
-# Optimization
-ac_add_options --enable-optimize
-
-export MOZILLA_OFFICIAL=1
-mk_add_options MOZILLA_OFFICIAL=1

Copied: thunderbird/repos/extra-x86_64/mozconfig (from rev 168497, 
thunderbird/repos/testing-x86_64/mozconfig)
===================================================================
--- extra-x86_64/mozconfig                              (rev 0)
+++ extra-x86_64/mozconfig      2012-10-12 19:21:24 UTC (rev 168500)
@@ -0,0 +1,40 @@
+mk_add_options MOZ_CO_PROJECT=mail
+ac_add_options --enable-application=mail
+
+ac_add_options --prefix=/usr
+ac_add_options --libdir=/usr/lib
+
+# System libraries
+ac_add_options --with-system-nspr
+ac_add_options --with-system-nss
+ac_add_options --with-system-jpeg
+ac_add_options --with-system-zlib
+ac_add_options --with-system-bz2
+ac_add_options --with-system-png
+ac_add_options --with-system-libevent
+ac_add_options --with-system-libvpx
+ac_add_options --enable-system-hunspell
+ac_add_options --enable-system-sqlite
+ac_add_options --enable-system-ffi
+#ac_add_options --enable-system-cairo
+ac_add_options --enable-system-pixman
+ac_add_options --with-pthreads
+
+# Features
+ac_add_options --enable-official-branding
+ac_add_options --enable-safe-browsing
+ac_add_options --enable-startup-notification
+ac_add_options --enable-gio
+
+ac_add_options --disable-gnomevfs
+ac_add_options --disable-crashreporter
+ac_add_options --disable-updater
+ac_add_options --disable-tests
+ac_add_options --disable-mochitest
+ac_add_options --disable-installer
+
+# Optimization
+ac_add_options --enable-optimize
+
+export MOZILLA_OFFICIAL=1
+mk_add_options MOZILLA_OFFICIAL=1

Deleted: extra-x86_64/thunderbird-install-dir.patch
===================================================================
--- extra-x86_64/thunderbird-install-dir.patch  2012-10-12 19:21:10 UTC (rev 
168499)
+++ extra-x86_64/thunderbird-install-dir.patch  2012-10-12 19:21:24 UTC (rev 
168500)
@@ -1,42 +0,0 @@
-diff -Nur comm-beta.orig/config/autoconf.mk.in comm-beta/config/autoconf.mk.in
---- comm-beta.orig/config/autoconf.mk.in       2011-11-06 14:39:51.064983780 
+0000
-+++ comm-beta/config/autoconf.mk.in    2011-11-06 14:42:57.216735333 +0000
-@@ -65,8 +65,8 @@
- mandir                = @mandir@
- idldir                = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
- 
--installdir    = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
--sdkdir                = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
-+installdir    = $(libdir)/$(MOZ_APP_NAME)
-+sdkdir                = $(libdir)/$(MOZ_APP_NAME)-devel
- 
- MOZDEPTH      = $(DEPTH)/mozilla
- DIST          = $(MOZDEPTH)/dist
-diff -Nur comm-beta.orig/mozilla/config/autoconf.mk.in 
comm-beta/mozilla/config/autoconf.mk.in
---- comm-beta.orig/mozilla/config/autoconf.mk.in       2011-11-06 
14:39:41.771562967 +0000
-+++ comm-beta/mozilla/config/autoconf.mk.in    2011-11-06 14:44:18.404165515 
+0000
-@@ -68,8 +68,8 @@
- mandir                = @mandir@
- idldir                = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
- 
--installdir    = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
--sdkdir                = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
-+installdir    = $(libdir)/$(MOZ_APP_NAME)
-+sdkdir                = $(libdir)/$(MOZ_APP_NAME)-devel
- 
- DIST          = $(DEPTH)/dist
- LIBXUL_SDK      = @LIBXUL_SDK@
-diff -Nur comm-beta.orig/mozilla/js/src/config/autoconf.mk.in 
comm-beta/mozilla/js/src/config/autoconf.mk.in
---- comm-beta.orig/mozilla/js/src/config/autoconf.mk.in        2011-11-06 
14:39:48.014955070 +0000
-+++ comm-beta/mozilla/js/src/config/autoconf.mk.in     2011-11-06 
14:44:32.977635875 +0000
-@@ -61,8 +61,8 @@
- datadir               = @datadir@
- mandir                = @mandir@
- 
--installdir    = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
--sdkdir                = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
-+installdir    = $(libdir)/$(MOZ_APP_NAME)
-+sdkdir                = $(libdir)/$(MOZ_APP_NAME)-devel
- 
- TOP_DIST      = @TOP_DIST@
- ifneq (,$(filter /%,$(TOP_DIST)))

Copied: thunderbird/repos/extra-x86_64/thunderbird-install-dir.patch (from rev 
168497, thunderbird/repos/testing-x86_64/thunderbird-install-dir.patch)
===================================================================
--- extra-x86_64/thunderbird-install-dir.patch                          (rev 0)
+++ extra-x86_64/thunderbird-install-dir.patch  2012-10-12 19:21:24 UTC (rev 
168500)
@@ -0,0 +1,44 @@
+diff -upr comm-release.orig/config/autoconf.mk.in 
comm-release/config/autoconf.mk.in
+--- comm-release.orig/config/autoconf.mk.in    2012-10-12 06:33:25.000000000 
+0300
++++ comm-release/config/autoconf.mk.in 2012-10-12 06:40:17.000000000 +0300
+@@ -36,8 +36,8 @@ datadir              = @datadir@
+ mandir                = @mandir@
+ idldir                = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+ 
+-installdir    = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+-sdkdir                = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
++installdir    = $(libdir)/$(MOZ_APP_NAME)
++sdkdir                = $(libdir)/$(MOZ_APP_NAME)-devel
+ 
+ MOZDEPTH      = $(DEPTH)/mozilla
+ DIST          = $(MOZDEPTH)/dist
+diff -upr comm-release.orig/mozilla/config/baseconfig.mk 
comm-release/mozilla/config/baseconfig.mk
+--- comm-release.orig/mozilla/config/baseconfig.mk     2012-10-12 
06:33:27.000000000 +0300
++++ comm-release/mozilla/config/baseconfig.mk  2012-10-12 06:37:04.000000000 
+0300
+@@ -1,9 +1,9 @@
+ INCLUDED_AUTOCONF_MK = 1
+ 
+-includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+-idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+-sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
++includedir := $(includedir)/$(MOZ_APP_NAME)
++idldir = $(datadir)/idl/$(MOZ_APP_NAME)
++installdir = $(libdir)/$(MOZ_APP_NAME)
++sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel
+ DIST = $(DEPTH)/dist
+ 
+ # We do magic with OBJ_SUFFIX in config.mk, the following ensures we don't
+diff -upr comm-release.orig/mozilla/js/src/config/baseconfig.mk 
comm-release/mozilla/js/src/config/baseconfig.mk
+--- comm-release.orig/mozilla/js/src/config/baseconfig.mk      2012-10-12 
06:33:26.000000000 +0300
++++ comm-release/mozilla/js/src/config/baseconfig.mk   2012-10-12 
06:37:49.000000000 +0300
+@@ -1,7 +1,7 @@
+ INCLUDED_AUTOCONF_MK = 1
+ 
+-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+-sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
++installdir = $(libdir)/$(MOZ_APP_NAME)
++sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel
+ 
+ ifneq (,$(filter /%,$(TOP_DIST)))
+ DIST = $(TOP_DIST)

Deleted: extra-x86_64/thunderbird.desktop
===================================================================
--- extra-x86_64/thunderbird.desktop    2012-10-12 19:21:10 UTC (rev 168499)
+++ extra-x86_64/thunderbird.desktop    2012-10-12 19:21:24 UTC (rev 168500)
@@ -1,13 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=Thunderbird
-Comment=Mail & News Reader
-GenericName=Mail Client & News Reader
-Exec=thunderbird %u
-TryExec=thunderbird
-Icon=thunderbird
-Terminal=false
-Type=Application
-Categories=Network;Email;
-MimeType=message/rfc822;x-scheme-handler/mailto;
-StartupNotify=true

Copied: thunderbird/repos/extra-x86_64/thunderbird.desktop (from rev 168497, 
thunderbird/repos/testing-x86_64/thunderbird.desktop)
===================================================================
--- extra-x86_64/thunderbird.desktop                            (rev 0)
+++ extra-x86_64/thunderbird.desktop    2012-10-12 19:21:24 UTC (rev 168500)
@@ -0,0 +1,13 @@
+[Desktop Entry]
+Version=1.0
+Name=Thunderbird
+Comment=Mail & News Reader
+GenericName=Mail Client & News Reader
+Exec=thunderbird %u
+TryExec=thunderbird
+Icon=thunderbird
+Terminal=false
+Type=Application
+Categories=Network;Email;
+MimeType=message/rfc822;x-scheme-handler/mailto;
+StartupNotify=true

Deleted: extra-x86_64/thunderbird.install
===================================================================
--- extra-x86_64/thunderbird.install    2012-10-12 19:21:10 UTC (rev 168499)
+++ extra-x86_64/thunderbird.install    2012-10-12 19:21:24 UTC (rev 168500)
@@ -1,12 +0,0 @@
-post_install() {
-    update-desktop-database -q
-    gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}

Copied: thunderbird/repos/extra-x86_64/thunderbird.install (from rev 168497, 
thunderbird/repos/testing-x86_64/thunderbird.install)
===================================================================
--- extra-x86_64/thunderbird.install                            (rev 0)
+++ extra-x86_64/thunderbird.install    2012-10-12 19:21:24 UTC (rev 168500)
@@ -0,0 +1,12 @@
+post_install() {
+    update-desktop-database -q
+    gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}

Deleted: extra-x86_64/vendor.js
===================================================================
--- extra-x86_64/vendor.js      2012-10-12 19:21:10 UTC (rev 168499)
+++ extra-x86_64/vendor.js      2012-10-12 19:21:24 UTC (rev 168500)
@@ -1,9 +0,0 @@
-// Use LANG environment variable to choose locale
-pref("intl.locale.matchOS", true);
-
-// Disable default mailer checking.
-pref("mail.shell.checkDefaultMail", false);
-
-// Don't disable our bundled extensions in the application directory
-pref("extensions.autoDisableScopes", 11);
-pref("extensions.shownSelectionUI", true);

Copied: thunderbird/repos/extra-x86_64/vendor.js (from rev 168497, 
thunderbird/repos/testing-x86_64/vendor.js)
===================================================================
--- extra-x86_64/vendor.js                              (rev 0)
+++ extra-x86_64/vendor.js      2012-10-12 19:21:24 UTC (rev 168500)
@@ -0,0 +1,9 @@
+// Use LANG environment variable to choose locale
+pref("intl.locale.matchOS", true);
+
+// Disable default mailer checking.
+pref("mail.shell.checkDefaultMail", false);
+
+// Don't disable our bundled extensions in the application directory
+pref("extensions.autoDisableScopes", 11);
+pref("extensions.shownSelectionUI", true);

Reply via email to