From 2ec471c13ef908b5aa0ba1edaa14c4c5021d37a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <mcihar@suse.cz>
Date: Tue, 14 Feb 2012 16:12:52 +0100
Subject: [PATCH 1/2] Simplify code

---
 scripts/create-release.sh | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/scripts/create-release.sh b/scripts/create-release.sh
index f9f655e235..a32522218f 100755
--- a/scripts/create-release.sh
+++ b/scripts/create-release.sh
@@ -110,13 +110,6 @@ LC_ALL=C w3m -dump Documentation.html > Documentation.txt
 
 # Check for gettext support
 if [ -d po ] ; then
-    GETTEXT=1
-else
-    GETTEXT=0
-fi
-
-# Generate mo files
-if [ $GETTEXT -eq 1 ] ; then
     echo "* Generating mo files"
     ./scripts/generate-mo
     if [ -f ./scripts/remove-incomplete-mo ] ; then

From c748c3bf5af1b803049b904f590f255323c975bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <mcihar@suse.cz>
Date: Tue, 14 Feb 2012 16:15:18 +0100
Subject: [PATCH 2/2] Compatibility with 3.4 branch

---
 scripts/create-release.sh | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/scripts/create-release.sh b/scripts/create-release.sh
index a32522218f..fe1b80cd44 100755
--- a/scripts/create-release.sh
+++ b/scripts/create-release.sh
@@ -147,7 +147,19 @@ for kit in $KITS ; do
     # Cleanup translations
     cd phpMyAdmin-$version-$kit
     scripts/lang-cleanup.sh $kit
-    rm -rf scripts
+    if [ -f examples/create_tables.sql ] ; then
+        # 3.5 and newer
+        rm -rf scripts
+    else
+        # 3.4 and older
+        # Remove javascript compiler, no need to ship it
+        rm -rf scripts/google-javascript-compiler/
+
+        # Remove scripts which are not useful for user
+        for s in compress-js create-release.sh generate-mo mergepo.py php2gettext.sh remove_control_m.sh update-po upload-release pending-po pendingpo.py ; do
+            rm -f scripts/$s
+        done
+    fi
     cd ..
 
     # Remove tar file possibly left from previous run