[Pkg-emboss-commits] r52 - in emboss/trunk/debian: . patches

charles-guest at alioth.debian.org charles-guest at alioth.debian.org
Mon Jun 4 12:05:53 UTC 2007


Author: charles-guest
Date: 2007-06-04 12:05:53 +0000 (Mon, 04 Jun 2007)
New Revision: 52

Added:
   emboss/trunk/debian/patches/README.fixes.upstream.2007-03-21
   emboss/trunk/debian/patches/abiview.c
   emboss/trunk/debian/patches/ajgraph
   emboss/trunk/debian/patches/dbiflat.c
   emboss/trunk/debian/patches/series
Removed:
   emboss/trunk/debian/patches/00list
Modified:
   emboss/trunk/debian/changelog
   emboss/trunk/debian/control
   emboss/trunk/debian/rules
Log:
Swiching to quilt; applying latest fixes

Modified: emboss/trunk/debian/changelog
===================================================================
--- emboss/trunk/debian/changelog	2007-05-30 02:08:16 UTC (rev 51)
+++ emboss/trunk/debian/changelog	2007-06-04 12:05:53 UTC (rev 52)
@@ -2,8 +2,15 @@
 
   * Added /etc/emboss/embossrc.d directory for future modular
     configuration.
+  * Swiched from dpatch to quilt
+  * Applying latest fixes from ftp://emboss.open-bio.org/pub/EMBOSS/fixes
+    - Solves a display problem with abiview.
+    - Solves a display problem with banana and prettyplot.
+  * Applying a dbiflat.c fix from
+    http://lists.open-bio.org/pipermail/emboss/2007-May/002941.html
+    to inded lowercase IDs in EMBL-formatted databases.
 
- -- Charles Plessy <charles-debian-nospam at plessy.org>  Wed, 25 Apr 2007 22:57:20 +0900
+ -- Charles Plessy <charles-debian-nospam at plessy.org>  Mon,  4 Jun 2007 13:28:33 +0900
 
 emboss (4.1.0-1) experimental; urgency=low
 

Modified: emboss/trunk/debian/control
===================================================================
--- emboss/trunk/debian/control	2007-05-30 02:08:16 UTC (rev 51)
+++ emboss/trunk/debian/control	2007-06-04 12:05:53 UTC (rev 52)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian EMBOSS Packaging Team <pkg-emboss-devel at lists.alioth.debian.org>
 Uploaders: Charles Plessy <charles-debian-nospam at plessy.org>, Matt Hope <dopey at debian.org>, Nelson A. de Oliveira <naoliv at debian.org>
-Build-Depends: debhelper (>= 5), dpatch, libx11-dev, x-dev, libgdchart-gd2-xpm-dev, zlib1g-dev, libpng12-dev, libpcre3-dev
+Build-Depends: debhelper (>= 5), quilt, libx11-dev, x-dev, libgdchart-gd2-xpm-dev, zlib1g-dev, libpng12-dev, libpcre3-dev
 XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-emboss/emboss/trunk/debian
 XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-emboss/emboss/
 Standards-Version: 3.7.2

Deleted: emboss/trunk/debian/patches/00list
===================================================================
--- emboss/trunk/debian/patches/00list	2007-05-30 02:08:16 UTC (rev 51)
+++ emboss/trunk/debian/patches/00list	2007-06-04 12:05:53 UTC (rev 52)
@@ -1 +0,0 @@
-

Added: emboss/trunk/debian/patches/README.fixes.upstream.2007-03-21
===================================================================
--- emboss/trunk/debian/patches/README.fixes.upstream.2007-03-21	                        (rev 0)
+++ emboss/trunk/debian/patches/README.fixes.upstream.2007-03-21	2007-06-04 12:05:53 UTC (rev 52)
@@ -0,0 +1,20 @@
+The files in this directory are bugfix replacements for files in
+the EMBOSS-4.1.0 distribution. Just drop the replacement files in
+the location shown and redo the 'make install.'
+
+
+Fix 1. EMBOSS-4.1.0/ajax/ajgraph.c
+       EMBOSS-4.1.0/ajax/ajgraph.h
+       EMBOSS-4.1.0/ajax/ajgraphstruct.h
+       EMBOSS-4.1.0/emboss/abiview.c
+
+21 Mar 2007: Fixes a problem with preserving plot titles when graphics
+output is on more than one page. This was added in release 4.1.0 but
+three applications had problems. Prettyplot and banana rescaled their
+graphics badly from page 2, and abiview produced blank pages in
+between real pages. Plot subtitles were slightly smaller after the
+first page.
+
+Also fixes a problem with scaling the sequence in abiview output and a
+problem in abiview with displaying the traces in separate plots.
+

Added: emboss/trunk/debian/patches/abiview.c
===================================================================
--- emboss/trunk/debian/patches/abiview.c	                        (rev 0)
+++ emboss/trunk/debian/patches/abiview.c	2007-06-04 12:05:53 UTC (rev 52)
@@ -0,0 +1,124 @@
+This patches comes from ftp://emboss.open-bio.org/pub/EMBOSS/fixes and fixes a
+display problem in abiview.
+
+--- ./emboss/abiview.c.old	2007-02-20 18:56:27.000000000 +0900
++++ ./emboss/abiview.c	2007-06-01 15:05:49.000000000 +0900
+@@ -38,10 +38,11 @@
+ 						ajint nstop,
+ 						const AjPShort basePositions,
+ 						const AjPStr nseq,
+-						float tmax, ajint nt);
++						float tmax, float scale,
++						ajint nt);
+ 
+ static void abiview_TextDisplay(AjPGraph graphs, ajint nstart, ajint nstop,
+-				const AjPStr nseq, float tmax);
++				const AjPStr nseq, float tmax, float scale);
+ 
+ static AjBool abiview_drawbase(const char* res, const AjPStr baseN);
+ static ajint  abiview_getResColour(char B);
+@@ -112,6 +113,7 @@
+     /* BYTE[i] is a byte mask for byte i */
+     const ajlong BYTE[] = { 0x000000ff };
+ 
++    float scale = 1.0;
+ 
+     ajGraphInit("abiview", argc, argv);
+ 
+@@ -254,12 +256,13 @@
+ 	/* Sequence text display */
+ 	if(dseq)
+ 	{
++	    scale = (40.0 / (float) window);
+ 	    if(!overlay)
+ 		gd5 = abiview_graphTextDisplay(graphs,nstart,nstop,
+ 					       basePositions,nseq,
+-					       tmax,strace);
++					       tmax,scale, strace);
+ 	    else
+-		abiview_TextDisplay(graphs,nstart,nstop,nseq,tmax);
++		abiview_TextDisplay(graphs,nstart,nstop,nseq,tmax, scale);
+ 	}
+ 
+ 	strace = ntrace;
+@@ -283,9 +286,6 @@
+ 		else
+ 		    ajGraphClear(graphs); /* free seq text mem */
+ 	    }
+-
+-
+-	    ajGraphNewPage(graphs,ajFalse);	/* display new page  */
+ 	}
+ 
+ 	nstart = nstop-1;
+@@ -300,9 +300,6 @@
+     if(dseq && overlay)
+ 	ajGraphClear(graphs);   /* free seq text mem */
+ 
+-    if(dseq && !overlay)
+-	ajGraphPlpDataDel(&gd5);  /* free seq text mem */
+-
+     ajGraphxyDel(&graphs);
+     ajInt2dDel(&trace);
+     ajShortDel(&basePositions);
+@@ -410,6 +407,7 @@
+ ** @param [r] basePositions [const AjPShort] Base positions
+ ** @param [r] nseq [const AjPStr] Sequence number
+ ** @param [r] tmax [float] Maximum
++** @param [r] scale [float] Character scale
+ ** @param [r] nt [ajint] Nt data
+ ** @return [AjPGraphPlpData] graph data object containing the sequence text
+ **
+@@ -419,7 +417,7 @@
+ 					     ajint nstop,
+ 					     const AjPShort basePositions,
+ 					     const AjPStr nseq,
+-					     float tmax, ajint nt)
++					     float tmax, float scale, ajint nt)
+ {
+     ajint i;
+     ajint colres;
+@@ -430,14 +428,16 @@
+     res[1]='\0';
+ 
+     /* create graph data object */
++
+     gdata = ajGraphPlpDataNewI(ajShortGet(basePositions,nstop-1)-nt);
+ 
+     for(i=nstart;i<nstop;i++)
+     {
+ 	*res = ajStrGetCharPos(nseq,i);
+ 	colres = abiview_getResColour(*res);
+-	ajGraphPlpDataAddText(gdata,(float)i+(float)1.,tmax+(float)75.,colres,
+-			      res);
++	ajGraphPlpDataAddTextScale(gdata,(float)i+(float)1.,
++				   tmax+(float)75.,colres, scale,
++				   res);
+     }
+ 
+     ajGraphPlpDataSetMaxMin(gdata,(float)nstart+1,
+@@ -462,12 +462,13 @@
+ ** @param [r] nstop [ajint] Stop
+ ** @param [r] nseq [const AjPStr] Sequence number
+ ** @param [r] tmax [float] Maximum
++** @param [r] scale [float] Character scale
+ ** @return [void]
+ **
+ ******************************************************************************/
+ 
+ static void abiview_TextDisplay(AjPGraph graphs, ajint nstart, ajint nstop,
+-				const AjPStr nseq, float tmax)
++				const AjPStr nseq, float tmax, float scale)
+ {
+     ajint i;
+     ajint colres;
+@@ -479,7 +480,8 @@
+     {
+ 	*res = ajStrGetCharPos(nseq,i);
+ 	colres = abiview_getResColour(*res);
+-	ajGraphAddText(graphs,(float)i+(float)1.,tmax+(float)30.,colres,res);
++	ajGraphAddTextScale(graphs,(float)i+(float)1.,tmax+(float)30.,
++			    colres, scale, res);
+     }
+ 
+     return;

Added: emboss/trunk/debian/patches/ajgraph
===================================================================
--- emboss/trunk/debian/patches/ajgraph	                        (rev 0)
+++ emboss/trunk/debian/patches/ajgraph	2007-06-04 12:05:53 UTC (rev 52)
@@ -0,0 +1,384 @@
+These patches come from ftp://emboss.open-bio.org/pub/EMBOSS/fixes and fix a
+display problem in banana and prettyplot. -- Charles
+
+diff -u ajax.old/ajgraph.c ajax/ajgraph.c
+--- ./ajax.old/ajgraph.c	2007-02-20 23:45:38.000000000 +0900
++++ ./ajax/ajgraph.c	2007-06-01 15:10:46.000000000 +0900
+@@ -503,6 +503,7 @@
+ 
+ static ajint currentfgcolour  = BLACK;     /* Use ajGraphSetFore to change */
+ static ajint currentbgwhite = 1;      /* By default use a white background */
++static float currentcharsize   = 4.0; /* Use ajGraphSetCharSize to change */
+ static float currentcharscale  = 1.0; /* Use ajGraphSetCharScale to change */
+ static ajint currentlinestyle = 1;     /* Use ajGraphSetLineStyle to change*/
+ static ajint currentfillpattern = 1;     /* Use ajGraphSetLineStyle to change*/
+@@ -540,6 +541,7 @@
+ {
+     plschr((PLFLT)size, 1.0);
+     currentcharscale = 1.0;
++    currentcharsize = size;
+ }
+ 
+ 
+@@ -1088,11 +1090,14 @@
+ 
+     if(graphData)
+     {
++	ajDebug("GraphClose deleting graphData '%F' '%S'.'%S'\n",
++		graphData->File, graphData->FName, graphData->Ext);
+ 	ajListstrDel(&graphData->List);
+ 	ajFileClose(&graphData->File);
+ 	ajStrDel(&graphData->FName);
+ 	ajStrDel(&graphData->Ext);
+ 	AJFREE(graphData);
++	ajDebug("=g= plend()\n");
+  	plend();
+     }
+     else
+@@ -1265,7 +1270,8 @@
+     ajDebug("=g= plmtex('t', 2.5, 0.5, 0.5, '%S') [title]\n", tmpstr);
+     if(ajStrGetLen(tmpstr)) {
+ 	fold = ajGraphSetCharScale(1.0);
+-	ajDebug("GraphLabelTitle title fold: %.3f\n", fold);
++	ajDebug("GraphLabelTitle title fold: %.3f size: %.3f scale %.3f\n",
++		fold, currentcharsize, currentcharscale);
+ 	plmtex("t", (PLFLT) 4.0, (PLFLT) 0.5, (PLFLT) 0.5,
+ 	       ajStrGetPtr(tmpstr));
+ 	fold = ajGraphSetCharScale(fold);
+@@ -1281,8 +1287,9 @@
+     if(ajStrGetLen(tmpstr))
+     {
+ 	fold = ajGraphSetCharScale(1.0);
+-	ajGraphSetCharScale(fold/(float)2.0);
+-	ajDebug("GraphLabelTitle subtitle fold: %.3f\n", fold);
++	ajGraphSetCharScale(0.5);
++	ajDebug("GraphLabelTitle subtitle fold: %.3f size: %.3f scale %.3f\n",
++		fold, currentcharsize, currentcharscale);
+ 	plmtex("t", (PLFLT) 5.0, (PLFLT) 0.5, (PLFLT) 0.5,
+ 	       ajStrGetPtr(tmpstr));
+ 	fold = ajGraphSetCharScale(fold);
+@@ -1421,6 +1428,7 @@
+ 	thys->plplot->xend = xmax;
+ 	thys->plplot->ystart = ymin;
+ 	thys->plplot->yend = ymax;
++	thys->plplot->windowset = ajTrue;
+     }
+     GraphSetWin(xmin, xmax, ymin, ymax);
+ 
+@@ -1444,6 +1452,7 @@
+ void ajGraphNewPage(AjPGraph thys, AjBool resetdefaults)
+ {
+     ajint old;
++    ajint cold;
+     float fold;
+ 
+ 
+@@ -1465,10 +1474,8 @@
+     else
+     {
+ 	/* pladv resets every thing so need */
+-	/* to get the old copy */
+-	old = ajGraphSetFore(BLACK);
+-	/* then set in again */
+-	ajGraphSetFore(old);
++	/* to get the old copies */
++	cold = ajGraphSetFore(BLACK);
+ 	fold = ajGraphSetCharScale(0.0);
+ 	old = ajGraphSetLineStyle(0);
+ 	ajGraphTrace(thys);
+@@ -1479,14 +1486,16 @@
+ 			     ajStrGetPtr(thys->plplot->title) : " "),
+ 			    ((thys->plplot->flags & AJGRAPH_SUBTITLE) ?
+ 			     ajStrGetPtr(thys->plplot->subtitle) : " "));
+-	    if(thys->plplot->minmaxcalc)
++
++	    if(thys->plplot->windowset)
+ 		GraphSetWin(thys->plplot->xstart, thys->plplot->xend,
+ 			    thys->plplot->ystart, thys->plplot->yend);
+ 	    else
+ 		GraphSetWin(0.0, 480.0,
+ 			    0.0, 640.0);
+-
+ 	}
++	/* then set it again */
++	ajGraphSetFore(cold);
+ 	ajGraphSetCharScale(fold);
+ 	ajGraphSetLineStyle(old);
+     }
+@@ -1495,8 +1504,6 @@
+ }
+ 
+ 
+-
+-
+ /* @func ajGraphCloseWin ******************************************************
+ **
+ ** Close current window.
+@@ -3243,6 +3250,31 @@
+ 
+ 
+ 
++/* @func ajGraphSetCharSize ***************************************************
++**
++** Set the character size factor
++**
++** @param [r] size [float]  character size.
++** @return [float] the previous character size factor.
++** @@
++******************************************************************************/
++
++float ajGraphSetCharSize(float size)
++{
++    float oldsize;
++
++    oldsize = currentcharsize;
++    if(size)
++    {
++	currentcharsize = size;
++	plschr((PLFLT)size, 1.0);
++    }
++    return oldsize;
++}
++
++
++
++
+ /* @funcstatic GraphCheckPoints ***********************************************
+ **
+ ** Prints a list of data points from two floating point arrays.
+@@ -4592,8 +4624,9 @@
+ 	    graphdata = (thys->plplot->graphs)[i];
+ 	    if (graphdata)
+ 	    {
+-		ajDebug("ajGraphxyDel graphs[%d] xcalc:%B ycalc:%B\n",
+-			i, graphdata->xcalc, graphdata->ycalc);
++		ajDebug("ajGraphxyDel graphs[%d] xcalc:%B ycalc:%B x:%x y:%x\n",
++			i, graphdata->xcalc, graphdata->ycalc,
++			graphdata->x, graphdata->y);
+ 
+ 		if(!graphdata->xcalc)
+ 		    AJFREE(graphdata->x);
+@@ -6170,6 +6203,62 @@
+     Obj->yy1 = yy1;
+     Obj->yy2 = 0.0;
+     Obj->colour = colour;
++    Obj->scale = 0.0;
++    Obj->next = 0;
++
++    return;
++}
++
++
++
++
++/* @func ajGraphAddTextScale **************************************************
++**
++** Add text to be drawn when the graph is plotted.
++**
++** @param [u] thys [AjPGraph] Graph object
++** @param [r] xx1 [float] Start x position
++** @param [r] yy1 [float] Start y position
++** @param [r] colour [ajint] Colour code (see PLPLOT)
++** @param [r] scale [float] Character scale (0.0 to use the default)
++** @param [r] text [const char*] Text
++**
++** @return [void]
++** @@
++******************************************************************************/
++
++void ajGraphAddTextScale(AjPGraph thys, float xx1, float yy1,
++			 ajint colour, float scale, const char *text)
++{
++    AjPGraphPlpObj Obj;
++
++    if (!thys->plplot)
++	return;
++    if(!thys->plplot->Obj)
++    {
++	AJNEW((thys->plplot->Obj));
++	Obj = thys->plplot->Obj;
++    }
++    else
++    {
++	Obj = thys->plplot->Obj;
++	while(Obj->next)
++	    Obj = Obj->next;
++	AJNEW(Obj->next);
++	Obj = Obj->next;
++    }
++
++    ++thys->plplot->numofobjects;
++
++
++    Obj->type = TEXT;
++    Obj->text = ajStrNewC(text);
++    Obj->xx1 = xx1;
++    Obj->xx2 = 0.0;
++    Obj->yy1 = yy1;
++    Obj->yy2 = 0.0;
++    Obj->colour = colour;
++    Obj->scale = scale;
+     Obj->next = 0;
+ 
+     return;
+@@ -6390,6 +6479,7 @@
+ {
+     AjPGraphPlpObj Obj;
+     ajint temp;
++    float cold = 1.0;
+ 
+     /* graphdata : calls ajGraphLine etc. */
+ 
+@@ -6418,10 +6508,14 @@
+ 	    }
+ 	    else if(Obj->type == TEXT )
+ 	    {
++		if(Obj->scale)
++		    cold = ajGraphSetCharScale(Obj->scale);
+ 		temp = ajGraphSetFore(Obj->colour);
+ 		ajGraphTextStart(Obj->xx1, Obj->yy1,
+ 				 ajStrGetPtr(Obj->text));
+ 		ajGraphSetFore(temp);
++		if(Obj->scale)
++		    ajGraphSetCharScale(cold);
+ 	    }
+ 	    else if(Obj->type == LINE)
+ 	    {
+@@ -6584,6 +6678,62 @@
+     Obj->yy1 = yy1;
+     Obj->yy2 = 0.0;
+     Obj->colour = colour;
++    Obj->scale = 0.0;
++    Obj->next = 0;
++
++    return;
++}
++
++
++
++
++/* @func ajGraphPlpDataAddTextScale *******************************************
++**
++** Add Text to be drawn when the graph is plotted.
++**
++** @param [u] graphdata [AjPGraphPlpData] Graph data object
++** @param [r] xx1 [float] Start x position
++** @param [r] yy1 [float] Start y position
++** @param [r] colour [ajint] Colour code (see PLPLOT)
++** @param [r] scale [float] Character scale (0.0 to use the default)
++** @param [r] text [const char*] Text to add
++**
++** @return [void]
++** @@
++******************************************************************************/
++
++void ajGraphPlpDataAddTextScale(AjPGraphPlpData graphdata,
++				float xx1, float yy1,
++				ajint colour, float scale, const char *text)
++{
++    AjPGraphPlpObj Obj;
++
++    if(!graphdata->Obj)
++    {
++	AJNEW((graphdata->Obj));
++	Obj = graphdata->Obj;
++    }
++    else			   /* cycle through till NULL found */
++    {
++	Obj = graphdata->Obj;
++	while(Obj->next)
++	    Obj = Obj->next;
++	AJNEW(Obj->next);
++	Obj = Obj->next;
++    }
++
++    ++graphdata->numofobjects;
++
++
++    Obj->type = TEXT;
++    Obj->text = 0;
++    ajStrAssignEmptyC(&Obj->text,text);
++    Obj->xx1 = xx1;
++    Obj->xx2 = 0.0;
++    Obj->yy1 = yy1;
++    Obj->yy2 = 0.0;
++    Obj->colour = colour;
++    Obj->scale = scale;
+     Obj->next = 0;
+ 
+     return;
+diff -u ajax.old/ajgraph.h ajax/ajgraph.h
+--- ./ajax.old/ajgraph.h	2007-01-31 21:44:35.000000000 +0900
++++ ./ajax/ajgraph.h	2007-06-01 15:10:41.000000000 +0900
+@@ -96,6 +96,10 @@
+ void          ajGraphPlpDataAddText (AjPGraphPlpData graphs,
+ 				     float xx1, float yy1,
+ 				     ajint colour, const char *text);
++void          ajGraphPlpDataAddTextScale (AjPGraphPlpData graphs,
++					  float xx1, float yy1,
++					  ajint colour, float scale,
++					  const char *text);
+ void          ajGraphPlpDataSetMaxMin (AjPGraphPlpData graphdata, float xmin,
+ 				      float xmax, float ymin, float ymax);
+ void          ajGraphArrayMaxMin(const float *array, ajint npoints, float *min,
+@@ -145,11 +149,15 @@
+ AjPGraph      ajGraphNew (void);
+ void          ajGraphNewPage (AjPGraph thys, AjBool resetdefaults);
+ void          ajGraphAddLine (AjPGraph thys, float xx1, float yy1,
+-				 float xx2, float yy2, ajint colour);
++			      float xx2, float yy2, ajint colour);
+ void          ajGraphAddRect (AjPGraph thys, float xx1, float yy1,
+-				 float xx2, float yy2, ajint colour, ajint fill);
++			      float xx2, float yy2, ajint colour,
++			      ajint fill);
+ void          ajGraphAddText (AjPGraph thys, float xx1, float yy1,
+ 				 ajint colour, const char *text);
++void          ajGraphAddTextScale (AjPGraph thys, float xx1, float yy1,
++				   ajint colour, float scale,
++				   const char *text);
+ void          ajGraphPlpDataDel(AjPGraphPlpData *thys);
+ void          ajGraphOpen (AjPGraph thys, PLFLT xmin, PLFLT xmax,
+ 			   PLFLT ymin, PLFLT ymax, ajint flags);
+@@ -167,6 +175,7 @@
+ void          ajGraphSetBackBlack (void);
+ void          ajGraphSetBackWhite (void);
+ float         ajGraphSetCharScale (float scale);
++float         ajGraphSetCharSize(float size);
+ void          ajGraphSetDesc(AjPGraph thys, const AjPStr title);
+ void          ajGraphSetDevice(const AjPGraph thys);
+ void          ajGraphSetDir(AjPGraph thys, const AjPStr txt);
+diff -u ajax.old/ajgraphstruct.h ajax/ajgraphstruct.h
+--- ./ajax.old/ajgraphstruct.h	2007-02-10 03:30:58.000000000 +0900
++++ ./ajax/ajgraphstruct.h	2007-06-01 15:10:35.000000000 +0900
+@@ -17,6 +17,7 @@
+ ** @attr xx2 [float] x end
+ ** @attr yy1 [float] y start
+ ** @attr yy2 [float] y end
++** @attr scale [float] scale for text (0.0 to use the default)
+ ** @attr next [struct AjSGraphPlpObj*] link to next object in the list
+ ** @@
+ ******************************************************************************/
+@@ -29,6 +30,7 @@
+   float xx2;
+   float yy1;
+   float yy2;
++  float scale;
+   struct AjSGraphPlpObj *next;
+ } AjOGraphPlpObj;
+ #define AjPGraphPlpObj AjOGraphPlpObj*
+@@ -107,6 +109,7 @@
+ ** @attr yend [float] Last y value to plot
+ ** @attr ready [AjBool] Set by plplot device init
+ ** @attr minmaxcalc [AjBool] Set true when (xy)start/end are set
++** @attr windowset [AjBool] Set true when (xy) window coordinates are set
+ ** @attr isdata [AjBool] True for a data type graph
+ ** @attr displaytype [ajint] Displaytype index to graphType
+ ** @attr desc [AjPStr] Plot description, used to set default title
+@@ -135,6 +138,7 @@
+   float yend;
+   AjBool ready;
+   AjBool minmaxcalc;
++  AjBool windowset;
+   AjBool isdata;
+   ajint displaytype;
+   AjPStr desc;

Added: emboss/trunk/debian/patches/dbiflat.c
===================================================================
--- emboss/trunk/debian/patches/dbiflat.c	                        (rev 0)
+++ emboss/trunk/debian/patches/dbiflat.c	2007-06-04 12:05:53 UTC (rev 52)
@@ -0,0 +1,13 @@
+This patch comes from Peter Rice and is needded for indexing EMBL-format
+databases whith lowercase IDs.
+http://lists.open-bio.org/pipermail/emboss/2007-May/002941.html
+--- ./emboss/dbiflat.c.old	2007-06-01 15:00:55.000000000 +0900
++++ ./emboss/dbiflat.c	2007-06-01 15:03:59.000000000 +0900
+@@ -739,6 +739,7 @@
+ 	{
+ 	    ajRegExec(regEmblId, rline);
+ 	    ajRegSubI(regEmblId, 1, myid);
++	    ajStrFmtUpper(myid);
+ 	    ajDebug("++id '%S'\n", *myid);
+ 	    ajRegSubI(regEmblId, 3, &tmpfd);
+ 	    if(svnfield >= 0 && ajStrGetLen(tmpfd))

Added: emboss/trunk/debian/patches/series
===================================================================
--- emboss/trunk/debian/patches/series	                        (rev 0)
+++ emboss/trunk/debian/patches/series	2007-06-04 12:05:53 UTC (rev 52)
@@ -0,0 +1,3 @@
+abiview.c
+ajgraph
+dbiflat.c

Modified: emboss/trunk/debian/rules
===================================================================
--- emboss/trunk/debian/rules	2007-05-30 02:08:16 UTC (rev 51)
+++ emboss/trunk/debian/rules	2007-06-04 12:05:53 UTC (rev 52)
@@ -10,7 +10,7 @@
 		#--with-javaos=/usr/lib/j2sdk1.3/include/linux \
 		#--with-x \
 
-include /usr/share/dpatch/dpatch.make
+include /usr/share/quilt/quilt.make
 
 build: patch build-stamp debian/copyright
 build-stamp: config.status




More information about the Pkg-emboss-commits mailing list