[SCM] general-purpose neural simulator branch, master, updated. upstream/2.3-16-ga91a97a

Gabriele Giacone 1o5g4r8o at gmail.com
Sat Dec 10 23:08:02 UTC 2011 

The following commit has been merged in the master branch:
commit a91a97aa6160c95338b4ccdb3785a8332cef9215
Author: Gabriele Giacone <1o5g4r8o at gmail.com>
Date:   Sat Dec 10 20:54:27 2011 +0100

    debhelper compatibility to 7.

diff --git a/debian/compat b/debian/compat
index b8626c4..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-4
+7
diff --git a/debian/compress b/debian/compress
deleted file mode 100644
index 0a1f726..0000000
--- a/debian/compress
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-# Files that begin with lower case letters appear to belong to the
-# GENESIS on-line help system, and cannot be read compressed, so we only
-# compress the ASCII documentation
-
-find usr/share/doc/genesis -maxdepth 1 \
-	\( -name '[A-Z]*' -o -name changelog -o -name changelog.Debian \) \
-	! -name "*.htm*" ! -name "*.gif" ! -iname "*.gz" \
-	! -iname "*.taz" ! -iname "*.tgz" ! -iname "*.z" \
-	! -name "copyright"
-
-find usr/share/man -type f \! -name '*.gz'
diff --git a/debian/genesis-data.install b/debian/genesis-data.install
new file mode 100644
index 0000000..2caebbf
--- /dev/null
+++ b/debian/genesis-data.install
@@ -0,0 +1,6 @@
+Scripts			usr/share/genesis
+startup			usr/share/genesis
+src/startup/simrc	usr/share/genesis/startup
+Doc/README		usr/share/genesis/Doc
+Doc/*.txt		usr/share/genesis/Doc
+Hyperdoc/*		usr/share/doc/genesis-data/html
diff --git a/debian/genesis.docs b/debian/genesis.docs
new file mode 100644
index 0000000..ecaf357
--- /dev/null
+++ b/debian/genesis.docs
@@ -0,0 +1 @@
+Doc/README.changes
diff --git a/debian/genesis.install b/debian/genesis.install
new file mode 100644
index 0000000..c91d12c
--- /dev/null
+++ b/debian/genesis.install
@@ -0,0 +1,6 @@
+genesis			usr/lib/genesis/
+debian/scripts/genesis	usr/bin
+debian/genesis.desktop	usr/share/applications
+lib/*			usr/lib/genesis/
+bin/genesis-convert	usr/bin
+include/*		usr/include/genesis/
diff --git a/debian/genesis.manpages b/debian/genesis.manpages
new file mode 100644
index 0000000..b86724f
--- /dev/null
+++ b/debian/genesis.manpages
@@ -0,0 +1,2 @@
+debian/genesis.1
+man/man1/genesis-convert.1
diff --git a/debian/rules b/debian/rules
index 7e0ae68..e9991dc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,111 +1,30 @@
 #!/usr/bin/make -f
-#-*- makefile -*-
-# Made with the aid of dh_make, by Craig Small
-# Sample debian/rules that uses debhelper. GNU copyright 1997 by Joey Hess.
-# Some lines taken from debmake, by Christoph Lameter.
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
 
 MAKE_VARS = -f Makefile.dist -C src MACHINE=Linux OS=BSD RANLIB=ranlib
 
-build: build-stamp
-build-stamp:
-	dh_testdir
-	QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
+%:
+	dh $@
+
+override_dh_auto_build:
 	cp src/Makefile.dist src/Makefile
 	$(MAKE) $(MAKE_VARS)
 	$(MAKE) install $(MAKE_VARS)
-	touch $@
 
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp install-stamp
+override_dh_auto_clean:
 	QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
 	$(MAKE) clean $(MAKE_VARS)
 	QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
-	# Get rid of that useless pile of shit
-	rm -Rf src/diskio/interface/netcdf/netcdf-*.*
 	rm -f `find . -name y.output` Libmake Usermake src/liblist
 	rm -f `find . -name '*.o'`
 	rm -f src/fortran/nfconfig.inc
 	rm -f bin/genesis-convert man/man1/genesis-convert.1
 	dh_clean
 
-install: install-stamp
-install-stamp: build-stamp
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs -p genesis usr/bin usr/lib/genesis usr/include/genesis usr/share/doc
-	dh_installdirs -p genesis-data usr/share/doc/genesis-data/html usr/share/genesis/Doc
-	ln -s genesis-data debian/genesis/usr/share/doc/genesis
-	# Main binary and wrapper script
-	dh_install -p genesis genesis /usr/lib/genesis/
-	dh_install -p genesis debian/scripts/genesis /usr/bin/
-	# Desktop file
-	dh_install -p genesis debian/genesis.desktop /usr/share/applications
-	# Libraries and additional executables
-	dh_install -p genesis lib/* /usr/lib/genesis
-	strip --remove-section=.comment --remove-section=.note \
-	  debian/genesis/usr/lib/genesis/code_*
+override_dh_auto_install:
 	cp bin/convert bin/genesis-convert
-	dh_install -p genesis bin/genesis-convert /usr/bin
-	strip --remove-section=.comment --remove-section=.note \
-	  debian/genesis/usr/bin/genesis-convert
 	cp man/man1/convert.1 man/man1/genesis-convert.1
-	# Include files
-	dh_install -p genesis include/* /usr/include/genesis
-	# Scripts and startup files
-	dh_install -p genesis-data Scripts /usr/share/genesis
-	dh_install -p genesis-data startup /usr/share/genesis
-	dh_install -p genesis-data src/startup/simrc /usr/share/genesis/startup
-	# Documentation
-	dh_install -p genesis-data Doc/README genesis/Doc/*.doc /usr/share/genesis/Doc
-	# /usr/share/doc documentation
-	dh_install -p genesis-data Hyperdoc/* /usr/share/doc/genesis-data/html
-	# This stuff doesn't need to be executable (generates a lintian
-	# warning)
-	find debian/genesis-data/usr/share/genesis -type f | xargs chmod a-x
-	# But this stuff does
-	-find debian/genesis-data/usr/share/genesis/Scripts -type f | \
-	  while read file; do \
-	    grep -q '^#! */' "$$file" && chmod a+x "$$file"; \
-	  done
-	touch $@
-
-binary-indep: build install
-	dh_testdir -i
-	dh_testroot -i
-	dh_installdocs -i Doc/README.*
-	dh_installchangelogs -i src/CHANGES
-	dh_link -i
-	dh_compress -i
-	dh_fixperms -i
-	dh_installdeb -i
-	dh_gencontrol -i
-	dh_md5sums -i
-	dh_builddeb -i
-
-binary-arch: build install
-	dh_testdir -a
-	dh_testroot -a
-	dh_installmenu -a
-	dh_installman -a debian/genesis.1 man/man1/genesis-convert.1
-	dh_desktop -a
-	dh_link -a
-	dh_strip -a
-	dh_compress -a
-	dh_fixperms -a
-	dh_installdeb -a
-	dh_shlibdeps -a
-	dh_gencontrol -a
-	dh_md5sums -a
-	dh_builddeb -a
-
-source diff:                                                                  
-	@echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
+	dh_install
+	dh_installchangelogs ChangeLog
 
 NAME = genesis
 VER  = $(shell dpkg-parsechangelog|grep ^Version:|cut -f2 -d' '|cut -f1 -d'+')
@@ -124,6 +43,3 @@ get-orig-source:
 	@cd $(TMPDIR)/*/* && echo "Removing from orig tarball: " && find src/diskio/interface/netcdf/netcdf-*
 	tar -C $(TMPDIR)/*/* --exclude src/diskio/interface/netcdf/netcdf-* -jcf ../$(DTAR) .
 	rm -rf $(TMPDIR)
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary

-- 
general-purpose neural simulator

More information about the debian-science-commits mailing list