debian CVS patch - Mailing list pgadmin-hackers

Dear Dave and Jean-Michel,

can you please add the patch attached and the new file attached to CVS ?

The patch concerns pkg/debian/rules and pkg/debian/docs files.
The file "make-deb" attached should go to pkg/debian/ and be mode 755,
it's the small script that we talked about some mails ago. Its goal is
to automatically generate the debian package from scratch. I added an
option "-wxconfig" to this script so that developpers with their own
wxWindows version are not borrowed with our supported one (in fact it
ignores debian build dependencies and pass the name of wxconfig to the
./configure).


Regards,

Raphaël
--- pgadmin3-0.8.0.orig/pkg/debian/rules    Sat Jul 12 21:02:59 2003
+++ pgadmin3-0.8.0/pkg/debian/rules    Sun Jul 20 12:19:10 2003
@@ -12,8 +12,8 @@


 # Please give the name of your wxgtk-config here :
-_wxconfig:=wxgtk2ud-2.5-config
-#_wxconfig:=wxgtk-2.4-config
+_deb_wxconfig?=wxgtk2ud-2.5-config
+#_deb_wxconfig:=wxgtk-2.4-config
 #
 # A bad hack to get it compile without errors concerning MNU_NEW
 # Raphael Enrici - 20030624
@@ -47,7 +47,7 @@
         --build=$(DEB_BUILD_GNU_TYPE) \
         --prefix=/usr --mandir=\$${prefix}/share/man \
         --infodir=\$${prefix}/share/info \
-        --with-wx-config=$(_wxconfig) \
+        --with-wx-config=$(_deb_wxconfig) \
         --with-pgsql-include=$(_pgsql_inc) \
         --enable-gtk2 \
         --enable-unicode
--- pgadmin3-0.8.0.orig/pkg/debian/docs    Sat Jul 12 21:02:59 2003
+++ pgadmin3-0.8.0/pkg/debian/docs    Sun Jul 20 13:16:23 2003
@@ -1,5 +1,4 @@
 BUGS.txt
 LICENCE.txt
 README.txt
-README.txt
 TODO.txt
#!/bin/bash
#
# This (poor) script builds the debian package for pgAdmin3
# If invoked without any parameter it assumes that all
# the required packages are installed (if not, dpkg-buildpackage
# will exit telling you missing dependencies)
#
# If you already have your own wxWindows 2.5 compiled and installed
# and don't want to use the binary snapshot that we provide, you can specify
# the name of your wxconfig script with the -wxconfig option. Be aware that
# by doing this, dependencies won't be checked anymore.
#
# Raphael Enrici - <pgadmin-hackers@postgresql.org> - 20030720
#

HERE=`pwd`
TAR=tar
usage() {
    echo "Usage:`basename $0` [ -wxconfig wxconfig_name ]"
    exit 1
}

if [ ! -d $HERE/pkg/debian ]
then
    echo You must launch this script from the top level directory
    echo "of pgAdmin3's snapshot"
    echo "Example : cd pgadmin3-x.y.z ; ./pkg/debian/make-deb"
    exit 1
fi

while [ $# -ne 0 ]
do
echo $1
  case "$1" in
    -wxconfig|--wxconfig)
        shift
        _deb_wxconfig="$1"
        export _deb_wxconfig
        IGNOREDEP="-d"
        shift || usage
    ;;
    *)
        usage
    ;;
  esac
done

(cd pkg; $TAR cf - debian ) | tar xpf -
chmod 755 debian/rules
set -x
touch TODO.txt
dpkg-buildpackage ${IGNOREDEP} -b -rfakeroot