More work on debian package

packaging/linux/deb/DEBIAN/copyright

@@ -0,0 +1,43 @@
+This work was packaged for Debian by:
+
+    Matthew Bowra-Dean <matthew@ijw.co.nz> on Tue, 14 Sep 2010 19:23:29 +1200
+
+It was downloaded from:
+
+    http://open-ra.org
+
+Upstream Author(s):
+
+    Chris Forbes <chrisf@ijw.co.nz>
+    Robert Pepperell <ytinasni@gmail.com>
+    Paul Chote <sleipnir@sleipnirstuff.com>
+    Alli Witherford <alzeih@gmail.com>
+    Matthew Bowra-Dean <matthew@ijw.co.nz>  
+
+Copyright:
+
+    Copyright (C) 2007-2010 The OpenRA Developers
+
+License:
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This package is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+On Debian systems, the complete text of the GNU General
+Public License version 3 can be found in `/usr/share/common-licenses/GPL-3'.
+
+The Debian packaging is:
+
+    Copyright (C) 2010 Matthew Bowra-Dean <matthew@ijw.co.nz>, Maikel van den Hout <ma1kelvdh@gmail.com>
+
+and is licensed under the GPL version 3, see above.

packaging/linux/deb/DEBIAN/postinst

@@ -9,7 +9,7 @@ fi
 start_directory=$( pwd )
 cd /tmp
 
-anw=`zenity --question --text "Download and install RA packages? (This might take a while) [Y/n]"; echo $?`
+anw=`zenity --question --text "Download and install RA packages? [Y/n]"; echo $?`
 if [ $anw = 0 ] ; then
     cd /tmp/
     wget "http://open-ra.org/get-dependency.php?file=ra-packages" -O ra-packages.zip
@@ -18,11 +18,13 @@ if [ $anw = 0 ] ; then
     rm ra-packages.zip
     cd $start_directory
     else
+    zenity --info --text "The RA packages will need to be manually extracted from http://open-ra.org/get-dependency.php?file=ra-packages \
+    to /usr/share/openra/mods/ra/packages before the RA mod will work."
     break
 fi
 
 
-anw=`zenity --question --text "Download and install C&C packages? (This might take a while) [Y/n]"; echo $?`
+anw=`zenity --question --text "Download and install C&C packages? [Y/n]"; echo $?`
 if [ $anw = 0 ] ; then
     cd /tmp/
     wget "http://open-ra.org/get-dependency.php?file=cnc-packages" -O cnc-packages.zip
@@ -31,6 +33,8 @@ if [ $anw = 0 ] ; then
     rm cnc-packages.zip
     cd $start_directory
     else
+    zenity --info --text "The C&C packages will need to be manually extracted from http://open-ra.org/get-dependency.php?file=cnc-packages \
+    to /usr/share/openra/mods/cnc/packages before the C&C mod will work."
     break
 fi
 

packaging/linux/deb/buildpackage.sh

@@ -1,10 +1,10 @@
 #!/bin/bash
-ARGS=7
+ARGS=8
 E_BADARGS=85
 
 if [ $# -ne "$ARGS" ]
 then
-    echo "Usage: `basename $0` ftp-server ftp-path username password version temp-packaging-dir"
+    echo "Usage: `basename $0` ftp-server ftp-path username password version src-dir temp-packaging-dir"
     exit $E_BADARGS
 fi
 
@@ -22,12 +22,12 @@ PACKAGE_SIZE= $( du --apparent-size -c ./usr | grep total | sed 's/[a-z]//g' | s
 sed -i '5,5 i\Installed-Size: $PACKAGE_SIZE' ./DEBIAN/control
 
 # Copy our two needed folders to a clean package directory (yes, this is needed)
-cp -R ./DEBIAN $6
+cp -R ./DEBIAN $7
-cp -R ./usr $6
+cp -R $6/usr $7
 
 # Build it in the package directory, but place the finished deb in our starting directory
 BUILD_DIR=$( pwd )
-pushd $6
+pushd $7
 
 # Calculate md5sums and clean up the /usr/ part of them
 md5sum `find . -type f | grep -v '^[.]/DEBIAN/'` >DEBIAN/md5sums
@@ -53,4 +53,4 @@ wput -u deblatest.txt "ftp://$3:$4@$1/$2/"
 
 # remove temp-packaging-dir
 
-rm -rf $6
+rm -rf $7

packaging/linux/pkgbuild/openra.install

@@ -24,7 +24,10 @@ post_install() {
                 install_ra_packages
                 popd
                 break;;
-            n|N) break;;
+            n|N)
+                echo "The RA packages will need to be manually extracted from http://open-ra.org/get-dependency.php?file=ra-packages \
+                to /usr/share/openra/mods/ra/packages before the RA mod will work." 
+                break;;
             *) echo "Please enter y or n.";;
         esac
     done
@@ -38,7 +41,10 @@ post_install() {
                 install_cnc_packages
                 popd
                 break;;
-            n|N) break;;
+            n|N)
+                echo "The C&C packages will need to be manually extracted from http://open-ra.org/get-dependency.php?file=cnc-packages \
+                to /usr/share/openra/mods/cnc/packages before the C&C mod will work." 
+                break;;
             *) echo "Please enter y or n.";;
         esac
     done

packaging/linux/rpm/openra.spec

@@ -41,7 +41,10 @@ do
             rm ra-packages.zip
             popd
             break;;
-        n|N) break;;
+        n|N)
+            echo "The RA packages will need to be manually extracted from http://open-ra.org/get-dependency.php?file=ra-packages \
+            to /usr/share/openra/mods/ra/packages before the RA mod will work." 
+            break;;
         *) echo "Please enter y or n.";;
     esac
 done
@@ -58,7 +61,10 @@ do
             rm cnc-packages.zip
             popd
             break;;
-        n|N) break;;
+        n|N)
+            echo "The C&C packages will need to be manually extracted from http://open-ra.org/get-dependency.php?file=cnc-packages \
+            to /usr/share/openra/mods/cnc/packages before the C&C mod will work." 
+            break;;
         *) echo "Please enter y or n.";;
     esac
 done