Bug#320336: NMU for tcm?

[Matej Vela]

On Mon, Sep 12, 2005 at 10:43:51AM -0300, Otavio Salvador wrote:
> Go ahead :-)

Thanks, patch attached.

Matej

diff -u tcm-2.20+TSQD/debian/changelog tcm-2.20+TSQD/debian/changelog
--- tcm-2.20+TSQD/debian/changelog
+++ tcm-2.20+TSQD/debian/changelog
@@ -1,3 +1,13 @@
+tcm (2.20+TSQD-1.1) unstable; urgency=medium
+
+  * NMU.
+  * Fix build failure with gcc 4.0.  Thanks to Andreas Jochens for the patch.
+    Closes: #327362.
+  * Call gv with `--media=<a4|letter> --orientation=<portrait|landscape>'
+    rather than `-<a4|letter> -<portrait|landscape>'.  Closes: #320336.
+
+ -- Matej Vela <[EMAIL PROTECTED]>  Mon, 12 Sep 2005 16:23:26 +0200
+
 tcm (2.20+TSQD-1) unstable; urgency=low
 
   * New upstream release
only in patch2:
unchanged:
--- tcm-2.20+TSQD.orig/src/sd/dv/erdiagram.c
+++ tcm-2.20+TSQD/src/sd/dv/erdiagram.c
@@ -43,6 +43,9 @@
 #include "replacedialog.h"
 #include "erdiagram.h"
 #include "menu.h"
+
+class Edge;
+class C1Edge;
  
 ERDiagram::ERDiagram(Config *c, ERWindow *d, ERViewer *v, ERGraph *g): 
                Diagram(c,d,v,g) {
only in patch2:
unchanged:
--- tcm-2.20+TSQD.orig/src/sd/dv/function.h
+++ tcm-2.20+TSQD/src/sd/dv/function.h
@@ -19,8 +19,8 @@
 // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 // 02111-1307, USA.
 //-----------------------------------------------------------------------------
-#ifndef _FUNCTION_H
-#define _FUNCTION_H
+#ifndef _FUNCTION_CLASS_H
+#define _FUNCTION_CLASS_H
 
 #include "c1edge.h"
 class ERGraph;
only in patch2:
unchanged:
--- tcm-2.20+TSQD.orig/src/ui/menu.c
+++ tcm-2.20+TSQD/src/ui/menu.c
@@ -217,7 +217,7 @@
                                        XmNindicatorType, XmONE_OF_MANY, 0);
                        }
                        // selected or not ?
-                       if ((int)items[i].userData & 0x1)
+                       if ((long)items[i].userData & 0x1)
                                XtVaSetValues(submenu, XmNset, True, 0);
 
                }
only in patch2:
unchanged:
--- tcm-2.20+TSQD.orig/src/ui/application.h
+++ tcm-2.20+TSQD/src/ui/application.h
@@ -28,6 +28,7 @@
 class PrinterOptions;
 class Color;
 class Config;
+class MainWindow;
 
 /// generic window-based application class. See: MWidget.
 class Application: public MWidget {
only in patch2:
unchanged:
--- tcm-2.20+TSQD.orig/src/ed/printer.c
+++ tcm-2.20+TSQD/src/ed/printer.c
@@ -170,7 +170,7 @@
        char tmp[MAXNAME];
        System::GiveFile(previewCommand.getstr(), tmp);
        string command = tmp;
-       if (command == "ghostview" || command == "gv") {
+       if (command == "ghostview") {
                string pgs = "-";
                string sz;
                PageSize::Type2String(pageSize, &sz);
@@ -181,6 +181,15 @@
                                        "-portrait":"-landscape", 
                                psFileName.getstr());
        }
+       else if (command == "gv") {
+               string sz;
+               PageSize::Type2String(pageSize, &sz);
+               sprintf(tmp, "%s --media=%s --orientation=%s %s 2>&1\n",
+                               previewCommand.getstr(), sz.getstr(),
+                               pageOrientation==Config::PORTRAIT?
+                                       "portrait":"landscape", 
+                               psFileName.getstr());
+       }
        else    // simplistic previewing ...
                sprintf(tmp, "%s %s 2>&1\n", previewCommand.getstr(), 
                                             psFileName.getstr());