[med-svn] r13446 - in trunk/packages/ecell/trunk/debian: . source

Thorsten Alteholz alteholz at alioth.debian.org
Tue Apr 30 20:28:24 UTC 2013


Author: alteholz
Date: 2013-04-30 20:28:23 +0000 (Tue, 30 Apr 2013)
New Revision: 13446

Added:
   trunk/packages/ecell/trunk/debian/source/
   trunk/packages/ecell/trunk/debian/source/format
Modified:
   trunk/packages/ecell/trunk/debian/changelog
   trunk/packages/ecell/trunk/debian/compat
   trunk/packages/ecell/trunk/debian/control
   trunk/packages/ecell/trunk/debian/rules
Log:
some progress until boost errors occured

Modified: trunk/packages/ecell/trunk/debian/changelog
===================================================================
--- trunk/packages/ecell/trunk/debian/changelog	2013-04-29 21:04:06 UTC (rev 13445)
+++ trunk/packages/ecell/trunk/debian/changelog	2013-04-30 20:28:23 UTC (rev 13446)
@@ -4,6 +4,7 @@
   * TODO: check dependencies:
      - is it correct to replace python2.2-xmlbase by python?
      - is it correct to replace python2.2-numeric by python-numpy?
+  * TODO: take care of boost compile errors
 
   [ Thorsten Alteholz ]
   * new upstream version

Modified: trunk/packages/ecell/trunk/debian/compat
===================================================================
--- trunk/packages/ecell/trunk/debian/compat	2013-04-29 21:04:06 UTC (rev 13445)
+++ trunk/packages/ecell/trunk/debian/compat	2013-04-30 20:28:23 UTC (rev 13446)
@@ -1 +1 @@
-4
+9

Modified: trunk/packages/ecell/trunk/debian/control
===================================================================
--- trunk/packages/ecell/trunk/debian/control	2013-04-29 21:04:06 UTC (rev 13445)
+++ trunk/packages/ecell/trunk/debian/control	2013-04-30 20:28:23 UTC (rev 13446)
@@ -4,13 +4,35 @@
 Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
 DM-Upload-Allowed: yes
 Uploaders: Steffen Moeller <moeller at pzr.uni-rostock.de>
-Build-Depends: debhelper (>= 4.0.0), python-numpy, python-dev, python-gtk2, python-glade2, g++ (>= 3.3), libgsl0-dev, libboost-python-dev, automake, autoconf, libtool, python-gnome2, expect, doxygen, graphviz, docbook-utils, ghostscript, docbook-to-man
+Build-Depends: debhelper (>= 9), 
+ python-numpy, 
+ python-dev, 
+ python-gtk2, 
+ python-glade2, 
+ g++ (>= 3.3), 
+ libgsl0-dev, 
+ libboost-python-dev, 
+ automake, 
+ autoconf, 
+ libtool, 
+ python-gnome2, 
+ python-ply,
+ expect, 
+ doxygen, 
+ graphviz, 
+ docbook-utils, 
+ ghostscript, 
+ docbook-to-man
 Standards-Version: 3.6.0
 Homepage: http://www.e-cell.org/
 
 Package: ecell
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libgsl0, libgnome2-0, python-numpy, python-glade2
+Depends: ${shlibs:Depends}, ${misc:Depends}, 
+ libgsl0, 
+ libgnome2-0, 
+ python-numpy, 
+ python-glade2
 Description: Concept and environment for constructing virtual cells on computers
  The E-Cell Project is an international research project aiming at
  developing necessary theoretical supports, technologies and software

Modified: trunk/packages/ecell/trunk/debian/rules
===================================================================
--- trunk/packages/ecell/trunk/debian/rules	2013-04-29 21:04:06 UTC (rev 13445)
+++ trunk/packages/ecell/trunk/debian/rules	2013-04-30 20:28:23 UTC (rev 13446)
@@ -9,17 +9,10 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-# This has to be exported to make some magic below work.
-export DH_OPTIONS
-
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
-
-CFLAGS = -Wall -g
-
+CFLAGS += -Wall -g
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
 	CFLAGS += -O0
 else
@@ -29,126 +22,168 @@
 	INSTALL_PROGRAM += -s
 endif
 
-configure:	configure.in
-	dh_testdir
+
+%:
+	dh $@ 
+
+override_dh_auto_configure:
 	./autogen.sh --enable-static=no --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
-
-config.status: configure
-	dh_testdir
-	# Add here commands to configure the package.
 	CFLAGS="$(CFLAGS)" ./configure --enable-static=no --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
 	#CFLAGS="$(CFLAGS)" ./configure --disable-gtk --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
 
 
-#Architecture 
-build: ecell.1 build-arch build-indep
-
-build-arch: build-arch-stamp
-build-arch-stamp:  config.status
-
-	# Add here commands to compile the arch part of the package.
-	$(MAKE) 
-	touch build-arch-stamp
-
-build-indep: build-indep-stamp
-build-indep-stamp:  config.status
-
-	# Add here commands to compile the indep part of the package.
+override_dh_auto_build:
 	$(MAKE) doc
-	touch build-indep-stamp
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-arch-stamp build-indep-stamp #CONFIGURE-STAMP#
-
-	# Add here commands to clean up after the build process.
-	-$(MAKE) clean
-	-$(MAKE) -C doc clean
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
-	cp -f /usr/share/misc/config.sub config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
-	cp -f /usr/share/misc/config.guess config.guess
-endif
-	dh_clean ecell.1 install-sh mkinstalldirs missing py-compile ecell/libecs/libecs.so doc/users-manual/ecell3-users-manual.pdf doc/users-manual/ecell3-users-manual.pdf doc/refman/refman.pdf
-
-ecell.1: ecell.sgml
-	docbook-to-man $< > $@
-	-mkdir -p $(CURDIR)/debian/ecell/usr/share/man/man1
+	docbook-to-man ecell.sgml > ecell.1
+	mkdir -p $(CURDIR)/debian/ecell/usr/share/man/man1
 	for i in dmcompile ecell3-em2eml ecell3-python ecell3-session-manager gecell3-session dmgen ecell3-eml2em ecell3-sbml2eml eri2eml rd2dm ecell3-dmc ecell3-model-editor ecell3-session gecell toollauncher; do (cd $(CURDIR)/debian/ecell/usr/share/man/man1 && ln -sf ecell.1 $$i.1); done
+###	$(MAKE) 
 
+override_dh_clean:
+	dh_clean
+	#[ -f Makefile ] && $(MAKE) clean
+	#[ -f doc/Makefile ] && $(MAKE) -C doc clean
 
-install: install-indep install-arch
-install-indep: 
-	dh_testdir
-	dh_testroot
-	dh_clean -k -i 
-	dh_installdirs -i
+#### This has to be exported to make some magic below work.
+###export DH_OPTIONS
+###
+#### These are used for cross-compiling and for saving the configure script
+#### from having to guess our platform (since we know it already)
+###DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+###DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+###
+###
+###CFLAGS = -Wall -g
+###
+###ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+###	CFLAGS += -O0
+###else
+###	CFLAGS += -O2
+###endif
+###ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+###	INSTALL_PROGRAM += -s
+###endif
+###
+###configure:	configure.in
+###	dh_testdir
+###	./autogen.sh --enable-static=no --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
+###
+###config.status: configure
+###	dh_testdir
+###	# Add here commands to configure the package.
+###	CFLAGS="$(CFLAGS)" ./configure --enable-static=no --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
+###	#CFLAGS="$(CFLAGS)" ./configure --disable-gtk --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
+###
+###
+####Architecture 
+###build: ecell.1 build-arch build-indep
+###
+###build-arch: build-arch-stamp
+###build-arch-stamp:  config.status
+###
+###	# Add here commands to compile the arch part of the package.
+###	$(MAKE) 
+###	touch build-arch-stamp
+###
+###build-indep: build-indep-stamp
+###build-indep-stamp:  config.status
+###
+###	# Add here commands to compile the indep part of the package.
+###	$(MAKE) doc
+###	touch build-indep-stamp
+###
+###clean:
+###	dh_testdir
+###	dh_testroot
+###	rm -f build-arch-stamp build-indep-stamp #CONFIGURE-STAMP#
+###
+###	# Add here commands to clean up after the build process.
+###	-$(MAKE) clean
+###	-$(MAKE) -C doc clean
+###ifneq "$(wildcard /usr/share/misc/config.sub)" ""
+###	cp -f /usr/share/misc/config.sub config.sub
+###endif
+###ifneq "$(wildcard /usr/share/misc/config.guess)" ""
+###	cp -f /usr/share/misc/config.guess config.guess
+###endif
+###	dh_clean ecell.1 install-sh mkinstalldirs missing py-compile ecell/libecs/libecs.so doc/users-manual/ecell3-users-manual.pdf doc/users-manual/ecell3-users-manual.pdf doc/refman/refman.pdf
+###
+###ecell.1: ecell.sgml
+###	docbook-to-man $< > $@
+###	-mkdir -p $(CURDIR)/debian/ecell/usr/share/man/man1
+###	for i in dmcompile ecell3-em2eml ecell3-python ecell3-session-manager gecell3-session dmgen ecell3-eml2em ecell3-sbml2eml eri2eml rd2dm ecell3-dmc ecell3-model-editor ecell3-session gecell toollauncher; do (cd $(CURDIR)/debian/ecell/usr/share/man/man1 && ln -sf ecell.1 $$i.1); done
+###
+###
+###install: install-indep install-arch
+###install-indep: 
+###	dh_testdir
+###	dh_testroot
+###	dh_clean -k -i 
+###	dh_installdirs -i
+###
+###	# Add here commands to install the indep part of the package into
+###	# debian/<package>-doc.
+###	#INSTALLDOC#
+###	mkdir -p $(CURDIR)/debian/ecell-doc/usr/share/doc/ecell-3.1.100
+###	$(MAKE) prefix=$(CURDIR)/debian/ecell-doc/usr doc-install 
+###	mv $(CURDIR)/debian/ecell-doc/usr/share/doc/ecell-3.1.100 $(CURDIR)/debian/ecell-doc/usr/share/doc/ecell
+###
+###	dh_install -i
+###
+###install-arch:
+###	dh_testdir
+###	dh_testroot
+###	dh_clean -k -s 
+###	dh_installdirs -s
+###
+###	# Add here commands to install the arch part of the package into 
+###	# debian/tmp.
+###	$(MAKE) prefix=$(CURDIR)/debian/ecell/usr install 
+###
+###	dh_install -s
+###
+#### Must not depend on anything. This is to be called by
+#### binary-arch/binary-indep
+#### in another 'make' thread.
+###binary-common:
+###	dh_testdir
+###	dh_testroot
+###	dh_installchangelogs ChangeLog
+###	dh_installdocs
+###	dh_installexamples
+####	dh_installmenu
+####	dh_installdebconf	
+####	dh_installlogrotate	
+####	dh_installemacsen
+####	dh_installpam
+####	dh_installmime
+####	dh_installinit
+####	dh_installcron
+####	dh_installinfo
+###	dh_installman
+###	dh_link
+###	dh_strip
+###	dh_compress 
+###	dh_fixperms
+####	dh_perl
+###	dh_python -V 2.2
+###	dh_makeshlibs
+###	dh_installdeb
+###	dh_shlibdeps
+###	dh_gencontrol
+###	dh_md5sums
+###	dh_builddeb
+#### Build architecture independant packages using the common target.
+###binary-indep: build-indep install-indep
+###	$(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
+###
+#### Build architecture dependant packages using the common target.
+###binary-arch: build-arch install-arch
+###	$(MAKE) -f debian/rules DH_OPTIONS=-a binary-common
+###
+###binary: binary-arch binary-indep
+###.PHONY: build clean binary-indep binary-arch binary install install-indep install-arch 
 
-	# Add here commands to install the indep part of the package into
-	# debian/<package>-doc.
-	#INSTALLDOC#
-	mkdir -p $(CURDIR)/debian/ecell-doc/usr/share/doc/ecell-3.1.100
-	$(MAKE) prefix=$(CURDIR)/debian/ecell-doc/usr doc-install 
-	mv $(CURDIR)/debian/ecell-doc/usr/share/doc/ecell-3.1.100 $(CURDIR)/debian/ecell-doc/usr/share/doc/ecell
-
-	dh_install -i
-
-install-arch:
-	dh_testdir
-	dh_testroot
-	dh_clean -k -s 
-	dh_installdirs -s
-
-	# Add here commands to install the arch part of the package into 
-	# debian/tmp.
-	$(MAKE) prefix=$(CURDIR)/debian/ecell/usr install 
-
-	dh_install -s
-
-# Must not depend on anything. This is to be called by
-# binary-arch/binary-indep
-# in another 'make' thread.
-binary-common:
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs ChangeLog
-	dh_installdocs
-	dh_installexamples
-#	dh_installmenu
-#	dh_installdebconf	
-#	dh_installlogrotate	
-#	dh_installemacsen
-#	dh_installpam
-#	dh_installmime
-#	dh_installinit
-#	dh_installcron
-#	dh_installinfo
-	dh_installman
-	dh_link
-	dh_strip
-	dh_compress 
-	dh_fixperms
-#	dh_perl
-	dh_python -V 2.2
-	dh_makeshlibs
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-# Build architecture independant packages using the common target.
-binary-indep: build-indep install-indep
-	$(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
-
-# Build architecture dependant packages using the common target.
-binary-arch: build-arch install-arch
-	$(MAKE) -f debian/rules DH_OPTIONS=-a binary-common
-
-binary: binary-arch binary-indep
-.PHONY: build clean binary-indep binary-arch binary install install-indep install-arch 
-
 get-orig-source:
 	mkdir -p ../tarballs
 	uscan --verbose --force-download --destdir=../tarballs

Added: trunk/packages/ecell/trunk/debian/source/format
===================================================================
--- trunk/packages/ecell/trunk/debian/source/format	                        (rev 0)
+++ trunk/packages/ecell/trunk/debian/source/format	2013-04-30 20:28:23 UTC (rev 13446)
@@ -0,0 +1 @@
+3.0 (quilt)




More information about the debian-med-commit mailing list