[SCM] BOINC packaging branch, debian/topic/boinc-server, updated. debian/6.2.18-1-6-g27937a2

[Frank S. Thomas]

The following commit has been merged in the debian/topic/boinc-server branch:
commit 50b268ea592fc32ba61d39cde923ac2cfc425d82
Merge: 419abb9d512d1670083a95d2716c61c7757f760b 8b4c8124a93d7e57cf62dcd024f3a5c8a202a05c
Author: Frank S. Thomas <fst at debian.org>
Date:   Wed Sep 10 10:54:26 2008 +0200

    Merge branch 'debian/experimental' into debian/topic/boinc-server
    
    Conflicts:
    
    	debian/rules

diff --combined debian/rules
index 2218b36,6b548e2..17c42db
--- a/debian/rules
+++ b/debian/rules
@@@ -98,7 -98,7 +98,7 @@@ CFGFLAGS = 
    $(TYPE_FLAGS) \
    --prefix=/usr \
    --enable-client \
 -  --disable-server \
 +  --enable-server \
    --enable-unicode \
    --with-ssl \
    CFLAGS="$(CFLAGS)" \
@@@ -115,23 -115,22 +115,22 @@@ CFGFLAGS_boinc-client = 
    CXXFLAGS="$(CXXFLAGS_boinc-client)" \
    LDFLAGS="$(LDFLAGS)"
  
- unit-test-stamp:
+ test-stamp:
  	dh_testdir
  	xmllint --nonet --noout \
  	  debian/conffiles/cc_config.xml \
  	  debian/conffiles/global_prefs_override.xml
  	touch $@
  
- pre-build: unit-test-stamp patch pre-build-stamp
- pre-build-stamp:
+ autoreconf-stamp: patch
  	dh_testdir
  	cp -f /usr/share/misc/config.guess config.guess
  	cp -f /usr/share/misc/config.sub config.sub
  	aclocal-1.9 -I m4 && autoheader && automake-1.9 && autoconf
  	touch $@
  
- build: pre-build build-boinc-client-stamp build-stamp
- build-stamp:
+ build: test-stamp build-stamp
+ build-stamp: autoreconf-stamp build-boinc-client-stamp
  	dh_testdir
  	./configure $(CFGFLAGS)
  	$(MAKE)
@@@ -145,7 -144,7 +144,7 @@@
  	done;
  	touch $@
  
- build-boinc-client-stamp:
+ build-boinc-client-stamp: autoreconf-stamp
  	dh_testdir
  	./configure $(CFGFLAGS_boinc-client)
  	$(MAKE)
@@@ -164,12 -163,9 +163,11 @@@ clean-patched
  	  configure
  	debconf-updatepo
  
 +BOINC_SERVER_DIR=debian/boinc-server/usr/share/boinc-server
 +
  install: build install-stamp
  install-stamp:
- 	dh install --after dh_auto_test --before dh_auto_install
- 	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
+ 	dh install --after dh_auto_test --until dh_install
  	
  	# Install files for the boinc-client package.
  	install -D client/boinc.optimized \
@@@ -194,29 -190,9 +192,29 @@@
  	# "BOINC Manager.mo" is empty and useless.
  	rm -rf debian/boinc-manager/usr/share/locale/en_US/
  	
 +	# Install files for the boinc-server package.
 +	for i in debian/boinc-server/usr/lib/boinc-server/sched/*; do \
 +	  dh_link -pboinc-server \
 +	    usr/lib/boinc-server/sched/`basename $$i` \
 +	    usr/share/boinc-server/sched/`basename $$i`; \
 +	done;
 +	
 +	# Remove Python shebang from Boinc module files that are not scripts.
 +	sed -i -e '1 d' \
 +	  $(BOINC_SERVER_DIR)/py/Boinc/add_util.py \
 +	  $(BOINC_SERVER_DIR)/py/Boinc/boincxml.py \
 +	  $(BOINC_SERVER_DIR)/py/Boinc/configxml.py \
 +	  $(BOINC_SERVER_DIR)/py/Boinc/projectxml.py
 +	
 +	sed -i -e 's/boinc_path_config/Boinc.boinc_path_config/' \
 +	  $(BOINC_SERVER_DIR)/py/Boinc/database.py \
 +	  $(BOINC_SERVER_DIR)/py/Boinc/setup_project.py \
 +	  $(BOINC_SERVER_DIR)/tools/make_project \
 +	  $(BOINC_SERVER_DIR)/tools/upgrade
 +	
- 	dh install --after dh_auto_install --before dh_installchangelogs
+ 	dh install --before dh_installchangelogs
  	dh_installchangelogs -k checkin_notes
- 	dh install --after dh_installchangelogs --until dh_fixperms
+ 	dh install --until dh_fixperms
  	chmod 755 \
  	  debian/boinc-client/usr/share/boinc-client/udev-cpu_share \
  	  debian/boinc-client/usr/share/bug/boinc-client/script \
@@@ -243,5 -219,4 +241,4 @@@ get-orig-source
  	$$EXB -r $$LATEST_VERSION -t $(origDir); \
  	rm -f $$EXB
  
- .PHONY: unit-test pre-build build clean clean-patched install install-arch \
-   binary-arch binary get-orig-source
+ .PHONY: build clean clean-patched install binary-arch binary get-orig-source

-- 
BOINC packaging