[med-svn] r1547 - in trunk/packages/raster3d/trunk/debian: . patches

naoliv at alioth.debian.org naoliv at alioth.debian.org
Mon Mar 10 13:29:37 UTC 2008


Author: naoliv
Date: 2008-03-10 13:29:36 +0000 (Mon, 10 Mar 2008)
New Revision: 1547

Removed:
   trunk/packages/raster3d/trunk/debian/patches/raster3d-2.7d-gcc4-gentoo.patch
Modified:
   trunk/packages/raster3d/trunk/debian/changelog
   trunk/packages/raster3d/trunk/debian/patches/Makefile.diff
   trunk/packages/raster3d/trunk/debian/raster3d-doc.doc-base
Log:
New upstream release


Modified: trunk/packages/raster3d/trunk/debian/changelog
===================================================================
--- trunk/packages/raster3d/trunk/debian/changelog	2008-03-10 13:13:45 UTC (rev 1546)
+++ trunk/packages/raster3d/trunk/debian/changelog	2008-03-10 13:29:36 UTC (rev 1547)
@@ -1,3 +1,11 @@
+raster3d (2.7s-1) unstable; urgency=low
+
+  * New upstream release;
+  * Updated doc-base section;
+  * Removed raster3d-2.7d-gcc4-gentoo.patch (fixed upstream).
+
+ -- Nelson A. de Oliveira <naoliv at debian.org>  Mon, 10 Mar 2008 09:01:42 -0300
+
 raster3d (2.7d+0-2) unstable; urgency=low
 
   * Updated Standards-Version;

Modified: trunk/packages/raster3d/trunk/debian/patches/Makefile.diff
===================================================================
--- trunk/packages/raster3d/trunk/debian/patches/Makefile.diff	2008-03-10 13:13:45 UTC (rev 1546)
+++ trunk/packages/raster3d/trunk/debian/patches/Makefile.diff	2008-03-10 13:29:36 UTC (rev 1547)
@@ -1,15 +1,15 @@
-diff -Nur raster3d-2.7d/Makefile raster3d-2.7d.new/Makefile
---- raster3d-2.7d/Makefile	2006-04-12 15:46:10.000000000 -0300
-+++ raster3d-2.7d.new/Makefile	2006-05-03 18:20:33.000000000 -0300
+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
 @@ -61,9 +61,9 @@
  	@cp Makefile.template Makefile.incl
  	@echo OS = linux                      >> Makefile.incl
  	@echo CC = gcc                        >> Makefile.incl
--	@echo CFLAGS = -g -w -Dgfortran       >> Makefile.incl
-+	@echo CFLAGS = -g -O2 -Wall -Dgfortran       >> Makefile.incl
+-	@echo CFLAGS = -g -Wall -Dgfortran    >> Makefile.incl
++	@echo CFLAGS = -g -O2 -Wall -Dgfortran    >> Makefile.incl
  	@echo FC = gfortran                   >> Makefile.incl
--	@echo FFLAGS = -g -w -O -ffixed-line-length-132 >> Makefile.incl
-+	@echo FFLAGS = -g -Wall -O2 -ffixed-line-length-132 >> 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 RM = /bin/rm -f                 >> Makefile.incl
  	@echo OSDEFS =  -DLINUX -DNETWORKBYTEORDER       >> Makefile.incl
  	@echo include Makefile.package        >> Makefile.incl

Deleted: trunk/packages/raster3d/trunk/debian/patches/raster3d-2.7d-gcc4-gentoo.patch
===================================================================
--- trunk/packages/raster3d/trunk/debian/patches/raster3d-2.7d-gcc4-gentoo.patch	2008-03-10 13:13:45 UTC (rev 1546)
+++ trunk/packages/raster3d/trunk/debian/patches/raster3d-2.7d-gcc4-gentoo.patch	2008-03-10 13:29:36 UTC (rev 1547)
@@ -1,38 +0,0 @@
-diff -Naur Raster3D_2.7d/normal3d.f Raster3D_2.7d.new/normal3d.f
---- Raster3D_2.7d/normal3d.f	2003-10-20 18:50:11.000000000 -0400
-+++ Raster3D_2.7d.new/normal3d.f	2007-09-08 10:12:49.000000000 -0400
-@@ -443,7 +443,8 @@
- 	READ (INPUT,'(A)',ERR=101) TITLE
- 	IF (TITLE(1:1).EQ.'#') GOTO 100
- 	GOTO 102
--  101	WRITE (NOISE,'(A,A)') ' >> Cannot open or read file ',TITLE(2:132)
-+  101	WRITE (NOISE,'(A,A)') ' >> Cannot open or read file ',
-+     *TITLE(2:132)
- 	CALL EXIT(-1)
-   102	CONTINUE
-       ENDIF
-diff -Naur Raster3D_2.7d/parse.f Raster3D_2.7d.new/parse.f
---- Raster3D_2.7d/parse.f	2006-04-11 14:33:48.000000000 -0400
-+++ Raster3D_2.7d.new/parse.f	2007-09-08 10:25:24.000000000 -0400
-@@ -4,7 +4,8 @@
-       COMMON /OPTIONS/ FONTSCALE, GAMMA, ZOOM, NSCHEME, SHADOWFLAG, XBG, 
-      &                 NAX, NAY, OTMODE, QUALITY, INVERT, LFLAG
-       REAL             FONTSCALE, GAMMA, ZOOM
--      INTEGER          NSCHEME, SHADOWFLAG, XBG
-+      INTEGER          NSCHEME, SHADOWFLAG
-+      INTEGER*8        XBG
-       INTEGER*2        NAX, NAY, OTMODE, QUALITY
-       LOGICAL*2        INVERT, LFLAG
- c
-diff -Naur Raster3D_2.7d/render.f Raster3D_2.7d.new/render.f
---- Raster3D_2.7d/render.f	2006-04-11 17:13:04.000000000 -0400
-+++ Raster3D_2.7d.new/render.f	2007-09-08 10:15:17.000000000 -0400
-@@ -3685,7 +3685,7 @@
- 	        FRAC = DETAIL(K+8)
- 	        INEXT = INDTOP + 1
-   	        IF (TYPE(INEXT).EQ.VERTEXRGB) INEXT = INEXT + 1
--	        CALL ASSERT(TYPE(INEXT).EQ.VERTRANSP,'lost vertex transp')
-+	  CALL ASSERT(TYPE(INEXT).EQ.VERTRANSP,'lost vertex transp')
- 	        K = LIST(INEXT)
- 	        CLRITY = FRAC*DETAIL(K+1) + (1.-FRAC)*DETAIL(K+2)
- 	      ELSE IF (TYPE(INDTOP).EQ.TRIANG) THEN

Modified: trunk/packages/raster3d/trunk/debian/raster3d-doc.doc-base
===================================================================
--- trunk/packages/raster3d/trunk/debian/raster3d-doc.doc-base	2008-03-10 13:13:45 UTC (rev 1546)
+++ trunk/packages/raster3d/trunk/debian/raster3d-doc.doc-base	2008-03-10 13:29:36 UTC (rev 1547)
@@ -6,7 +6,7 @@
  PDB (Protein Data Bank) files to produce scene descriptions for input to
  render. Raster3D can also render images composed using other programs such
  as Molscript and XtalView.
-Section: Apps/Science
+Section: Science/Biology
 
 Format: PDF
 Files: /usr/share/doc/raster3d/R3D_manual.pdf.gz




More information about the debian-med-commit mailing list