some cleanup for debian packages

git-svn-id: https://silmor.de/svn/softmagic/smoke/trunk@473 6e3c4bff-ac9f-4ac1-96c5-d2ea494d3e33

diff --git a/debian/control b/debian/control
index 5bf89f8..19f3c31 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${local:libssl}
 Recommends: magicsmoke2-doc
 Suggests: magicsmoke2-server
-Description: MagicSmoke Ticket Sale System
+Description: MagicSmoke Ticket Sale System - Standalone Client
  This package contains the MagicSmoke Ticket Sales System Client version 2.
  .
  It requires a MagicSmoke version 2 server to be running somewhere.
@@ -20,15 +20,15 @@ Package: magicsmoke2-doc
 Architecture: all
 Depends:
 Suggests: magicsmoke
-Description: MagicSmoke Ticket Sale System
+Description: MagicSmoke Ticket Sale System - Documentation
  This package contains the MagicSmoke Ticket Sales System Documentation
  in HTML format.
 
 Package: magicsmoke2-server
 Architecture: all
-Depends: php5 (>= 5), php5-mysql (>= 5), php5-mhash (>= 5)
-Suggests: magicsmoke-doc, magicsmoke
-Description: MagicSmoke Ticket Sale System
+Depends: php5 (>= 5), php5-mysql (>= 5) | php5-pgsql (>= 5)
+Suggests: magicsmoke2-doc, magicsmoke2
+Description: MagicSmoke Ticket Sale System - Server
  This package contains the MagicSmoke Ticket Sales System Server version 2.
  .
  It can be installed in parallel to the old version 1 system, but is

diff --git a/debian/rules b/debian/rules
index 8045a30..917c427 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
 # Debian packaging script for MagicSmoke
-# (c) Konrad Rosenbaum, 2009
+# (c) Konrad Rosenbaum, 2009-2010
 
 #Original comment:
 # Sample debian/rules that uses debhelper.
@@ -32,14 +32,7 @@ build-stamp: configure-stamp
        @echo '********************'
        @echo Building...
        dh_testdir
-       cd woc; /usr/bin/qmake
-       $(MAKE) -C woc
-       cd wob; ../woc/woc magicsmoke.wolf
-       cd zip; /usr/bin/qmake
-       $(MAKE) -C zip
-       cd src; /usr/bin/qmake
-       $(MAKE) -C src
-       cd src ; /usr/bin/lrelease smoke.pro
+       make -f Makefile.unix
        touch $@
 
 clean: 
@@ -48,10 +41,7 @@ clean:
        dh_testdir
        dh_testroot
        rm -f build-stamp configure-stamp
-       $(MAKE) -C src distclean
-       $(MAKE) -C woc distclean
-       $(MAKE) -C zip distclean
-       rm -rf src/wob www/inc/wob
+       $(MAKE) -f Makefile.unix distclean
        dh_clean 
 
 install: install-base install-client install-doc install-server
@@ -67,16 +57,19 @@ CLIENT=$(CURDIR)/debian/magicsmoke2-client
 install-client:
        @echo '********************'
        @echo Install Client...
+       #client itself
        mkdir -p $(CLIENT)/usr/share/doc/magicsmoke2-client
        install -D src/msmoke $(CLIENT)/usr/lib/magicsmoke2/msmoke
-       #cp zip/lib* $(CLIENT)/usr/lib/magicsmoke2/
        cp src/icon.png $(CLIENT)/usr/lib/magicsmoke2/
+       #wrapper for /usr/bin
        echo '#!/bin/sh' >$(CLIENT)/usr/bin/msmoke2
        #echo 'LD_LIBRARY_PATH=/usr/lib/magicsmoke2:$LD_LIBRARY_PATH' >>$(CLIENT)/usr/bin/msmoke2
        #echo 'export LD_LIBRARY_PATH' >>$(CLIENT)/usr/bin/msmoke2
        echo 'exec /usr/lib/magicsmoke2/msmoke' >>$(CLIENT)/usr/bin/msmoke2
        chmod +x $(CLIENT)/usr/bin/msmoke2
+       #remove the .svn dirs copied before
        rm -rf `find $(CLIENT) -name .svn`
+       #debian docu
        cp -L README COPYING* $(CLIENT)/usr/share/doc/magicsmoke2-client
        gzip `ls $(CLIENT)/usr/share/doc/magicsmoke2-client/* |grep -v .gz`
        cp -L src/smoke*.qm $(CLIENT)/usr/lib/magicsmoke2