Javier Carranza <[EMAIL PROTECTED]> writes:
> El jue, 08-09-2005 a las 23:25 +0100, Roger Leigh escribió:
>>
>> I will upload to DELAYED/5-day, so if you have any objections, I will
>> remove it from the queue, otherwise it will enter incoming
>> automatically in 5 days.
>
> There's no problem. Go ahead.
Thanks, it's done. I added a single line to the changelog
(Non-maintainer upload) as required by policy. The final diff is
below.
Regards,
Roger
diff -urN qcad-2.0.4.0-1.original/debian/changelog
qcad-2.0.4.0-1/debian/changelog
--- qcad-2.0.4.0-1.original/debian/changelog 2005-09-09 17:44:35.891022440
+0100
+++ qcad-2.0.4.0-1/debian/changelog 2005-09-09 17:45:06.526365160 +0100
@@ -1,3 +1,12 @@
+qcad (2.0.4.0-1-2.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Recompile for GCC 4 transition.
+ * Applied patch to allow compiling on amd64 (Closes: Bug#288190).
+ Thanks to Andreas Jochens for the report.
+
+ -- Gerd Flaig <[EMAIL PROTECTED]> Wed, 7 Sep 2005 22:05:13 +0200
+
qcad (2.0.4.0-1-2) unstable; urgency=low
* mime types added to integrate QCad into Gnome and KDE desktops.
diff -urN qcad-2.0.4.0-1.original/debian/control qcad-2.0.4.0-1/debian/control
--- qcad-2.0.4.0-1.original/debian/control 2005-09-09 17:44:35.891022440
+0100
+++ qcad-2.0.4.0-1/debian/control 2005-09-09 17:44:46.834358800 +0100
@@ -7,7 +7,7 @@
Package: qcad
Architecture: any
-Depends: ${shlibs:Depends}, libqcad0 (= 2.0.4.0-1-2)
+Depends: ${shlibs:Depends}, libqcad0 (= 2.0.4.0-1-2.1)
Suggests: partlibrary
Description: A professional CAD System
With QCad 2 you can easily construct and change drawings with ISO-texts and
@@ -36,7 +36,7 @@
Package: libqcad0-dev
Architecture: all
-Depends: libqcad0 (= 2.0.4.0-1-2)
+Depends: libqcad0 (= 2.0.4.0-1-2.1)
Description: Qcad development headers
Qcad is a professional CAD system such as AutoCADR and many others. This
package contains header files of Qcad components.
diff -urN qcad-2.0.4.0-1.original/qcadlib/src/engine/rs_entity.cpp
qcad-2.0.4.0-1/qcadlib/src/engine/rs_entity.cpp
--- qcad-2.0.4.0-1.original/qcadlib/src/engine/rs_entity.cpp 2004-09-14
21:13:02.000000000 +0100
+++ qcad-2.0.4.0-1/qcadlib/src/engine/rs_entity.cpp 2005-09-09
17:44:46.822360624 +0100
@@ -849,7 +849,7 @@
os << " layer: NULL ";
} else {
os << " layer: " << e.layer->getName().latin1() << " ";
- os << " layer address: " << (int)(e.layer) << " ";
+ os << " layer address: " << (long)(e.layer) << " ";
}
os << e.pen << "\n";
diff -urN qcad-2.0.4.0-1.original/qcadlib/src/engine/rs_layer.cpp
qcad-2.0.4.0-1/qcadlib/src/engine/rs_layer.cpp
--- qcad-2.0.4.0-1.original/qcadlib/src/engine/rs_layer.cpp 2004-09-14
21:13:02.000000000 +0100
+++ qcad-2.0.4.0-1/qcadlib/src/engine/rs_layer.cpp 2005-09-09
17:44:46.822360624 +0100
@@ -57,7 +57,7 @@
os << " name: " << l.getName().latin1()
<< " pen: " << l.getPen()
<< " frozen: " << (int)l.isFrozen()
- << " address: " << (int)(&l)
+ << " address: " << (long)(&l)
<< std::endl;
return os;
}
--
Roger Leigh
Printing on GNU/Linux? http://gimp-print.sourceforge.net/
Debian GNU/Linux http://www.debian.org/
GPG Public Key: 0x25BFB848. Please sign and encrypt your mail.
