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

Andreas Tille tille at alioth.debian.org
Fri Mar 25 10:19:23 UTC 2011 

Author: tille
Date: 2011-03-25 10:19:22 +0000 (Fri, 25 Mar 2011)
New Revision: 6383

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/raster3d.man.diff
   trunk/packages/raster3d/trunk/debian/patches/render.man.diff
   trunk/packages/raster3d/trunk/debian/rules
Log:
New upstream version (incl. changes of patches needed for this); debhelper 8; droped cdbs in favour of dh because of changes in cdbs API


Modified: trunk/packages/raster3d/trunk/debian/changelog
===================================================================
--- trunk/packages/raster3d/trunk/debian/changelog	2011-03-24 21:48:42 UTC (rev 6382)
+++ trunk/packages/raster3d/trunk/debian/changelog	2011-03-25 10:19:22 UTC (rev 6383)
@@ -1,3 +1,14 @@
+raster3d (3.0-2-1) unstable; urgency=low
+
+  * New upstream version
+  * Adapted patches to new upstream version
+  * Debhelper 8 (control+compat)
+  * debian/rules: Droped cdbs in favour of dh because the
+    cdbs rules file did not worked and claimed outdated API
+  * Build-Depends: libgd2-xpm-dev
+
+ -- Andreas Tille <tille at debian.org>  Fri, 25 Mar 2011 10:19:32 +0100
+
 raster3d (2.9-2-1) unstable; urgency=low
 
   * New upstream version

Modified: trunk/packages/raster3d/trunk/debian/compat
===================================================================
--- trunk/packages/raster3d/trunk/debian/compat	2011-03-24 21:48:42 UTC (rev 6382)
+++ trunk/packages/raster3d/trunk/debian/compat	2011-03-25 10:19:22 UTC (rev 6383)
@@ -1 +1 @@
-7
+8

Modified: trunk/packages/raster3d/trunk/debian/control
===================================================================
--- trunk/packages/raster3d/trunk/debian/control	2011-03-24 21:48:42 UTC (rev 6382)
+++ trunk/packages/raster3d/trunk/debian/control	2011-03-25 10:19:22 UTC (rev 6383)
@@ -5,8 +5,8 @@
 DM-Upload-Allowed: yes
 Uploaders: Nelson A. de Oliveira <naoliv at debian.org>,
  Andreas Tille <tille at debian.org>
-Build-Depends: cdbs, debhelper (>= 7), gfortran, libtiff4-dev, libjpeg62-dev, libpng12-dev,
- quilt
+Build-Depends: debhelper (>= 8), quilt (>= 0.47), gfortran, libtiff4-dev, libjpeg62-dev,
+ libpng12-dev, libgd2-xpm-dev
 Standards-Version: 3.9.1
 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/

Modified: trunk/packages/raster3d/trunk/debian/patches/BUGS.diff
===================================================================
--- trunk/packages/raster3d/trunk/debian/patches/BUGS.diff	2011-03-24 21:48:42 UTC (rev 6382)
+++ trunk/packages/raster3d/trunk/debian/patches/BUGS.diff	2011-03-25 10:19:22 UTC (rev 6383)
@@ -1,9 +1,9 @@
---- Raster3D-2.9-1.orig/BUGS
-+++ Raster3D-2.9-1/BUGS
-@@ -1,11 +1,3 @@
--All platforms
--=============
--
+--- Raster3D_3.0-2.orig/BUGS
++++ Raster3D_3.0-2/BUGS
+@@ -1,11 +1,6 @@
+ All platforms
+ =============
+ 
 -      ==> ImageMagick keeps on changing their option syntax and delegates
 -	  file format.  You may have to tweak the calls to ImageMagick
 -	  utilities in the stereo3d and label3d scripts to match your local
@@ -12,21 +12,10 @@
        ==> Stereo pairs can be generated by using either a shear operation or
        	  by using an angular offset.  Both have problems.  The shear distorts
  	  bounding surfaces.  The angular offset displaces specular highlights
-@@ -28,35 +20,3 @@
+@@ -23,14 +18,3 @@
  	- Labels with TeX-like escape sequences are always treated as Left-Align.
- 	- Angstrom symbol only loaded into Times/Helvetica fonts.
  	- ribbon coloring scheme 6 doesn't work
--
--SGI
--===
--	- In general the JPEG and PNG libraries supplied with Irix are bad,
--	  and should be rebuilt from current source
--	- Some versions of Irix contain a header file jpeglib.h that is not
--	  compatible with the actual libjpeg in the same distribution
--	- The PNG library and header files are from an ancient beta-test version.
--	  You must choose between disabling PNG support in Makefile.template or
--	  installing a newer version of libpng on your machine
--
+ 
 -AIX 
 -===
 -	File indirection in render doesn't work, because opening Fortran
@@ -38,13 +27,3 @@
 -	Work-around :
 -		None; temp files accumulate until deleted
 -
--linux (g77 and gfortran compilers)
--====================
--
--	The g77 and gfortran compilers do not support file open options 
--	CARRIAGECONTROL='LIST' or DISPOSE='DELETE'.
--	Work-around :
--		'make linux' deletes these specifications from the source
--		files; unfortunately, this means that temporary files do not
--		automatically get deleted from the system temp directory.
--

Modified: trunk/packages/raster3d/trunk/debian/patches/Makefile.diff
===================================================================
--- trunk/packages/raster3d/trunk/debian/patches/Makefile.diff	2011-03-24 21:48:42 UTC (rev 6382)
+++ trunk/packages/raster3d/trunk/debian/patches/Makefile.diff	2011-03-25 10:19:22 UTC (rev 6383)
@@ -1,6 +1,6 @@
---- Raster3D-2.9-1.orig/Makefile
-+++ Raster3D-2.9-1/Makefile
-@@ -61,9 +61,9 @@
+--- Raster3D_3.0-2.orig/Makefile
++++ Raster3D_3.0-2/Makefile
+@@ -51,9 +51,9 @@
  	@cp Makefile.template Makefile.incl
  	@echo OS = linux                      >> Makefile.incl
  	@echo CC = gcc                        >> Makefile.incl
@@ -12,7 +12,7 @@
  	@echo RM = /bin/rm -f                 >> Makefile.incl
  	@echo OSDEFS =  -DLINUX -DNETWORKBYTEORDER       >> Makefile.incl
  	@echo include Makefile.package        >> Makefile.incl
-@@ -227,12 +227,14 @@
+@@ -238,12 +238,14 @@
  install:	all
  	if [ ! -e $(prefix)  ] ; then mkdir -p $(prefix) ; fi
  	if [ ! -e $(bindir)  ] ; then mkdir -p $(bindir) ; fi

Modified: trunk/packages/raster3d/trunk/debian/patches/raster3d.man.diff
===================================================================
--- trunk/packages/raster3d/trunk/debian/patches/raster3d.man.diff	2011-03-24 21:48:42 UTC (rev 6382)
+++ trunk/packages/raster3d/trunk/debian/patches/raster3d.man.diff	2011-03-25 10:19:22 UTC (rev 6383)
@@ -1,8 +1,8 @@
---- Raster3D-2.9-1.orig/doc/raster3d.l
-+++ Raster3D-2.9-1/doc/raster3d.l
+--- Raster3D_3.0-2.orig/doc/raster3d.l
++++ Raster3D_3.0-2/doc/raster3d.l
 @@ -2,8 +2,7 @@
  .nh
- .TH Raster3D 1 "28 August 2001" "Raster3D V2.6"
+ .TH Raster3D 1 "14 December 2010" "Raster3D V3.0"
  .SH NAME
 -.PP
 -Raster3D molecular graphics package

Modified: trunk/packages/raster3d/trunk/debian/patches/render.man.diff
===================================================================
--- trunk/packages/raster3d/trunk/debian/patches/render.man.diff	2011-03-24 21:48:42 UTC (rev 6382)
+++ trunk/packages/raster3d/trunk/debian/patches/render.man.diff	2011-03-25 10:19:22 UTC (rev 6383)
@@ -1,8 +1,8 @@
---- Raster3D-2.9-1.orig/doc/render.l
-+++ Raster3D-2.9-1/doc/render.l
+--- Raster3D_3.0-2.orig/doc/render.l
++++ Raster3D_3.0-2/doc/render.l
 @@ -1,4 +1,4 @@
 -.l
 +.ad l
  .nh
- .TH RENDER 1 "19 May 2003" "Raster3D"
+ .TH RENDER 1 "14 December 2010" "Raster3D V3.0"
  .SH NAME

Modified: trunk/packages/raster3d/trunk/debian/rules
===================================================================
--- trunk/packages/raster3d/trunk/debian/rules	2011-03-24 21:48:42 UTC (rev 6382)
+++ trunk/packages/raster3d/trunk/debian/rules	2011-03-25 10:19:22 UTC (rev 6383)
@@ -1,22 +1,33 @@
 #!/usr/bin/make -f
+# debian/rules for raster3d using dh
+# Author: Andreas Tille <tille at debian.org>
+# GPL
 
-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
+%:
+	dh $@ --with quilt
 
-DEB_DESTDIR = $(CURDIR)/debian/tmp
-DEB_MAKE_CLEAN_TARGET    := clean
-DEB_MAKE_INSTALL_TARGET := install prefix=$(DEB_DESTDIR)
-DEB_INSTALL_CHANGELOGS_raster3d := CHANGELOG
-DEB_INSTALL_DOCS_ALL :=
-DEB_COMPRESS_EXCLUDE := .pdb .r3d .mol .pdf
-
-cleanbuilddir::
+override_dh_clean:
+	# $(MAKE) clean
+	dh_clean
 	rm -f debian/diffs.tar
 
-makebuilddir/raster3d::
+override_dh_auto_configure:
 	mkdir debian/tmp
-	cd debian/patches/ && tar -cf ../diffs.tar *.diff *.patch || true
+	cd debian/patches/ && tar -cf ../diffs.tar *.diff || true
+	# dh_auto_configure
 
-configure/raster3d::
-	$(MAKE) linux-gfortran
+override_dh_auto_build:
+	$(MAKE) linux
+
+override_dh_auto_install:
+	$(MAKE) install prefix=$(CURDIR)/debian/tmp
+
+override_dh_installchangelogs:
+	dh_installchangelogs CHANGELOG
+
+override_dh_compress:
+	dh_compress --exclude=.pdb \
+		    --exclude=.r3d \
+		    --exclude=.mol \
+		    --exclude=.pdf
+

More information about the debian-med-commit mailing list