[med-svn] r1172 - in trunk/packages/treeplot/trunk: debian treeplot

charles-guest at alioth.debian.org charles-guest at alioth.debian.org
Sat Jan 19 03:45:15 UTC 2008 

Author: charles-guest
Date: 2008-01-19 03:45:15 +0000 (Sat, 19 Jan 2008)
New Revision: 1172

Added:
   trunk/packages/treeplot/trunk/debian/compat
Modified:
   trunk/packages/treeplot/trunk/debian/
   trunk/packages/treeplot/trunk/debian/changelog
   trunk/packages/treeplot/trunk/debian/control
   trunk/packages/treeplot/trunk/debian/rules
   trunk/packages/treeplot/trunk/treeplot/arbre.h
   trunk/packages/treeplot/trunk/treeplot/main.cpp
   trunk/packages/treeplot/trunk/treeplot/treeplotter.h
   trunk/packages/treeplot/trunk/treeplot/vecteurs.cpp
   trunk/packages/treeplot/trunk/treeplot/vecteurs.h
Log:
[svn-inject] Applying Debian modifications to trunk


Property changes on: trunk/packages/treeplot/trunk/debian
___________________________________________________________________
Name: mergeWithUpstream
   + 1

Modified: trunk/packages/treeplot/trunk/debian/changelog
===================================================================
--- trunk/packages/treeplot/trunk/debian/changelog	2008-01-19 03:44:23 UTC (rev 1171)
+++ trunk/packages/treeplot/trunk/debian/changelog	2008-01-19 03:45:15 UTC (rev 1172)
@@ -1,3 +1,18 @@
+treeplot (0.7-1.2) unstable; urgency=low
+
+  * NMU
+  * rebuild against new libraries
+
+ -- Vincent Danjean <Vincent.Danjean at ens-lyon.org>  Thu,  2 Feb 2006 22:21:26 +0100
+
+treeplot (0.7-1.1) unstable; urgency=low
+
+  * NMU
+  * bug fix to compile with current gcc
+  * dump to current debian standard
+
+ -- Vincent Danjean <Vincent.Danjean at ens-lyon.org>  Fri, 21 Jan 2005 16:28:57 +0100
+
 treeplot (0.7-1) unstable; urgency=low
 
   * Initial release.

Added: trunk/packages/treeplot/trunk/debian/compat
===================================================================
--- trunk/packages/treeplot/trunk/debian/compat	                        (rev 0)
+++ trunk/packages/treeplot/trunk/debian/compat	2008-01-19 03:45:15 UTC (rev 1172)
@@ -0,0 +1 @@
+4

Modified: trunk/packages/treeplot/trunk/debian/control
===================================================================
--- trunk/packages/treeplot/trunk/debian/control	2008-01-19 03:44:23 UTC (rev 1171)
+++ trunk/packages/treeplot/trunk/debian/control	2008-01-19 03:45:15 UTC (rev 1172)
@@ -3,9 +3,11 @@
 Priority: optional
 Maintainer: Olivier Langella <Olivier.Langella at pge.cnrs-gif.fr>
 Standards-Version: 3.2.1
+Build-Depends: libplot-dev
 
 Package: treeplot
 Architecture: any
-Depends: libplot (>> 2.4.1)
+Depends: ${shlibs:Depends}
 Description: Phylogenetic tree file converter (xfig, Phylip, Gif, Postscript, Adobe Illustrator)
  Treeplot is a conversion tool, from "Phylip" phylogenetic tree file to Postscript (.ps), Adobe Illustrator (.ai), Scalable Vector Graphic (.svg), Computer Graphic Metafile(.cgm), Hewlet Packard Graphic Language (.hpgl), xfig file (.fig), gif image file(.gif), PBM Portable aNy Map file (.pnm)
+

Modified: trunk/packages/treeplot/trunk/debian/rules
===================================================================
--- trunk/packages/treeplot/trunk/debian/rules	2008-01-19 03:44:23 UTC (rev 1171)
+++ trunk/packages/treeplot/trunk/debian/rules	2008-01-19 03:45:15 UTC (rev 1172)
@@ -1,50 +1,12 @@
 #!/usr/bin/make -f
-# Made with the aid of debmake, by Christoph Lameter,
-# based on the sample debian/rules file for GNU hello by Ian Jackson.
+# Sample debian/rules that uses cdbs.  Originaly written by Robert Millan.
+# This file is public domain.
+  
+include /usr/share/cdbs/1/class/autotools.mk
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
-package=treeplot
+CXXFLAGS += -fpermissive
 
-build:
-	$(checkdir)
-	./configure --prefix=/usr
-	$(MAKE) CFLAGS="-O2 -g -Wall"
-	touch build
-
-clean:
-	$(checkdir)
-	-rm -f build
-	-$(MAKE) distclean
-	-rm -f `find . -name "*~"`
-	-rm -rf debian/tmp debian/files* core debian/substvars
-
-binary-indep: checkroot build
-	$(checkdir)
-# There are no architecture-independent files to be uploaded
-# generated by this package.  If there were any they would be
-# made here.
-
-binary-arch: checkroot build
-	$(checkdir)
-	-rm -rf debian/tmp
-	install -d debian/tmp
-	cd debian/tmp && install -d `cat ../dirs`
-	$(MAKE) install prefix=`pwd`/debian/tmp/usr
-# Must have debmake installed for this to work. Otherwise please copy
-# /usr/bin/debstd into the debian directory and change debstd to debian/debstd
-	debstd ChangeLog README TODO 
-	dpkg-gencontrol -isp
-	chown -R root.root debian/tmp
-	chmod -R go=rX debian/tmp
-	dpkg --build debian/tmp ..
-
-define checkdir
-	test -f debian/rules
-endef
-
-binary: binary-indep binary-arch
-
-checkroot:
-	$(checkdir)
-	test root = "`whoami`"
-
-.PHONY: binary binary-arch binary-indep clean checkroot
+clean::
+	$(RM) -r autom4te.cache

Modified: trunk/packages/treeplot/trunk/treeplot/arbre.h
===================================================================
--- trunk/packages/treeplot/trunk/treeplot/arbre.h	2008-01-19 03:44:23 UTC (rev 1171)
+++ trunk/packages/treeplot/trunk/treeplot/arbre.h	2008-01-19 03:45:15 UTC (rev 1172)
@@ -22,13 +22,13 @@
 #ifndef ARBRE_H
 #define ARBRE_H
 
+#include "internat.h"
 #include <stdlib.h>
 #include <fstream>
 #include <vector>
 #include <string>
 #include <cmath>
 
-#include "internat.h"
 #include "matrices.h"
 
 class ArbreVectUINT:public vector<unsigned int>  {

Modified: trunk/packages/treeplot/trunk/treeplot/main.cpp
===================================================================
--- trunk/packages/treeplot/trunk/treeplot/main.cpp	2008-01-19 03:44:23 UTC (rev 1171)
+++ trunk/packages/treeplot/trunk/treeplot/main.cpp	2008-01-19 03:45:15 UTC (rev 1172)
@@ -19,10 +19,10 @@
 #include <config.h>
 #endif
 
+#include "appltreeplot.h"
 #include <iostream.h>
 #include <stdlib.h>
 
-#include "appltreeplot.h"
 
 int main(int argc, char *argv[])
 {

Modified: trunk/packages/treeplot/trunk/treeplot/treeplotter.h
===================================================================
--- trunk/packages/treeplot/trunk/treeplot/treeplotter.h	2008-01-19 03:44:23 UTC (rev 1171)
+++ trunk/packages/treeplot/trunk/treeplot/treeplotter.h	2008-01-19 03:45:15 UTC (rev 1172)
@@ -86,8 +86,8 @@
 	double _decolleX;
 	double _decolleY;
 
-friend PointPlotArbreInd;
-friend PointPlotArbreNoeud;
+friend class PointPlotArbreInd;
+friend class PointPlotArbreNoeud;
 
 protected: // Protected methods
   /** Dessin de l'arbre */

Modified: trunk/packages/treeplot/trunk/treeplot/vecteurs.cpp
===================================================================
--- trunk/packages/treeplot/trunk/treeplot/vecteurs.cpp	2008-01-19 03:44:23 UTC (rev 1171)
+++ trunk/packages/treeplot/trunk/treeplot/vecteurs.cpp	2008-01-19 03:45:15 UTC (rev 1172)
@@ -16,7 +16,7 @@
  ***************************************************************************/
 
 
-//#include <strstream>
+#include <strstream>
 
 using namespace std;
 

Modified: trunk/packages/treeplot/trunk/treeplot/vecteurs.h
===================================================================
--- trunk/packages/treeplot/trunk/treeplot/vecteurs.h	2008-01-19 03:44:23 UTC (rev 1171)
+++ trunk/packages/treeplot/trunk/treeplot/vecteurs.h	2008-01-19 03:45:15 UTC (rev 1172)
@@ -26,6 +26,8 @@
 #include <vector>
 #include <string>
 
+using namespace std;
+
 class VecteurLD:public vector<long double>  {
 };

More information about the debian-med-commit mailing list