[med-svn] [ctsim] 03/05: Use dh in d/rules, fix upstream Makefile issues (finally by using dh-autoreconf)

Andreas Tille tille at debian.org
Mon Aug 11 12:59:39 UTC 2014


This is an automated email from the git hooks/post-receive script.

tille pushed a commit to branch master
in repository ctsim.

commit 265796276aa6324555fdabe0c68989fd67f655d5
Author: Andreas Tille <tille at debian.org>
Date:   Mon Aug 11 14:40:42 2014 +0200

    Use dh in d/rules, fix upstream Makefile issues (finally by using dh-autoreconf)
---
 debian/changelog                                   |   2 +
 debian/control                                     |   3 +-
 debian/ctsim-doc.docs                              |   2 +
 debian/ctsim-doc.examples                          |   3 +
 debian/ctsim-doc.links                             |   2 +
 debian/ctsim-help.install                          |   1 +
 debian/ctsim.install                               |   3 +
 debian/ctsim.manpages                              |   1 +
 debian/patches/cope_with_existing_makefile.patch   | 661 +++++++++++++++++++++
 .../prevent_symlinking_on_build_host_dir.patch     |  38 ++
 debian/patches/series                              |   2 +
 debian/rules                                       | 121 +---
 12 files changed, 729 insertions(+), 110 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index accfeeb..68a7ca0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,8 @@ ctsim (5.2.0-2) UNRELEASED; urgency=medium
      - Priority: optional
      - cme fix dpkg-control
   * debian/copyright: DEP5
+  * debian/rules: Use dh in d/rules
+  * fix upstream Makefile issues (finally by using dh-autoreconf)
 
  -- Andreas Tille <tille at debian.org>  Mon, 11 Aug 2014 10:05:01 +0200
 
diff --git a/debian/control b/debian/control
index 38e379b..6171b50 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,8 @@ Build-Depends: debhelper (>= 9),
                libpng12-dev,
                libglib2.0-dev,
                libgtk2.0-dev,
-               autotools-dev
+               autotools-dev,
+               dh-autoreconf
 Standards-Version: 3.9.5
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-med/ctsim.git
 Vcs-Git: git://anonscm.debian.org/debian-med/ctsim.git
diff --git a/debian/ctsim-doc.docs b/debian/ctsim-doc.docs
new file mode 100644
index 0000000..719925b
--- /dev/null
+++ b/debian/ctsim-doc.docs
@@ -0,0 +1,2 @@
+docs/html
+docs/ctsim.pdf*
diff --git a/debian/ctsim-doc.examples b/debian/ctsim-doc.examples
new file mode 100644
index 0000000..255e586
--- /dev/null
+++ b/debian/ctsim-doc.examples
@@ -0,0 +1,3 @@
+html/simulate.html
+tools/sample-ctsim.sh
+helical/sample-helical.sh
diff --git a/debian/ctsim-doc.links b/debian/ctsim-doc.links
new file mode 100644
index 0000000..6e53aa6
--- /dev/null
+++ b/debian/ctsim-doc.links
@@ -0,0 +1,2 @@
+usr/share/doc/ctsim-doc/html/ctsim_contents.html usr/share/doc/ctsim-doc/html/index.html
+
diff --git a/debian/ctsim-help.install b/debian/ctsim-help.install
new file mode 100644
index 0000000..72673f6
--- /dev/null
+++ b/debian/ctsim-help.install
@@ -0,0 +1 @@
+docs/ctsim.htb	usr/share/ctsim
diff --git a/debian/ctsim.install b/debian/ctsim.install
new file mode 100644
index 0000000..1a20c94
--- /dev/null
+++ b/debian/ctsim.install
@@ -0,0 +1,3 @@
+usr/bin
+debian/ctsim.xpm	usr/share/pixmaps
+debian/ctsim.desktop	usr/share/applications
diff --git a/debian/ctsim.manpages b/debian/ctsim.manpages
new file mode 100644
index 0000000..bf519d7
--- /dev/null
+++ b/debian/ctsim.manpages
@@ -0,0 +1 @@
+man/*.1
diff --git a/debian/patches/cope_with_existing_makefile.patch b/debian/patches/cope_with_existing_makefile.patch
new file mode 100644
index 0000000..b59c632
--- /dev/null
+++ b/debian/patches/cope_with_existing_makefile.patch
@@ -0,0 +1,661 @@
+Author: Andreas Tille <tille at debian.org>
+Last-Update: Mon, 11 Aug 2014 10:05:01 +0200
+Description: Upstream tarball contains autogenerated Makefile which
+ breaks dh_auto_clean target --> remove Makefile
+
+--- a/Makefile
++++ /dev/null
+@@ -1,653 +0,0 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+-# Makefile.  Generated from Makefile.in by configure.
+-
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
+-# This Makefile.in is free software; the Free Software Foundation
+-# gives unlimited permission to copy and/or distribute it,
+-# with or without modifications, as long as this notice is preserved.
+-
+-# This program is distributed in the hope that it will be useful,
+-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+-# PARTICULAR PURPOSE.
+-
+-
+-srcdir = .
+-top_srcdir = .
+-
+-pkgdatadir = $(datadir)/ctsim
+-pkglibdir = $(libdir)/ctsim
+-pkgincludedir = $(includedir)/ctsim
+-top_builddir = .
+-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = /usr/bin/install -c
+-install_sh_DATA = $(install_sh) -c -m 644
+-install_sh_PROGRAM = $(install_sh) -c
+-install_sh_SCRIPT = $(install_sh) -c
+-INSTALL_HEADER = $(INSTALL_DATA)
+-transform = $(program_transform_name)
+-NORMAL_INSTALL = :
+-PRE_INSTALL = :
+-POST_INSTALL = :
+-NORMAL_UNINSTALL = :
+-PRE_UNINSTALL = :
+-POST_UNINSTALL = :
+-build_triplet = x86_64-unknown-linux-gnu
+-host_triplet = x86_64-unknown-linux-gnu
+-DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
+-	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
+-	$(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
+-	TODO config.guess config.sub depcomp install-sh missing \
+-	mkinstalldirs
+-subdir = .
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+-	$(ACLOCAL_M4)
+-am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
+- configure.lineno configure.status.lineno
+-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+-CONFIG_HEADER = config.h
+-CONFIG_CLEAN_FILES =
+-SOURCES =
+-DIST_SOURCES =
+-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+-	html-recursive info-recursive install-data-recursive \
+-	install-exec-recursive install-info-recursive \
+-	install-recursive installcheck-recursive installdirs-recursive \
+-	pdf-recursive ps-recursive uninstall-info-recursive \
+-	uninstall-recursive
+-ETAGS = etags
+-CTAGS = ctags
+-DIST_SUBDIRS = man libctsupport libctsim html cgi-bin include getopt \
+-	libctgraphics src tools helical
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-distdir = $(PACKAGE)-$(VERSION)
+-top_distdir = $(distdir)
+-am__remove_distdir = \
+-  { test ! -d $(distdir) \
+-    || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
+-         && rm -fr $(distdir); }; }
+-DIST_ARCHIVES = $(distdir).tar.gz
+-GZIP_ENV = --best
+-distuninstallcheck_listfiles = find . -type f -print
+-distcleancheck_listfiles = find . -type f -print
+-ACLOCAL = ${SHELL} /home/kevin/pub/src/ctsim/missing --run aclocal-1.9
+-AMDEP_FALSE = #
+-AMDEP_TRUE = 
+-AMTAR = ${SHELL} /home/kevin/pub/src/ctsim/missing --run tar
+-AUTOCONF = ${SHELL} /home/kevin/pub/src/ctsim/missing --run autoconf
+-AUTOHEADER = ${SHELL} /home/kevin/pub/src/ctsim/missing --run autoheader
+-AUTOMAKE = ${SHELL} /home/kevin/pub/src/ctsim/missing --run automake-1.9
+-AWK = mawk
+-CC = gcc
+-CCDEPMODE = depmode=gcc3
+-CFLAGS =    -O2 -DNDEBUG -fomit-frame-pointer -Wall -I/usr/include/ctn -I../include -I/usr/lib/wx/include/gtk2-unicode-release-2.8 -I/usr/include/wx-2.8 -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -D__WXGTK__ -pthread
+-CPP = gcc -E
+-CPPFLAGS =  -DDATADIR="\"${datarootdir}\""
+-CXX = g++
+-CXXDEPMODE = depmode=gcc3
+-CXXFLAGS =    -O2 -DNDEBUG -fomit-frame-pointer -Wall -I/usr/include/ctn -I../include -I/usr/lib/wx/include/gtk2-unicode-release-2.8 -I/usr/include/wx-2.8 -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -D__WXGTK__ -pthread
+-CYGPATH_W = echo
+-DEBUG_FALSE = 
+-DEBUG_TRUE = #
+-DEFS = -DHAVE_CONFIG_H
+-DEPDIR = .deps
+-ECHO_C = 
+-ECHO_N = -n
+-ECHO_T = 
+-EGREP = /bin/grep -E
+-EXEEXT = 
+-GREP = /bin/grep
+-HAVE_SGP_FALSE = #
+-HAVE_SGP_TRUE = 
+-HAVE_WXWINDOWS_FALSE = #
+-HAVE_WXWINDOWS_TRUE = 
+-INCLUDED_GETOPT_LONG_FALSE = #
+-INCLUDED_GETOPT_LONG_TRUE = 
+-INSTALL_DATA = ${INSTALL} -m 644
+-INSTALL_PROGRAM = ${INSTALL}
+-INSTALL_SCRIPT = ${INSTALL}
+-INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s
+-LDFLAGS =  -L/usr/lib/ctn -L/usr/local/lib -L../libctgraphics -L/usr/X11R6/lib -L/usr/X11R6/lib64 -L../libctsupport -L../libctsim
+-LIBOBJS = 
+-LIBS = -lm 
+-LTLIBOBJS = 
+-MAINT = #
+-MAINTAINER_MODE_FALSE = 
+-MAINTAINER_MODE_TRUE = #
+-MAKEINFO = ${SHELL} /home/kevin/pub/src/ctsim/missing --run makeinfo
+-NO_X_FALSE = 
+-NO_X_TRUE = #
+-OBJEXT = o
+-PACKAGE = ctsim
+-PACKAGE_BUGREPORT = 
+-PACKAGE_NAME = 
+-PACKAGE_STRING = 
+-PACKAGE_TARNAME = 
+-PACKAGE_URL = 
+-PACKAGE_VERSION = 
+-PATH_SEPARATOR = :
+-RANLIB = ranlib
+-SET_MAKE = 
+-SHELL = /bin/sh
+-STRIP = 
+-USE_HTML_FALSE = #
+-USE_HTML_TRUE = 
+-USE_LAM_FALSE = 
+-USE_LAM_TRUE = #
+-VERSION = 5.0.0
+-XMKMF = 
+-X_BASIC_LIBS = 
+-X_CFLAGS = 
+-X_EXTRA_LIBS = 
+-X_LIBS = 
+-X_PRE_LIBS =  -lSM -lICE
+-X_TOOLKIT_LIBS = 
+-ac_ct_CC = gcc
+-ac_ct_CXX = g++
+-am__fastdepCC_FALSE = #
+-am__fastdepCC_TRUE = 
+-am__fastdepCXX_FALSE = #
+-am__fastdepCXX_TRUE = 
+-am__include = include
+-am__leading_dot = .
+-am__quote = 
+-am__tar = ${AMTAR} chof - "$$tardir"
+-am__untar = ${AMTAR} xf -
+-bindir = ${exec_prefix}/bin
+-build = x86_64-unknown-linux-gnu
+-build_alias = 
+-build_cpu = x86_64
+-build_os = linux-gnu
+-build_vendor = unknown
+-cgibindir = 
+-cgibinurl = 
+-cgiprograms = 
+-ctlibs =  -lreadline -lncurses -lctsim  -lreadline -lncurses -lctgraphics   -lGL -lGLU -pthread   -lwx_gtk2u_richtext-2.8 -lwx_gtk2u_aui-2.8 -lwx_gtk2u_xrc-2.8 -lwx_gtk2u_qa-2.8 -lwx_gtk2u_html-2.8 -lwx_gtk2u_adv-2.8 -lwx_gtk2u_core-2.8 -lwx_baseu_xml-2.8 -lwx_baseu_net-2.8 -lwx_baseu-2.8  -lwx_gtk2u_gl-2.8    -lctsupport  -lpng -lz -lfftw3 -lctn
+-datadir = ${datarootdir}
+-datarootdir = ${prefix}/share
+-docdir = ${datarootdir}/doc/${PACKAGE}
+-dvidir = ${docdir}
+-exec_prefix = ${prefix}
+-host = x86_64-unknown-linux-gnu
+-host_alias = 
+-host_cpu = x86_64
+-host_os = linux-gnu
+-host_vendor = unknown
+-htmldata = simulate.html
+-htmldir = ${docdir}
+-includedir = ${prefix}/include
+-infodir = ${datarootdir}/info
+-install_sh = /home/kevin/pub/src/ctsim/install-sh
+-lamdefs = 
+-lamdir = 
+-lamprograms = 
+-libdir = ${exec_prefix}/lib
+-libexecdir = ${exec_prefix}/libexec
+-localedir = ${datarootdir}/locale
+-localstatedir = ${prefix}/var
+-mandir = ${datarootdir}/man
+-mkdir_p = mkdir -p --
+-mpienable = 
+-my_includes =  -I../include -I.. -I/usr/local/include -I/usr/X11R6/include
+-oldincludedir = /usr/include
+-pdfdir = ${docdir}
+-prefix = /usr/local
+-program_transform_name = s,x,x,
+-psdir = ${docdir}
+-sbindir = ${exec_prefix}/sbin
+-sharedstatedir = ${prefix}/com
+-sysconfdir = ${prefix}/etc
+-target_alias = 
+-webdatadir = 
+-webdataurl = 
+-webenabled = 
+-wxcflags = -I/usr/lib/wx/include/gtk2-unicode-release-2.8 -I/usr/include/wx-2.8 -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -D__WXGTK__ -pthread
+-wxconfig = /usr/bin/wx-config
+-wxlibs = 
+-#EXTRA_DIRS1 = 
+-EXTRA_DIRS1 = getopt
+-#EXTRA_DIRS2 = 
+-EXTRA_DIRS2 = libctgraphics
+-#EXTRA_DIRS3 = 
+-EXTRA_DIRS3 = src
+-SUBDIRS = man libctsupport libctsim  html cgi-bin include $(EXTRA_DIRS1) $(EXTRA_DIRS2) $(EXTRA_DIRS3) tools helical
+-EXTRA_DIST = acsite.m4 make.bat msvc/ctsim.dsw msvc/ctsimtext/ctsimtext.dsp msvc/libctsim/libctsim.dsp msvc/ctsim/ctsim.dsp
+-CLEANFILES = docs/html/\* config.log config.status configure.in config.h stamp-h1
+-all: config.h
+-	$(MAKE) $(AM_MAKEFLAGS) all-recursive
+-
+-.SUFFIXES:
+-am--refresh:
+-	@:
+-$(srcdir)/Makefile.in: # $(srcdir)/Makefile.am  $(am__configure_deps)
+-	@for dep in $?; do \
+-	  case '$(am__configure_deps)' in \
+-	    *$$dep*) \
+-	      echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \
+-	      cd $(srcdir) && $(AUTOMAKE) --gnu  \
+-		&& exit 0; \
+-	      exit 1;; \
+-	  esac; \
+-	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  Makefile'; \
+-	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --gnu  Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+-	@case '$?' in \
+-	  *config.status*) \
+-	    echo ' $(SHELL) ./config.status'; \
+-	    $(SHELL) ./config.status;; \
+-	  *) \
+-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
+-	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
+-	esac;
+-
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+-	$(SHELL) ./config.status --recheck
+-
+-$(top_srcdir)/configure: # $(am__configure_deps)
+-	cd $(srcdir) && $(AUTOCONF)
+-$(ACLOCAL_M4): # $(am__aclocal_m4_deps)
+-	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+-
+-config.h: stamp-h1
+-	@if test ! -f $@; then \
+-	  rm -f stamp-h1; \
+-	  $(MAKE) stamp-h1; \
+-	else :; fi
+-
+-stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
+-	@rm -f stamp-h1
+-	cd $(top_builddir) && $(SHELL) ./config.status config.h
+-$(srcdir)/config.h.in: # $(am__configure_deps) 
+-	cd $(top_srcdir) && $(AUTOHEADER)
+-	rm -f stamp-h1
+-	touch $@
+-
+-distclean-hdr:
+-	-rm -f config.h stamp-h1
+-uninstall-info-am:
+-
+-# This directory's subdirectories are mostly independent; you can cd
+-# into them and run `make' without going through this Makefile.
+-# To change the values of `make' variables: instead of editing Makefiles,
+-# (1) if the variable is set in `config.status', edit `config.status'
+-#     (which will cause the Makefiles to be regenerated when you run `make');
+-# (2) otherwise, pass the desired values on the `make' command line.
+-$(RECURSIVE_TARGETS):
+-	@failcom='exit 1'; \
+-	for f in x $$MAKEFLAGS; do \
+-	  case $$f in \
+-	    *=* | --[!k]*);; \
+-	    *k*) failcom='fail=yes';; \
+-	  esac; \
+-	done; \
+-	dot_seen=no; \
+-	target=`echo $@ | sed s/-recursive//`; \
+-	list='$(SUBDIRS)'; for subdir in $$list; do \
+-	  echo "Making $$target in $$subdir"; \
+-	  if test "$$subdir" = "."; then \
+-	    dot_seen=yes; \
+-	    local_target="$$target-am"; \
+-	  else \
+-	    local_target="$$target"; \
+-	  fi; \
+-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	  || eval $$failcom; \
+-	done; \
+-	if test "$$dot_seen" = "no"; then \
+-	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+-	fi; test -z "$$fail"
+-
+-mostlyclean-recursive clean-recursive distclean-recursive \
+-maintainer-clean-recursive:
+-	@failcom='exit 1'; \
+-	for f in x $$MAKEFLAGS; do \
+-	  case $$f in \
+-	    *=* | --[!k]*);; \
+-	    *k*) failcom='fail=yes';; \
+-	  esac; \
+-	done; \
+-	dot_seen=no; \
+-	case "$@" in \
+-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+-	  *) list='$(SUBDIRS)' ;; \
+-	esac; \
+-	rev=''; for subdir in $$list; do \
+-	  if test "$$subdir" = "."; then :; else \
+-	    rev="$$subdir $$rev"; \
+-	  fi; \
+-	done; \
+-	rev="$$rev ."; \
+-	target=`echo $@ | sed s/-recursive//`; \
+-	for subdir in $$rev; do \
+-	  echo "Making $$target in $$subdir"; \
+-	  if test "$$subdir" = "."; then \
+-	    local_target="$$target-am"; \
+-	  else \
+-	    local_target="$$target"; \
+-	  fi; \
+-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	  || eval $$failcom; \
+-	done && test -z "$$fail"
+-tags-recursive:
+-	list='$(SUBDIRS)'; for subdir in $$list; do \
+-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+-	done
+-ctags-recursive:
+-	list='$(SUBDIRS)'; for subdir in $$list; do \
+-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+-	done
+-
+-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+-	unique=`for i in $$list; do \
+-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+-	  done | \
+-	  $(AWK) '    { files[$$0] = 1; } \
+-	       END { for (i in files) print i; }'`; \
+-	mkid -fID $$unique
+-tags: TAGS
+-
+-TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
+-		$(TAGS_FILES) $(LISP)
+-	tags=; \
+-	here=`pwd`; \
+-	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+-	  include_option=--etags-include; \
+-	  empty_fix=.; \
+-	else \
+-	  include_option=--include; \
+-	  empty_fix=; \
+-	fi; \
+-	list='$(SUBDIRS)'; for subdir in $$list; do \
+-	  if test "$$subdir" = .; then :; else \
+-	    test ! -f $$subdir/TAGS || \
+-	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+-	  fi; \
+-	done; \
+-	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
+-	unique=`for i in $$list; do \
+-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+-	  done | \
+-	  $(AWK) '    { files[$$0] = 1; } \
+-	       END { for (i in files) print i; }'`; \
+-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+-	  test -n "$$unique" || unique=$$empty_fix; \
+-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+-	    $$tags $$unique; \
+-	fi
+-ctags: CTAGS
+-CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
+-		$(TAGS_FILES) $(LISP)
+-	tags=; \
+-	here=`pwd`; \
+-	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
+-	unique=`for i in $$list; do \
+-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+-	  done | \
+-	  $(AWK) '    { files[$$0] = 1; } \
+-	       END { for (i in files) print i; }'`; \
+-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+-	     $$tags $$unique
+-
+-GTAGS:
+-	here=`$(am__cd) $(top_builddir) && pwd` \
+-	  && cd $(top_srcdir) \
+-	  && gtags -i $(GTAGS_ARGS) $$here
+-
+-distclean-tags:
+-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+-
+-distdir: $(DISTFILES)
+-	$(am__remove_distdir)
+-	mkdir $(distdir)
+-	$(mkdir_p) $(distdir)/cgi-bin $(distdir)/helical $(distdir)/html $(distdir)/msvc $(distdir)/msvc/ctsim $(distdir)/msvc/ctsimtext $(distdir)/msvc/libctsim $(distdir)/tools
+-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-	list='$(DISTFILES)'; for file in $$list; do \
+-	  case $$file in \
+-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-	  esac; \
+-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
+-	  else \
+-	    dir=''; \
+-	  fi; \
+-	  if test -d $$d/$$file; then \
+-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+-	    fi; \
+-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+-	  else \
+-	    test -f $(distdir)/$$file \
+-	    || cp -p $$d/$$file $(distdir)/$$file \
+-	    || exit 1; \
+-	  fi; \
+-	done
+-	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+-	  if test "$$subdir" = .; then :; else \
+-	    test -d "$(distdir)/$$subdir" \
+-	    || $(mkdir_p) "$(distdir)/$$subdir" \
+-	    || exit 1; \
+-	    distdir=`$(am__cd) $(distdir) && pwd`; \
+-	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+-	    (cd $$subdir && \
+-	      $(MAKE) $(AM_MAKEFLAGS) \
+-	        top_distdir="$$top_distdir" \
+-	        distdir="$$distdir/$$subdir" \
+-	        distdir) \
+-	      || exit 1; \
+-	  fi; \
+-	done
+-	-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
+-	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
+-	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
+-	  ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
+-	|| chmod -R a+r $(distdir)
+-dist-gzip: distdir
+-	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+-	$(am__remove_distdir)
+-
+-dist-bzip2: distdir
+-	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
+-	$(am__remove_distdir)
+-
+-dist-tarZ: distdir
+-	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
+-	$(am__remove_distdir)
+-
+-dist-shar: distdir
+-	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
+-	$(am__remove_distdir)
+-
+-dist-zip: distdir
+-	-rm -f $(distdir).zip
+-	zip -rq $(distdir).zip $(distdir)
+-	$(am__remove_distdir)
+-
+-dist dist-all: distdir
+-	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+-	$(am__remove_distdir)
+-
+-# This target untars the dist file and tries a VPATH configuration.  Then
+-# it guarantees that the distribution is self-contained by making another
+-# tarfile.
+-distcheck: dist
+-	case '$(DIST_ARCHIVES)' in \
+-	*.tar.gz*) \
+-	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
+-	*.tar.bz2*) \
+-	  bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
+-	*.tar.Z*) \
+-	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
+-	*.shar.gz*) \
+-	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
+-	*.zip*) \
+-	  unzip $(distdir).zip ;;\
+-	esac
+-	chmod -R a-w $(distdir); chmod a+w $(distdir)
+-	mkdir $(distdir)/_build
+-	mkdir $(distdir)/_inst
+-	chmod a-w $(distdir)
+-	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
+-	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
+-	  && cd $(distdir)/_build \
+-	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
+-	    $(DISTCHECK_CONFIGURE_FLAGS) \
+-	  && $(MAKE) $(AM_MAKEFLAGS) \
+-	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
+-	  && $(MAKE) $(AM_MAKEFLAGS) check \
+-	  && $(MAKE) $(AM_MAKEFLAGS) install \
+-	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
+-	  && $(MAKE) $(AM_MAKEFLAGS) uninstall \
+-	  && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
+-	        distuninstallcheck \
+-	  && chmod -R a-w "$$dc_install_base" \
+-	  && ({ \
+-	       (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
+-	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
+-	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
+-	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
+-	            distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
+-	      } || { rm -rf "$$dc_destdir"; exit 1; }) \
+-	  && rm -rf "$$dc_destdir" \
+-	  && $(MAKE) $(AM_MAKEFLAGS) dist \
+-	  && rm -rf $(DIST_ARCHIVES) \
+-	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
+-	$(am__remove_distdir)
+-	@(echo "$(distdir) archives ready for distribution: "; \
+-	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
+-	  sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}'
+-distuninstallcheck:
+-	@cd $(distuninstallcheck_dir) \
+-	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
+-	   || { echo "ERROR: files left after uninstall:" ; \
+-	        if test -n "$(DESTDIR)"; then \
+-	          echo "  (check DESTDIR support)"; \
+-	        fi ; \
+-	        $(distuninstallcheck_listfiles) ; \
+-	        exit 1; } >&2
+-distcleancheck: distclean
+-	@if test '$(srcdir)' = . ; then \
+-	  echo "ERROR: distcleancheck can only run from a VPATH build" ; \
+-	  exit 1 ; \
+-	fi
+-	@test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
+-	  || { echo "ERROR: files left in build directory after distclean:" ; \
+-	       $(distcleancheck_listfiles) ; \
+-	       exit 1; } >&2
+-check-am: all-am
+-check: check-recursive
+-all-am: Makefile config.h
+-installdirs: installdirs-recursive
+-installdirs-am:
+-install: install-recursive
+-install-exec: install-exec-recursive
+-install-data: install-data-recursive
+-uninstall: uninstall-recursive
+-
+-install-am: all-am
+-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+-
+-installcheck: installcheck-recursive
+-install-strip:
+-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+-	  `test -z '$(STRIP)' || \
+-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+-mostlyclean-generic:
+-
+-clean-generic:
+-	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+-
+-distclean-generic:
+-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+-
+-maintainer-clean-generic:
+-	@echo "This command is intended for maintainers to use"
+-	@echo "it deletes files that may require special tools to rebuild."
+-clean: clean-recursive
+-
+-clean-am: clean-generic clean-local mostlyclean-am
+-
+-distclean: distclean-recursive
+-	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
+-	-rm -f Makefile
+-distclean-am: clean-am distclean-generic distclean-hdr distclean-tags
+-
+-dvi: dvi-recursive
+-
+-dvi-am:
+-
+-html: html-recursive
+-
+-info: info-recursive
+-
+-info-am:
+-
+-install-data-am:
+-
+-install-exec-am:
+-
+-install-info: install-info-recursive
+-
+-install-man:
+-
+-installcheck-am:
+-
+-maintainer-clean: maintainer-clean-recursive
+-	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
+-	-rm -rf $(top_srcdir)/autom4te.cache
+-	-rm -f Makefile
+-maintainer-clean-am: distclean-am maintainer-clean-generic
+-
+-mostlyclean: mostlyclean-recursive
+-
+-mostlyclean-am: mostlyclean-generic
+-
+-pdf: pdf-recursive
+-
+-pdf-am:
+-
+-ps: ps-recursive
+-
+-ps-am:
+-
+-uninstall-am: uninstall-info-am
+-
+-uninstall-info: uninstall-info-recursive
+-
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \
+-	check-am clean clean-generic clean-local clean-recursive ctags \
+-	ctags-recursive dist dist-all dist-bzip2 dist-gzip dist-shar \
+-	dist-tarZ dist-zip distcheck distclean distclean-generic \
+-	distclean-hdr distclean-recursive distclean-tags \
+-	distcleancheck distdir distuninstallcheck dvi dvi-am html \
+-	html-am info info-am install install-am install-data \
+-	install-data-am install-exec install-exec-am install-info \
+-	install-info-am install-man install-strip installcheck \
+-	installcheck-am installdirs installdirs-am maintainer-clean \
+-	maintainer-clean-generic maintainer-clean-recursive \
+-	mostlyclean mostlyclean-generic mostlyclean-recursive pdf \
+-	pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
+-	uninstall-info-am
+-
+-clean-local:
+-	rm -rf docs/html
+-
+-#install-data-hook:
+-#	test -d $(datadir) || mkdir -p $(datadir) && chmod 0755 $(datadir)
+-#	install -g root -o root -m 0644 docs/ctsim.htb $(datadir)
+-# Tell versions [3.59,3.63) of GNU make to not export all variables.
+-# Otherwise a system limit (for SysV at least) may be exceeded.
+-.NOEXPORT:
diff --git a/debian/patches/prevent_symlinking_on_build_host_dir.patch b/debian/patches/prevent_symlinking_on_build_host_dir.patch
new file mode 100644
index 0000000..3fa8eb9
--- /dev/null
+++ b/debian/patches/prevent_symlinking_on_build_host_dir.patch
@@ -0,0 +1,38 @@
+Author: Andreas Tille <tille at debian.org>
+Last-Update: Mon, 11 Aug 2014 10:05:01 +0200
+Description: Upstream install target tries to do some symlinking
+ on the Build host ...
+
+--- a/tools/Makefile.am
++++ b/tools/Makefile.am
+@@ -9,18 +9,18 @@ SOURCE_DEPEND=../include/ct.h ../libctsi
+ endif
+ 
+ install-exec-hook:
+-	ln -sf ctsimtext $(bindir)/if1
+-	ln -sf ctsimtext $(bindir)/if2
+-	ln -sf ctsimtext $(bindir)/ifexport
+-	ln -sf ctsimtext $(bindir)/ifinfo
+-	ln -sf ctsimtext $(bindir)/phm2if
+-	ln -sf ctsimtext $(bindir)/phm2pj
+-	ln -sf ctsimtext $(bindir)/phm2helix
+-	ln -sf ctsimtext $(bindir)/pj2if
+-	ln -sf ctsimtext $(bindir)/pjinfo
+-	ln -sf ctsimtext $(bindir)/pjrec
+-	ln -sf ctsimtext $(bindir)/pjHinterp
+-	ln -sf ctsimtext $(bindir)/linogram
++	ln -sf ctsimtext $(DESTDIR)$(bindir)/if1
++	ln -sf ctsimtext $(DESTDIR)$(bindir)/if2
++	ln -sf ctsimtext $(DESTDIR)$(bindir)/ifexport
++	ln -sf ctsimtext $(DESTDIR)$(bindir)/ifinfo
++	ln -sf ctsimtext $(DESTDIR)$(bindir)/phm2if
++	ln -sf ctsimtext $(DESTDIR)$(bindir)/phm2pj
++	ln -sf ctsimtext $(DESTDIR)$(bindir)/phm2helix
++	ln -sf ctsimtext $(DESTDIR)$(bindir)/pj2if
++	ln -sf ctsimtext $(DESTDIR)$(bindir)/pjinfo
++	ln -sf ctsimtext $(DESTDIR)$(bindir)/pjrec
++	ln -sf ctsimtext $(DESTDIR)$(bindir)/pjHinterp
++	ln -sf ctsimtext $(DESTDIR)$(bindir)/linogram
+ 
+ ctsimtext_SOURCES = ctsimtext.cpp if1.cpp if2.cpp ifinfo.cpp ifexport.cpp phm2if.cpp phm2pj.cpp pj2if.cpp pjinfo.cpp pjrec.cpp nographics.cpp phm2helix.cpp pjHinterp.cpp linogram.cpp
+ ctsimtext_LDADD=@ctlibs@
diff --git a/debian/patches/series b/debian/patches/series
index 3c72a1c..8046860 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,3 @@
 wx3.0-compat.patch
+cope_with_existing_makefile.patch
+prevent_symlinking_on_build_host_dir.patch
diff --git a/debian/rules b/debian/rules
index 827e148..d0c6bb9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,119 +1,22 @@
 #!/usr/bin/make -f
+pkg		:= $(shell dpkg-parsechangelog | awk '/^Source:/ {print $$2}')
 
-ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -g
-endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-	INSTALL_PROGRAM += -s
-endif
+DESTDIR		:= `pwd`/debian/$(pkg)
+HELPDIR		:= `pwd`/debian/$(pkg)/usr/share/$(pkg)
 
-host_arch	:= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+%:
+	dh $@  --with autotools-dev --with autoreconf
 
-pkg		:= ctsim
-pkg-help	:= ctsim-help
-pkg-doc		:= ctsim-doc
+override_dh_auto_clean:
+	dh_auto_clean
+	rm -f helical/sample-helical.sh tools/sample-ctsim.sh
 
-ctsim-shared	:= usr/share/ctsim
-
-prefix		:= debian/$(pkg)
-prefix-help	:= debian/$(pkg-help)
-prefix-doc	:= debian/$(pkg-doc)
-
-DESTDIR		:= `pwd`/$(prefix)
-HELPDIR		:= `pwd`/$(prefix-help)/$(ctsim-shared)
-doc-dir		:= usr/share/doc/$(pkg-doc)
-pixmap-dir	:= usr/share/pixmaps
-desktop-dir	:= usr/share/applications
-
-configure: configure-stamp
-configure-stamp:
-	dh_testdir
-	dh_autotools-dev_updateconfig
+override_dh_autoconfigure:
 	./configure --prefix=$(DESTDIR)/usr --mandir=$(DESTDIR)/usr/share/man --datadir=$(HELPDIR) --with-ctn -with-x --without-lam
-	touch configure-stamp
 
-
-build-arch: configure-stamp build-arch-stamp
-build-arch-stamp:
-	dh_testdir
-	$(MAKE) all
-	touch build-arch-stamp
-
-build-indep: configure-stamp  build-indep-stamp
-build-indep-stamp:
-	dh_testdir
+override_dh_installdocs-indep:
 	(cd docs; tar xzf html.tar.gz)
-	touch build-indep-stamp
-
-build: build-arch build-indep
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-arch-stamp build-indep-stamp configure-stamp
-	if [ -f Makefile -a -f config.status ]; then $(MAKE) clean; fi
-	find . -type f -and -name \*~ -or -name .\*~ -exec rm -f {} \;
-	rm -f debian/ctsim.postinst.* debian/ctsim.prerm.*
-	dh_autotools-dev_restoreconfig
-	-rm -f configure-stamp build-indep-stamp build-arch-stamp
-	dh_clean
-
-install: DH_OPTIONS=
-install: build
-	dh_testdir
-	dh_testroot
-	dh_prep
-	dh_installdirs
-	dh_installdirs -p $(pkg-help) $(ctsim-shared)
-	${MAKE} install
-	rm $(DESTDIR)/usr/share/doc/$(pkg)/simulate.html
-	dh_installdirs -p $(pkg) $(pixmap-dir)
-	dh_installdirs -p $(pkg) $(desktop-dir)
-	dh_install -p $(pkg) debian/ctsim.xpm $(pixmap-dir)
-	dh_install -p $(pkg) debian/ctsim.desktop $(desktop-dir)
-	dh_install -p $(pkg-help) docs/ctsim.htb $(ctsim-shared)
-	dh_install -p $(pkg-doc) docs/html $(doc-dir)
-	dh_install -p $(pkg-doc) html/simulate.html $(doc-dir)/examples
-	dh_link -p $(pkg-doc) $(doc-dir)/html/$(pkg)_contents.html $(doc-dir)/html/index.html
-	gzip -9 docs/ctsim.pdf
-	dh_install -p $(pkg-doc) docs/ctsim.pdf.gz $(doc-dir)
-	gunzip docs/ctsim.pdf.gz
-	chmod +x helical/*.sh tools/*.sh
-
-binary-indep: build install
-	dh_testdir -i
-	dh_testroot -i
 	dh_installdocs -i
-	dh_installexamples -i
-	dh_installmenu -i
-	dh_installcron -i
-	dh_installinfo -i
-	dh_installchangelogs ChangeLog -i
-	dh_installexamples -p $(pkg-doc) tools/sample-ctsim.sh helical/sample-helical.sh -i
-	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_installdocs -Xsimulate.html -a
-	dh_installchangelogs ChangeLog -a
-	dh_strip -a
-	dh_link -a
-	dh_compress -a
-	dh_fixperms -a
-	dh_installmenu -a
-	dh_installdeb -a
-	dh_shlibdeps -a
-	dh_gencontrol -a
-	dh_md5sums -a
-	dh_builddeb -a
-
-binary: binary-indep binary-arch
 
-.PHONY: build clean binary-indep binary-arch binary install configure
+override_dh_installchangelogs:
+	dh_installchangelogs ChangeLog

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/ctsim.git



More information about the debian-med-commit mailing list