[SCM] General FITS file browser/editor/plotter with a gui branch, debian, updated. 656835da906961b4c35cbe2c04213640203c514f

Thu Sep 20 05:55:50 UTC 2012

The following commit has been merged in the debian branch:
commit 656835da906961b4c35cbe2c04213640203c514f
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Thu Sep 20 07:54:57 2012 +0200

    Update debian to release 5.4

diff --git a/debian/changelog b/debian/changelog
index a56c2b4..8884506 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,7 @@
-ftools-fv (5.3+dfsg-1) unstable; urgency=low
+ftools-fv (5.4+dfsg-1) unstable; urgency=low
 
   * Initial release. Closes: #682205
   * Replaces old "fv" package. Closes: #527670, #359142, #473002, #499725,
     #592693, #259548
 
- -- Ole Streicher <debian at liska.ath.cx>  Mon, 03 Sep 2012 12:15:00 +0200
+ -- Ole Streicher <debian at liska.ath.cx>  Thu, 20 Sep 2012 07:51:28 +0200
diff --git a/debian/patches/fv_fix_initial_menubar.patch b/debian/patches/fv_fix_initial_menubar.patch
index 9203ba0..e8af746 100644
--- a/debian/patches/fv_fix_initial_menubar.patch
+++ b/debian/patches/fv_fix_initial_menubar.patch
@@ -27,14 +27,14 @@ Bug: http://sourceforge.net/tracker/?func=detail&aid=3561016&group_id=12997&atid
  
 --- a/ftools/guis/fv/class/fvApp.tcl
 +++ b/ftools/guis/fv/class/fvApp.tcl
-@@ -412,8 +412,8 @@
-        font create g_titleFont -family system    -size -12
-        font create g_notebookTitleFont -family system -size -14
+@@ -419,8 +419,8 @@
+        font create g_titleFont -family system    -size -$fvPref::FontSize
+        font create g_notebookTitleFont -family system -size -[expr $fvPref::FontSize + 2]
      } else {
--       font create g_titleFont -family Helvetica -size -12 -weight bold
--       font create g_notebookTitleFont -family Helvetica -size -14 -weight bold
-+       font create g_titleFont -family Helvetica -size -12
-+       font create g_notebookTitleFont -family Helvetica -size -14
+-       font create g_titleFont -family Helvetica -size -$fvPref::FontSize -weight bold
+-       font create g_notebookTitleFont -family Helvetica -size -[expr $fvPref::FontSize + 2] -weight bold
++       font create g_titleFont -family Helvetica -size -$fvPref::FontSize
++       font create g_notebookTitleFont -family Helvetica -size -[expr $fvPref::FontSize + 2]
      }
  
-     font create g_entryFont -family Courier -size -12
+     font create g_entryFont -family Courier -size -$fvPref::FontSize
diff --git a/debian/patches/pow_fix_compilerwarnings.patch b/debian/patches/pow_fix_compilerwarnings.patch
index 80bf27d..f5b647e 100644
--- a/debian/patches/pow_fix_compilerwarnings.patch
+++ b/debian/patches/pow_fix_compilerwarnings.patch
@@ -103,7 +103,7 @@ Description: Fix many compiler warnings. Most of them are because of
      
  #if !(defined(__WIN32__) || defined(macintosh))
    char data_name[256];
-@@ -1987,7 +1987,7 @@
+@@ -1992,7 +1992,7 @@
  			  int argc, char *argv[]) {
    /* usage: powCreateDataFromList data_name list_o_data*/
    int largc;
@@ -112,7 +112,7 @@ Description: Fix many compiler warnings. Most of them are because of
    double *data, *datacounter;
    int i,j;
    int status = 0;
-@@ -2126,7 +2126,7 @@
+@@ -2131,7 +2131,7 @@
     char *graphName;
     int len;
     char *idxStr;
@@ -121,7 +121,7 @@ Description: Fix many compiler warnings. Most of them are because of
     int zoomed;
     int xCount, yCount;
     int graph_is_scope;
-@@ -2257,7 +2257,7 @@
+@@ -2262,7 +2262,7 @@
     char *graphName;
     int len;
     char *idxStr;
@@ -130,7 +130,7 @@ Description: Fix many compiler warnings. Most of them are because of
     int zoomed;
     int xCount, yCount;
     int graph_is_scope;
-@@ -2373,7 +2373,7 @@
+@@ -2378,7 +2378,7 @@
     char *canvas=".pow.pow";
     char *graphName, *operation, *direction;
     int wcsStatus;
@@ -139,7 +139,7 @@ Description: Fix many compiler warnings. Most of them are because of
     char powWCS[7]="powWCS";
     char curveName[512];
     struct wcsprm wcs;
-@@ -2865,7 +2865,7 @@
+@@ -2870,7 +2870,7 @@
    char *sign;
    char *regionFile;
    double *dataPar;
@@ -418,7 +418,7 @@ Description: Fix many compiler warnings. Most of them are because of
  
     if ( WCS->graphName[0] != '\0' && strcmp(WCS->graphName, "NULL") != 0 ) {
        str = Tcl_GetVar2(interp,"useWCSInfo",WCS->graphName,TCL_GLOBAL_ONLY);
-@@ -733,7 +733,7 @@
+@@ -741,7 +741,7 @@
     char powFitsHeaderCnt[17]="powFitsHeaderCnt";
     int i, relax, HDRcnt, ctrl, nreject=0, nwcs=0;
     struct wcsprm *wcs;
@@ -427,7 +427,7 @@ Description: Fix many compiler warnings. Most of them are because of
  
     /* input */
     int ncoord, nelem;
-@@ -747,7 +747,7 @@
+@@ -755,7 +755,7 @@
     int coordSel;
  
     int useWCSInfo;
@@ -496,16 +496,16 @@ Description: Fix many compiler warnings. Most of them are because of
  int PowFindCurvesValue (char *, char *, int, double *); 
  int PowFindCurvesBBox(char *, char *, double *, double *,
  		      double *, double *, WCSdata *);
-@@ -245,7 +245,7 @@
- int PowSortGraphMinMax(PowGraph *, double *, double *,double *, double *,
- 		       double *, double *);
+@@ -247,7 +247,7 @@
+ 
+ void powDebugDataPrint (char *, int, WCSdata *, int, char *);
  
 -char *PowGetObjectOption(char *gn, char *obj, char *option, char *objType);
 +const char *PowGetObjectOption(char *gn, const char *obj, char *option, char *objType);
  
  #ifdef __WIN32__
    __int64 PowExtractDatumLong(PowData *, int);
-@@ -255,9 +255,9 @@
+@@ -257,9 +257,9 @@
  
  double PowExtractDatum(PowData *, int);
  int PowPutDatum(PowData *,double,int);
diff --git a/debian/patches/pow_fix_startup.patch b/debian/patches/pow_fix_startup.patch
index 686f08c..987e2b0 100644
--- a/debian/patches/pow_fix_startup.patch
+++ b/debian/patches/pow_fix_startup.patch
@@ -39,15 +39,7 @@ Description: Replace the startup script by something simpler, and set the
  
      event delete <<BtnPress>> <ButtonPress-1> <ButtonPress-2> <ButtonPress-3>
      event delete <<LUT>>      <ButtonPress-1> <ButtonPress-2> <ButtonPress-3>
-@@ -5401,7 +5401,6 @@
-         if [info exists powPlotParam(xdimdisp,$currgn)] {
-            set powPlotParam(xdimdisp,powDef) $powPlotParam(xdimdisp,$currgn)
-            set powPlotParam(ydimdisp,powDef) $powPlotParam(ydimdisp,$currgn)
--           set result [$fvPrefObj setNewGraphSize [list $powPlotParam(xdimdisp,$currgn) $powPlotParam(ydimdisp,$currgn)]]
-         } 
-         puts $RCFILE "\n# Default Graph Parameters:"
- 	foreach opt $powPlotParam(allOpts,powDef) {
-@@ -9238,8 +9237,6 @@
+@@ -9251,8 +9251,6 @@
      set powWCSName(${cntr}scope) $powWCSName($gn)
      powCreateContour $cntr $img $list $res
      set powContourParam(list) $list
diff --git a/debian/patches/pow_update_photo.patch b/debian/patches/pow_update_photo.patch
index 80ab21d..8c4f0b2 100644
--- a/debian/patches/pow_update_photo.patch
+++ b/debian/patches/pow_update_photo.patch
@@ -14,7 +14,7 @@ Description: Insert "Tcl_Interp *interp" as first argument to Tk_PhotoXXX()
    return TCL_OK;
 --- a/tcltk/pow/PowCommands.c
 +++ b/tcltk/pow/PowCommands.c
-@@ -3037,11 +3037,11 @@
+@@ -3042,11 +3042,11 @@
               || (x < 0) || (y < 0) )
           return;
       if( (zoomX == 1.0) && (zoomY == 1.0) ) {
@@ -28,7 +28,7 @@ Description: Insert "Tcl_Interp *interp" as first argument to Tk_PhotoXXX()
       Tk_PhotoGetImage(handle, &destBlockPtr);
  
       /*
-@@ -3110,5 +3110,5 @@
+@@ -3115,5 +3115,5 @@
           }
       }
  

-- 
General FITS file browser/editor/plotter with a gui

