Author: tille Date: 2010-03-30 09:11:17 +0000 (Tue, 30 Mar 2010) New Revision: 4701
Added: trunk/packages/raster3d/trunk/debian/patches/series Modified: trunk/packages/raster3d/trunk/debian/changelog trunk/packages/raster3d/trunk/debian/compat trunk/packages/raster3d/trunk/debian/control trunk/packages/raster3d/trunk/debian/patches/BUGS.diff trunk/packages/raster3d/trunk/debian/patches/Makefile.diff trunk/packages/raster3d/trunk/debian/patches/Makefile.template.diff trunk/packages/raster3d/trunk/debian/patches/example1.script.diff trunk/packages/raster3d/trunk/debian/patches/example2.script.diff trunk/packages/raster3d/trunk/debian/patches/example2.sgi.diff trunk/packages/raster3d/trunk/debian/patches/example3.script.diff trunk/packages/raster3d/trunk/debian/patches/example4.script.diff trunk/packages/raster3d/trunk/debian/patches/example5.script.diff trunk/packages/raster3d/trunk/debian/patches/example6.script.diff trunk/packages/raster3d/trunk/debian/patches/example7.script.diff trunk/packages/raster3d/trunk/debian/patches/example8.script.diff trunk/packages/raster3d/trunk/debian/patches/example9.script.diff trunk/packages/raster3d/trunk/debian/patches/msms_example.script.diff trunk/packages/raster3d/trunk/debian/patches/r3d_objects.man.diff trunk/packages/raster3d/trunk/debian/patches/raster3d.man.diff trunk/packages/raster3d/trunk/debian/patches/render.man.diff trunk/packages/raster3d/trunk/debian/patches/rods.man.diff trunk/packages/raster3d/trunk/debian/rules trunk/packages/raster3d/trunk/debian/watch Log: Use patch system quilt, updated watch file to detect new version, added myself to uploaders Modified: trunk/packages/raster3d/trunk/debian/changelog =================================================================== --- trunk/packages/raster3d/trunk/debian/changelog 2010-03-30 09:06:45 UTC (rev 4700) +++ trunk/packages/raster3d/trunk/debian/changelog 2010-03-30 09:11:17 UTC (rev 4701) @@ -1,3 +1,15 @@ +raster3d (2.9-1-1) UNRELEASED; urgency=low + + * New upstream version + * debian/control: + - Added myself to uploaders + - Standards-Version: 3.8.4 (no changes needed) + - debhelper >= 7 + * debian/compat: 7 + * Use patch system quilt + + -- Andreas Tille <[email protected]> Tue, 30 Mar 2010 10:11:59 +0200 + raster3d (2.7s-1) unstable; urgency=low * New upstream release; Modified: trunk/packages/raster3d/trunk/debian/compat =================================================================== --- trunk/packages/raster3d/trunk/debian/compat 2010-03-30 09:06:45 UTC (rev 4700) +++ trunk/packages/raster3d/trunk/debian/compat 2010-03-30 09:11:17 UTC (rev 4701) @@ -1 +1 @@ -5 +7 Modified: trunk/packages/raster3d/trunk/debian/control =================================================================== --- trunk/packages/raster3d/trunk/debian/control 2010-03-30 09:06:45 UTC (rev 4700) +++ trunk/packages/raster3d/trunk/debian/control 2010-03-30 09:11:17 UTC (rev 4701) @@ -3,9 +3,11 @@ Priority: optional Maintainer: Debian Med Packaging Team <[email protected]> DM-Upload-Allowed: yes -Uploaders: Nelson A. de Oliveira <[email protected]> -Build-Depends: cdbs, debhelper (>= 5), gfortran, libtiff4-dev, libjpeg62-dev, libpng12-dev, xutils -Standards-Version: 3.7.3 +Uploaders: Nelson A. de Oliveira <[email protected]>, + Andreas Tille <[email protected]> +Build-Depends: cdbs, debhelper (>= 7), gfortran, libtiff4-dev, libjpeg62-dev, libpng12-dev, + quilt +Standards-Version: 3.8.4 Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/raster3d/trunk/ Vcs-Svn: svn://svn.debian.org/svn/debian-med/trunk/packages/raster3d/trunk/ XS-Autobuild: yes Modified: trunk/packages/raster3d/trunk/debian/patches/BUGS.diff =================================================================== --- trunk/packages/raster3d/trunk/debian/patches/BUGS.diff 2010-03-30 09:06:45 UTC (rev 4700) +++ trunk/packages/raster3d/trunk/debian/patches/BUGS.diff 2010-03-30 09:11:17 UTC (rev 4701) @@ -1,6 +1,5 @@ -diff -Nur raster3d-2.7d/BUGS raster3d-2.7d.new/BUGS ---- raster3d-2.7d/BUGS 2006-04-11 15:52:29.000000000 -0300 -+++ raster3d-2.7d.new/BUGS 2006-05-03 18:15:37.000000000 -0300 +--- Raster3D-2.9-1.orig/BUGS ++++ Raster3D-2.9-1/BUGS @@ -1,11 +1,3 @@ -All platforms -============= Modified: trunk/packages/raster3d/trunk/debian/patches/Makefile.diff =================================================================== --- trunk/packages/raster3d/trunk/debian/patches/Makefile.diff 2010-03-30 09:06:45 UTC (rev 4700) +++ trunk/packages/raster3d/trunk/debian/patches/Makefile.diff 2010-03-30 09:11:17 UTC (rev 4701) @@ -1,6 +1,5 @@ -diff -Nur raster3d-2.7s/Makefile raster3d-2.7s.new/Makefile ---- raster3d-2.7s/Makefile 2008-03-07 19:20:34.000000000 -0300 -+++ raster3d-2.7s.new/Makefile 2008-03-10 09:57:28.000000000 -0300 +--- Raster3D-2.9-1.orig/Makefile ++++ Raster3D-2.9-1/Makefile @@ -61,9 +61,9 @@ @cp Makefile.template Makefile.incl @echo OS = linux >> Makefile.incl @@ -8,25 +7,25 @@ - @echo CFLAGS = -g -Wall -Dgfortran >> Makefile.incl + @echo CFLAGS = -g -O2 -Wall -Dgfortran >> Makefile.incl @echo FC = gfortran >> Makefile.incl -- @echo FFLAGS = -g -w -O3 -ffixed-line-length-132 >> Makefile.incl -+ @echo FFLAGS = -g -w -O2 -ffixed-line-length-132 >> Makefile.incl +- @echo FFLAGS = -g -w -O3 -Wtabs -ffixed-line-length-132 >> Makefile.incl ++ @echo FFLAGS = -g -w -O2 -Wtabs -ffixed-line-length-132 >> Makefile.incl @echo RM = /bin/rm -f >> Makefile.incl @echo OSDEFS = -DLINUX -DNETWORKBYTEORDER >> Makefile.incl @echo include Makefile.package >> Makefile.incl -@@ -222,12 +222,14 @@ +@@ -227,12 +227,14 @@ install: all - if [ ! -e $(prefix) ] ; then mkdirhier $(prefix) ; fi - if [ ! -e $(bindir) ] ; then mkdirhier $(bindir) ; fi + if [ ! -e $(prefix) ] ; then mkdir -p $(prefix) ; fi + if [ ! -e $(bindir) ] ; then mkdir -p $(bindir) ; fi - chmod 755 $(PROGS); cp $(PROGS) $(bindir) + chmod 755 $(PROGS); + for i in normal3d render; do cp $$i $(bindir)/$$i.real; done + cp avs2ps balls label3d rastep ribbon rings3d rods stereo3d $(bindir) chmod 755 $(SCRIPTS); cp $(SCRIPTS) $(bindir) - if [ ! -e $(datadir) ] ; then mkdirhier $(datadir) ; fi + if [ ! -e $(datadir) ] ; then mkdir -p $(datadir) ; fi cp materials/* $(datadir) - if [ ! -e $(mandir) ] ; then mkdirhier $(mandir) ; fi + if [ ! -e $(mandir) ] ; then mkdir -p $(mandir) ; fi - cp doc/*.l $(mandir) + for i in doc/*.l; do j=$${i/doc/}; cp $$i $(mandir)/$${j/.l/.1}; done - if [ ! -e $(htmldir) ] ; then mkdirhier $(htmldir) ; fi + if [ ! -e $(htmldir) ] ; then mkdir -p $(htmldir) ; fi cp html/* $(htmldir) - if [ ! -e $(examdir) ] ; then mkdirhier $(examdir) ; fi + if [ ! -e $(examdir) ] ; then mkdir -p $(examdir) ; fi Modified: trunk/packages/raster3d/trunk/debian/patches/Makefile.template.diff =================================================================== --- trunk/packages/raster3d/trunk/debian/patches/Makefile.template.diff 2010-03-30 09:06:45 UTC (rev 4700) +++ trunk/packages/raster3d/trunk/debian/patches/Makefile.template.diff 2010-03-30 09:11:17 UTC (rev 4701) @@ -1,5 +1,5 @@ ---- raster3d-2.7c.orig/Makefile.template 2003-10-20 20:50:11.000000000 -0200 -+++ raster3d-2.7c.new/Makefile.template 2005-04-01 17:39:19.000000000 -0300 +--- Raster3D-2.9-1.orig/Makefile.template ++++ Raster3D-2.9-1/Makefile.template @@ -8,15 +8,15 @@ # # Where to install the program, data files, and manuals Modified: trunk/packages/raster3d/trunk/debian/patches/example1.script.diff =================================================================== --- trunk/packages/raster3d/trunk/debian/patches/example1.script.diff 2010-03-30 09:06:45 UTC (rev 4700) +++ trunk/packages/raster3d/trunk/debian/patches/example1.script.diff 2010-03-30 09:11:17 UTC (rev 4701) @@ -1,14 +1,14 @@ ---- raster3d-2.7c.orig/examples/example1.script -+++ raster3d-2.7c/examples/example1.script +--- Raster3D-2.9-1.orig/examples/example1.script ++++ Raster3D-2.9-1/examples/example1.script @@ -1,4 +1,4 @@ -#!/bin/csh +#!/bin/bash # E A Merritt January 2003 - # Illustration of - # material properties + # Illustration of + # material properties @@ -6,5 +6,5 @@ - # R3D_LIB environmental variable - # gamma correction applied while rendering + # R3D_LIB environmental variable + # gamma correction applied while rendering # -setenv R3D_LIB ../materials +export R3D_LIB="../materials" Modified: trunk/packages/raster3d/trunk/debian/patches/example2.script.diff =================================================================== --- trunk/packages/raster3d/trunk/debian/patches/example2.script.diff 2010-03-30 09:06:45 UTC (rev 4700) +++ trunk/packages/raster3d/trunk/debian/patches/example2.script.diff 2010-03-30 09:11:17 UTC (rev 4701) @@ -1,5 +1,5 @@ ---- raster3d-2.7c.orig/examples/example2.script -+++ raster3d-2.7c/examples/example2.script +--- Raster3D-2.9-1.orig/examples/example2.script ++++ Raster3D-2.9-1/examples/example2.script @@ -1,11 +1,11 @@ -#!/bin/csh +#!/bin/bash Modified: trunk/packages/raster3d/trunk/debian/patches/example2.sgi.diff =================================================================== --- trunk/packages/raster3d/trunk/debian/patches/example2.sgi.diff 2010-03-30 09:06:45 UTC (rev 4700) +++ trunk/packages/raster3d/trunk/debian/patches/example2.sgi.diff 2010-03-30 09:11:17 UTC (rev 4701) @@ -1,5 +1,5 @@ ---- raster3d-2.7c.orig/examples/example2.sgi -+++ raster3d-2.7c/examples/example2.sgi +--- Raster3D-2.9-1.orig/examples/example2.sgi ++++ Raster3D-2.9-1/examples/example2.sgi @@ -1,4 +1,4 @@ -#!/bin/csh +#!/bin/bash Modified: trunk/packages/raster3d/trunk/debian/patches/example3.script.diff =================================================================== --- trunk/packages/raster3d/trunk/debian/patches/example3.script.diff 2010-03-30 09:06:45 UTC (rev 4700) +++ trunk/packages/raster3d/trunk/debian/patches/example3.script.diff 2010-03-30 09:11:17 UTC (rev 4701) @@ -1,8 +1,8 @@ ---- raster3d-2.7c.orig/examples/example3.script -+++ raster3d-2.7c/examples/example3.script +--- Raster3D-2.9-1.orig/examples/example3.script ++++ Raster3D-2.9-1/examples/example3.script @@ -1,4 +1,4 @@ -#!/bin/csh +#!/bin/bash # E A Merritt March 1993 # Illustration of simple figure using Raster3D - # Assumes ImageMagick installed, if you are using the SGI libimage + # Assumes ImageMagick installed, if you are using the SGI libimage Modified: trunk/packages/raster3d/trunk/debian/patches/example4.script.diff =================================================================== --- trunk/packages/raster3d/trunk/debian/patches/example4.script.diff 2010-03-30 09:06:45 UTC (rev 4700) +++ trunk/packages/raster3d/trunk/debian/patches/example4.script.diff 2010-03-30 09:11:17 UTC (rev 4701) @@ -1,5 +1,5 @@ ---- raster3d-2.7c.orig/examples/example4.script -+++ raster3d-2.7c/examples/example4.script +--- Raster3D-2.9-1.orig/examples/example4.script ++++ Raster3D-2.9-1/examples/example4.script @@ -1,4 +1,4 @@ -#!/bin/csh +#!/bin/bash Modified: trunk/packages/raster3d/trunk/debian/patches/example5.script.diff =================================================================== --- trunk/packages/raster3d/trunk/debian/patches/example5.script.diff 2010-03-30 09:06:45 UTC (rev 4700) +++ trunk/packages/raster3d/trunk/debian/patches/example5.script.diff 2010-03-30 09:11:17 UTC (rev 4701) @@ -1,5 +1,5 @@ ---- raster3d-2.7c.orig/examples/example5.script -+++ raster3d-2.7c/examples/example5.script +--- Raster3D-2.9-1.orig/examples/example5.script ++++ Raster3D-2.9-1/examples/example5.script @@ -1,4 +1,4 @@ -#!/bin/csh +#!/bin/bash Modified: trunk/packages/raster3d/trunk/debian/patches/example6.script.diff =================================================================== --- trunk/packages/raster3d/trunk/debian/patches/example6.script.diff 2010-03-30 09:06:45 UTC (rev 4700) +++ trunk/packages/raster3d/trunk/debian/patches/example6.script.diff 2010-03-30 09:11:17 UTC (rev 4701) @@ -1,5 +1,5 @@ ---- raster3d-2.7c.orig/examples/example6.script -+++ raster3d-2.7c/examples/example6.script +--- Raster3D-2.9-1.orig/examples/example6.script ++++ Raster3D-2.9-1/examples/example6.script @@ -1,4 +1,4 @@ -#!/bin/csh +#!/bin/bash Modified: trunk/packages/raster3d/trunk/debian/patches/example7.script.diff =================================================================== --- trunk/packages/raster3d/trunk/debian/patches/example7.script.diff 2010-03-30 09:06:45 UTC (rev 4700) +++ trunk/packages/raster3d/trunk/debian/patches/example7.script.diff 2010-03-30 09:11:17 UTC (rev 4701) @@ -1,5 +1,5 @@ ---- raster3d-2.7c.orig/examples/example7.script -+++ raster3d-2.7c/examples/example7.script +--- Raster3D-2.9-1.orig/examples/example7.script ++++ Raster3D-2.9-1/examples/example7.script @@ -1,4 +1,4 @@ -#!/bin/csh +#!/bin/bash Modified: trunk/packages/raster3d/trunk/debian/patches/example8.script.diff =================================================================== --- trunk/packages/raster3d/trunk/debian/patches/example8.script.diff 2010-03-30 09:06:45 UTC (rev 4700) +++ trunk/packages/raster3d/trunk/debian/patches/example8.script.diff 2010-03-30 09:11:17 UTC (rev 4701) @@ -1,5 +1,5 @@ ---- raster3d-2.7c.orig/examples/example8.script -+++ raster3d-2.7c/examples/example8.script +--- Raster3D-2.9-1.orig/examples/example8.script ++++ Raster3D-2.9-1/examples/example8.script @@ -1,9 +1,14 @@ -#!/bin/csh +#!/bin/bash Modified: trunk/packages/raster3d/trunk/debian/patches/example9.script.diff =================================================================== --- trunk/packages/raster3d/trunk/debian/patches/example9.script.diff 2010-03-30 09:06:45 UTC (rev 4700) +++ trunk/packages/raster3d/trunk/debian/patches/example9.script.diff 2010-03-30 09:11:17 UTC (rev 4701) @@ -1,5 +1,5 @@ ---- raster3d-2.7c.orig/examples/example9.script -+++ raster3d-2.7c/examples/example9.script +--- Raster3D-2.9-1.orig/examples/example9.script ++++ Raster3D-2.9-1/examples/example9.script @@ -1,4 +1,4 @@ -#!/bin/csh +#!/bin/bash Modified: trunk/packages/raster3d/trunk/debian/patches/msms_example.script.diff =================================================================== --- trunk/packages/raster3d/trunk/debian/patches/msms_example.script.diff 2010-03-30 09:06:45 UTC (rev 4700) +++ trunk/packages/raster3d/trunk/debian/patches/msms_example.script.diff 2010-03-30 09:11:17 UTC (rev 4701) @@ -1,5 +1,5 @@ ---- raster3d-2.7c.orig/examples/msms/msms_example.script -+++ raster3d-2.7c/examples/msms/msms_example.script +--- Raster3D-2.9-1.orig/examples/msms/msms_example.script ++++ Raster3D-2.9-1/examples/msms/msms_example.script @@ -1,4 +1,4 @@ -#!/bin/csh +#!/bin/bash Modified: trunk/packages/raster3d/trunk/debian/patches/r3d_objects.man.diff =================================================================== --- trunk/packages/raster3d/trunk/debian/patches/r3d_objects.man.diff 2010-03-30 09:06:45 UTC (rev 4700) +++ trunk/packages/raster3d/trunk/debian/patches/r3d_objects.man.diff 2010-03-30 09:11:17 UTC (rev 4701) @@ -1,6 +1,5 @@ -diff -Nur raster3d-2.7d+0/doc/r3d_objects.l raster3d-2.7d+0.new/doc/r3d_objects.l ---- raster3d-2.7d+0/doc/r3d_objects.l 2006-04-11 16:34:54.000000000 -0300 -+++ raster3d-2.7d+0.new/doc/r3d_objects.l 2008-02-22 00:10:25.000000000 -0300 +--- Raster3D-2.9-1.orig/doc/r3d_objects.l ++++ Raster3D-2.9-1/doc/r3d_objects.l @@ -1,9 +1,11 @@ -.l +.ad l Modified: trunk/packages/raster3d/trunk/debian/patches/raster3d.man.diff =================================================================== --- trunk/packages/raster3d/trunk/debian/patches/raster3d.man.diff 2010-03-30 09:06:45 UTC (rev 4700) +++ trunk/packages/raster3d/trunk/debian/patches/raster3d.man.diff 2010-03-30 09:11:17 UTC (rev 4701) @@ -1,6 +1,5 @@ -diff -Nur raster3d-2.7d+0/doc/raster3d.l raster3d-2.7d+0.new/doc/raster3d.l ---- raster3d-2.7d+0/doc/raster3d.l 2006-04-11 16:36:24.000000000 -0300 -+++ raster3d-2.7d+0.new/doc/raster3d.l 2008-02-22 00:12:57.000000000 -0300 +--- Raster3D-2.9-1.orig/doc/raster3d.l ++++ Raster3D-2.9-1/doc/raster3d.l @@ -2,8 +2,7 @@ .nh .TH Raster3D 1 "28 August 2001" "Raster3D V2.6" Modified: trunk/packages/raster3d/trunk/debian/patches/render.man.diff =================================================================== --- trunk/packages/raster3d/trunk/debian/patches/render.man.diff 2010-03-30 09:06:45 UTC (rev 4700) +++ trunk/packages/raster3d/trunk/debian/patches/render.man.diff 2010-03-30 09:11:17 UTC (rev 4701) @@ -1,6 +1,5 @@ -diff -Nur raster3d-2.7d+0/doc/render.l raster3d-2.7d+0.new/doc/render.l ---- raster3d-2.7d+0/doc/render.l 2006-04-11 16:36:34.000000000 -0300 -+++ raster3d-2.7d+0.new/doc/render.l 2008-02-22 00:07:26.000000000 -0300 +--- Raster3D-2.9-1.orig/doc/render.l ++++ Raster3D-2.9-1/doc/render.l @@ -1,4 +1,4 @@ -.l +.ad l Modified: trunk/packages/raster3d/trunk/debian/patches/rods.man.diff =================================================================== --- trunk/packages/raster3d/trunk/debian/patches/rods.man.diff 2010-03-30 09:06:45 UTC (rev 4700) +++ trunk/packages/raster3d/trunk/debian/patches/rods.man.diff 2010-03-30 09:11:17 UTC (rev 4701) @@ -1,6 +1,5 @@ -diff -Nur raster3d-2.7d+0/doc/rods.l raster3d-2.7d+0.new/doc/rods.l ---- raster3d-2.7d+0/doc/rods.l 2006-04-11 16:36:44.000000000 -0300 -+++ raster3d-2.7d+0.new/doc/rods.l 2008-02-22 00:08:48.000000000 -0300 +--- Raster3D-2.9-1.orig/doc/rods.l ++++ Raster3D-2.9-1/doc/rods.l @@ -5,8 +5,8 @@ rods - Raster3D preprocessor for ball-and-stick models Added: trunk/packages/raster3d/trunk/debian/patches/series =================================================================== --- trunk/packages/raster3d/trunk/debian/patches/series (rev 0) +++ trunk/packages/raster3d/trunk/debian/patches/series 2010-03-30 09:11:17 UTC (rev 4701) @@ -0,0 +1,19 @@ +BUGS.diff +example1.script.diff +example2.script.diff +example2.sgi.diff +example3.script.diff +example4.script.diff +example5.script.diff +example6.script.diff +example7.script.diff +example8.script.diff +example9.script.diff +Makefile.diff +Makefile.template.diff +msms_example.script.diff +r3d_objects.man.diff +raster3d.man.diff +render.man.diff +rods.man.diff + Modified: trunk/packages/raster3d/trunk/debian/rules =================================================================== --- trunk/packages/raster3d/trunk/debian/rules 2010-03-30 09:06:45 UTC (rev 4700) +++ trunk/packages/raster3d/trunk/debian/rules 2010-03-30 09:11:17 UTC (rev 4701) @@ -1,6 +1,6 @@ #!/usr/bin/make -f -include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/makefile.mk Modified: trunk/packages/raster3d/trunk/debian/watch =================================================================== --- trunk/packages/raster3d/trunk/debian/watch 2010-03-30 09:06:45 UTC (rev 4700) +++ trunk/packages/raster3d/trunk/debian/watch 2010-03-30 09:11:17 UTC (rev 4701) @@ -1,3 +1,6 @@ version=3 opts="dversionmangle=s/\+.*//" \ -http://www.bmsc.washington.edu/raster3d/Raster3D_(.*)\.tar\.gz +http://skuld.bmsc.washington.edu/raster3d/Raster3D-(.*)\.tar\.gz + +# http://www.bmsc.washington.edu/raster3d/Raster3D_(.*)\.tar\.gz + _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/debian-med-commit
