From 034ebd68e16689bec4ad12572ef79cb2f04198cf Mon Sep 17 00:00:00 2001
From: Boris Kraut <krt@nurfuerspam.de>
Date: Wed, 28 Jan 2015 00:21:23 +0100
Subject: [PATCH] Update Fennec Fdroid to 35.0.1 (350011)

---
 metadata/org.mozilla.fennec_fdroid.txt | 100 +++++++++++++++++++++++++
 1 file changed, 100 insertions(+)

diff --git a/metadata/org.mozilla.fennec_fdroid.txt b/metadata/org.mozilla.fennec_fdroid.txt
index 46d2acd651..d7384a1212 100644
--- a/metadata/org.mozilla.fennec_fdroid.txt
+++ b/metadata/org.mozilla.fennec_fdroid.txt
@@ -133,6 +133,106 @@ Build:35.0,350010
         mv obj-${fxarch}/dist/fennec-*.apk fdroid/fennec-unsigned.apk && \
         zip -d fdroid/fennec-unsigned.apk "META-INF*"
 
+Build:35.0.1,350001
+    commit=FENNEC_35_0_1_RELEASE
+    srclibs=MozLocales@214c475d
+    output=fdroid/fennec-unsigned.apk
+    init=\
+        rm -R docshell/test/ && \
+        rm -R dom/tests/ && \
+        rm -R modules/libjar/test/ && \
+        rm -R security/manager/ssl/tests/*test/ && \
+        rm -R security/nss/cmd/bltest/tests/ && \
+        rm -R security/nss/tests/ && \
+        rm toolkit/crashreporter/moz.build && \
+        rm -R toolkit/crashreporter/client/ && \
+        rm -R toolkit/crashreporter/google-breakpad/src/tools/ && \
+        rm -R toolkit/crashreporter/google-breakpad/src/client/ && \
+        rm -R toolkit/crashreporter/google-breakpad/src/processor/testdata/ && \
+        rm -R toolkit/crashreporter/google-breakpad/src/third_party/linux/ && \
+        rm -R toolkit/mozapps/extensions/test/ && \
+        rm -R xpcom/tests/
+    scanignore=mobile/android/base/JavaAddonManager.java
+    prebuild=mkdir fdroid && \
+        l10ndir=`readlink -f $$MozLocales$$` && \
+        sed -i -e 's/android:debuggable="true"//g' -e 's/@ANDROID_VERSION_CODE@/350001/g' mobile/android/base/AndroidManifest.xml.in && \
+        sed -i -e '/MOZ_ANDROID_GOOGLE_PLAY_SERVICES/d' configure.in && \
+        echo "ac_add_options --with-android-ndk=\"$$NDK$$\"" > .mozconfig && \
+        echo "ac_add_options --with-android-sdk=\"$$SDK$$/platforms/android-21\"" >> .mozconfig && \
+        echo "ac_add_options --enable-application=mobile/android" >> .mozconfig && \
+        echo "ac_add_options --target=arm-linux-androideabi" >> .mozconfig && \
+        echo "ac_add_options --disable-tests" >> .mozconfig && \
+        echo "ac_add_options --disable-crashreporter" >> .mozconfig && \
+        echo "ac_add_options --with-branding=mobile/android/branding/unofficial" >> .mozconfig && \
+        echo "ac_add_options --with-l10n-base=${l10ndir}" >> .mozconfig && \
+        echo "mk_add_options 'export L10NBASEDIR=${l10ndir}'" >> .mozconfig && \
+        echo "mk_add_options 'export MOZ_CHROME_MULTILOCALE=$(tr '\n' ' ' <  mobile/android/locales/maemo-locales)'" >> .mozconfig && \
+        pushd mobile/android/branding/unofficial/ && \
+        sed -i -e '/ANDROID_PACKAGE_NAME/d' -e '/MOZ_APP_DISPLAYNAME/d' configure.sh && \
+        echo 'ANDROID_PACKAGE_NAME=org.mozilla.fennec_fdroid' >> configure.sh && \
+        echo 'MOZ_APP_DISPLAYNAME="Fennec FDroid"' >> configure.sh && \
+        popd && \
+        sed -i -e '/MOZ_DEVICES/d' -e '/MOZ_NATIVE_DEVICES/d' mobile/android/confvars.sh && \
+        echo -e 'MOZ_DEVICES=0\nMOZ_NATIVE_DEVICES=0\nMOZ_ANDROID_GOOGLE_PLAY_SERVICES=0\n' >> mobile/android/confvars.sh
+    build=./mach build && \
+        fxarch=`grep "ac_add_options --target=" .mozconfig | cut -d '=' -f2` && \
+        pushd obj-${fxarch}/mobile/android/locales && \
+          for loc in $(cat ../../../../mobile/android/locales/maemo-locales); do LOCALE_MERGEDIR=$PWD/merge-$loc make merge-$loc LOCALE_MERGEDIR=$PWD/merge-$loc; make LOCALE_MERGEDIR=$PWD/merge-$loc chrome-$loc LOCALE_MERGEDIR=$PWD/merge-$loc; done && \
+        popd && \
+        ./mach package && \
+        mv obj-${fxarch}/dist/fennec-*.apk fdroid/fennec-unsigned.apk && \
+        zip -d fdroid/fennec-unsigned.apk "META-INF*"
+
+Build:35.0,350011
+    commit=FENNEC_35_0_1_RELEASE
+    srclibs=MozLocales@214c475d
+    output=fdroid/fennec-unsigned.apk
+    init=\
+        rm -R docshell/test/ && \
+        rm -R dom/tests/ && \
+        rm -R modules/libjar/test/ && \
+        rm -R security/manager/ssl/tests/*test/ && \
+        rm -R security/nss/cmd/bltest/tests/ && \
+        rm -R security/nss/tests/ && \
+        rm toolkit/crashreporter/moz.build && \
+        rm -R toolkit/crashreporter/client/ && \
+        rm -R toolkit/crashreporter/google-breakpad/src/tools/ && \
+        rm -R toolkit/crashreporter/google-breakpad/src/client/ && \
+        rm -R toolkit/crashreporter/google-breakpad/src/processor/testdata/ && \
+        rm -R toolkit/crashreporter/google-breakpad/src/third_party/linux/ && \
+        rm -R toolkit/mozapps/extensions/test/ && \
+        rm -R xpcom/tests/
+    scanignore=mobile/android/base/JavaAddonManager.java
+    prebuild=mkdir fdroid && \
+        l10ndir=`readlink -f $$MozLocales$$` && \
+        sed -i -e 's/android:debuggable="true"//g' -e 's/@ANDROID_VERSION_CODE@/350011/g' mobile/android/base/AndroidManifest.xml.in && \
+        sed -i -e '/MOZ_ANDROID_GOOGLE_PLAY_SERVICES/d' configure.in && \
+        echo "ac_add_options --with-android-ndk=\"$$NDK$$\"" > .mozconfig && \
+        echo "ac_add_options --with-android-sdk=\"$$SDK$$/platforms/android-21\"" >> .mozconfig && \
+        echo "ac_add_options --enable-application=mobile/android" >> .mozconfig && \
+        echo "ac_add_options --target=i386-linux-android" >> .mozconfig && \
+        echo "ac_add_options --disable-tests" >> .mozconfig && \
+        echo "ac_add_options --disable-crashreporter" >> .mozconfig && \
+        echo "ac_add_options --with-branding=mobile/android/branding/unofficial" >> .mozconfig && \
+        echo "ac_add_options --with-l10n-base=${l10ndir}" >> .mozconfig && \
+        echo "mk_add_options 'export L10NBASEDIR=${l10ndir}'" >> .mozconfig && \
+        echo "mk_add_options 'export MOZ_CHROME_MULTILOCALE=$(tr '\n' ' ' <  mobile/android/locales/maemo-locales)'" >> .mozconfig && \
+        pushd mobile/android/branding/unofficial/ && \
+        sed -i -e '/ANDROID_PACKAGE_NAME/d' -e '/MOZ_APP_DISPLAYNAME/d' configure.sh && \
+        echo 'ANDROID_PACKAGE_NAME=org.mozilla.fennec_fdroid' >> configure.sh && \
+        echo 'MOZ_APP_DISPLAYNAME="Fennec FDroid"' >> configure.sh && \
+        popd && \
+        sed -i -e '/MOZ_DEVICES/d' -e '/MOZ_NATIVE_DEVICES/d' mobile/android/confvars.sh && \
+        echo -e 'MOZ_DEVICES=0\nMOZ_NATIVE_DEVICES=0\nMOZ_ANDROID_GOOGLE_PLAY_SERVICES=0\n' >> mobile/android/confvars.sh
+    build=./mach build && \
+        fxarch=`grep "ac_add_options --target=" .mozconfig | cut -d '=' -f2` && \
+        pushd obj-${fxarch}/mobile/android/locales && \
+          for loc in $(cat ../../../../mobile/android/locales/maemo-locales); do LOCALE_MERGEDIR=$PWD/merge-$loc make merge-$loc LOCALE_MERGEDIR=$PWD/merge-$loc; make LOCALE_MERGEDIR=$PWD/merge-$loc chrome-$loc LOCALE_MERGEDIR=$PWD/merge-$loc; done && \
+        popd && \
+        ./mach package && \
+        mv obj-${fxarch}/dist/fennec-*.apk fdroid/fennec-unsigned.apk && \
+        zip -d fdroid/fennec-unsigned.apk "META-INF*"
+
 Maintainer Notes:
 
 Dependencies: