[med-svn] [SCM] situs branch, master, updated. 8dd5d3a7c977a05321e83a9c747e8388dac0326c

Fri Jul 13 13:01:50 UTC 2012

The following commit has been merged in the master branch:
commit 8dd5d3a7c977a05321e83a9c747e8388dac0326c
Author: Mickaël Canévet <root at debbuild.embl.fr>
Date:   Fri Jul 13 15:01:06 2012 +0200

    Add debian directory.

diff --git a/.pc/.quilt_patches b/.pc/.quilt_patches
new file mode 100644
index 0000000..6857a8d
--- /dev/null
+++ b/.pc/.quilt_patches
@@ -0,0 +1 @@
+debian/patches
diff --git a/.pc/.quilt_series b/.pc/.quilt_series
new file mode 100644
index 0000000..c206706
--- /dev/null
+++ b/.pc/.quilt_series
@@ -0,0 +1 @@
+series
diff --git a/.pc/.version b/.pc/.version
new file mode 100644
index 0000000..0cfbf08
--- /dev/null
+++ b/.pc/.version
@@ -0,0 +1 @@
+2
diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..8480708
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,9 @@
+situs for Debian
+----------------
+
+<this file describes information about the source package, see Debian policy
+manual section 4.14. You WILL either need to modify or delete this file>
+
+
+
+
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000..8c34c53
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,5 @@
+situs (2.7.2-0.1) unstable; urgency=low
+
+  * Initial release.
+
+ -- Mickaël Canévet <canevet at embl.fr>  Fri, 13 Jul 2012 11:10:20 +0200
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..7f8f011
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+7
diff --git a/debian/control b/debian/control
new file mode 100644
index 0000000..17cdf7a
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,19 @@
+Source: situs
+Section: science
+Priority: extra
+Maintainer: Mickaël Canévet <canevet at embl.fr>
+Build-Depends: debhelper (>= 7.0.50~), fftw-dev
+Standards-Version: 3.9.1
+Homepage: http://situs.biomachina.org/
+#Vcs-Git: git://git.debian.org/collab-maint/situs.git
+#Vcs-Browser: http://git.debian.org/?p=collab-maint/situs.git;a=summary
+
+Package: situs
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Modeleling of atomic resolution structures into low-resolution density maps
+ Situs is an award-winning program package for the modeling of atomic resolution
+ structures into low-resolution density maps e.g. from electron microscopy,
+ tomography, or small angle X-ray scattering. The software supports both
+ rigid-body and flexible docking using a variety of fitting strategies. Situs is
+ developed by Willy Wriggers and collaborators: biomachina.org.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 0000000..2af7472
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,29 @@
+This work was packaged for Debian by:
+
+    Mickaël Canévet <canevet at embl.fr> on Fri, 13 Jul 2012 11:10:20 +0200
+
+It was downloaded from:
+
+    http://situs.biomachina.org/
+
+Upstream Author(s):
+
+    Willy Wriggers and collaborators
+
+Copyright:
+
+    The software is copyrighted, (c) 1998-2012 under the terms of the legal statement in the distribution.
+    Willy Wriggers
+
+License:
+
+    GNU GPL.
+
+The Debian packaging is:
+
+    Copyright (C) 2012 Mickaël Canévet <canevet at embl.fr>
+
+    GPU GPL
+
+and is licensed under the GPL version 3,
+see "/usr/share/common-licenses/GPL-3".
diff --git a/debian/docs b/debian/docs
new file mode 100644
index 0000000..e69de29
diff --git a/debian/patches/Makefile.patch b/debian/patches/Makefile.patch
new file mode 100644
index 0000000..54a6a87
--- /dev/null
+++ b/debian/patches/Makefile.patch
@@ -0,0 +1,80 @@
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -3,7 +3,7 @@
+ #####
+ 
+ SRC_DIR	= .
+-BIN_DIR = ../bin
++BIN_DIR = $(DESTDIR)/usr/bin
+ SHELL = /bin/sh
+ 
+ #####
+@@ -17,7 +17,7 @@
+ # any extra compiler and linker options (see the compiler man page)
+ #####
+ 
+-CFLAGS     = -O3 -w -I../fftw
++CFLAGS     = -O3 -w
+ XFLAGS     = -O3 -w 
+ LFLAGS     = -lm 
+ 
+@@ -53,15 +53,7 @@
+ 
+ SITUS_EXEC = $(SITUS_C:.c=) $(SITUS_CPP:.cpp=)
+ 
+-#####
+-# FFTW files
+-#####
+-
+-FFTWCFILES = $(wildcard ../fftw/*.c)
+-FFTWOFILES = $(patsubst %.c,%.o,$(notdir $(FFTWCFILES)))
+-
+ vpath %.c $(SRC_DIR)
+-vpath %.c ../fftw
+ 
+ AR = ar
+ ARFLAGS = cru
+@@ -74,7 +66,7 @@
+ CD = cd
+ RM = rm -f
+ MV = mv
+-OBJ_FILES = $(wildcard *.o) libfftw.a
++OBJ_FILES = $(wildcard *.o)
+ 
+ #####
+ # main makefile rules
+@@ -129,8 +121,8 @@
+ collage:	collage.o lib_std.o lib_pio.o lib_vwk.o lib_vec.o lib_rnd.o lib_pwk.o lib_pow.o lib_err.o lib_eul.o lib_tim.o lib_smp.o lib_vio.o 
+ 	$(CC) collage.o lib_std.o lib_pio.o lib_vio.o lib_vwk.o lib_vec.o lib_rnd.o lib_pwk.o lib_pow.o lib_err.o lib_eul.o lib_tim.o lib_smp.o $(LFLAGS) $(SMPLIB) -o collage
+ 
+-colores:	colores.o lib_std.o lib_pio.o lib_vwk.o lib_vec.o lib_rnd.o lib_pwk.o lib_pow.o lib_err.o lib_eul.o lib_tim.o lib_smp.o lib_vio.o libfftw.a
+-	$(CC) colores.o lib_std.o lib_pio.o lib_vio.o lib_vwk.o lib_vec.o lib_rnd.o lib_pwk.o lib_pow.o lib_err.o lib_eul.o lib_tim.o lib_smp.o libfftw.a $(LFLAGS) $(SMPLIB) $(OMPLIB) -o colores
++colores:	colores.o lib_std.o lib_pio.o lib_vwk.o lib_vec.o lib_rnd.o lib_pwk.o lib_pow.o lib_err.o lib_eul.o lib_tim.o lib_smp.o lib_vio.o
++	$(CC) colores.o lib_std.o lib_pio.o lib_vio.o lib_vwk.o lib_vec.o lib_rnd.o lib_pwk.o lib_pow.o lib_err.o lib_eul.o lib_tim.o lib_smp.o $(LFLAGS) $(SMPLIB) $(OMPLIB) -lfftw -lrfftw -o colores
+ 
+ matchpt:	matchpt.o lib_mpt.o 
+ 	$(CXX) $(CFLAGS) -c lib_err.c
+@@ -161,20 +153,16 @@
+ 	$(CXX) volfltr.o lib_sba.o lib_svt.o lib_vio.o lib_vwk.o lib_vec.o lib_std.o lib_err.o $(LFLAGS) $(OMPLIB) $(SMPLIB) -o volfltr
+ 	$(RM) lib_vio.o lib_vwk.o lib_vec.o lib_std.o lib_err.o 
+ 
+-libfftw.a:	$(FFTWOFILES) 
+-	$(AR) $(ARFLAGS) libfftw.a $(FFTWOFILES)
+-	$(RANLIB) libfftw.a
+-
+ install:
+-	$(MV) $(SITUS_EXEC) $(BIN_DIR)
++	mkdir -p $(BIN_DIR)
++	install $(SITUS_EXEC) $(BIN_DIR)
+ 
+ clean:
+ 	$(RM) $(OBJ_FILES)
+-	$(MV) $(SITUS_EXEC) $(BIN_DIR)
++	$(RM) $(SITUS_EXEC)
+ 
+ veryclean:
+ 	$(RM) $(OBJ_FILES)	
+-	$(CD) $(BIN_DIR) && $(RM) $(SITUS_EXEC)
+ 
+ .c.o:
+ 	$(CC) $(CFLAGS) $(SMP) $(OMP) -c $(SRC_DIR)/$<
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..5b1c0a4
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+Makefile.patch
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 0000000..04e84a5
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,13 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+# This file was originally written by Joey Hess and Craig Small.
+# As a special exception, when this file is copied by dh-make into a
+# dh-make output file, you may use that output file without restriction.
+# This special exception was added by Craig Small in version 0.37 of dh-make.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+%:
+	dh $@ --sourcedirectory=src
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)

-- 
Packaging of situs in Debian

