Tagging the 0.16 release

git-svn-id: https://svn.code.sf.net/p/qlscribe/svn/tags/release-0.16@190 cac9541e-1b8d-4bfa-827e-589bba606050

ChangeLog

@@ -3,5 +3,5 @@
         * For historical reasons: this is when I imported qlscribe into
           SourceForge.
 
-        $Revision:$ $Date:$
+        $Revision$ $Date$
 

INSTALL

@@ -1,6 +1,30 @@
 Qt lightScribe Installaton instructions
 =======================================
 
+To compile qlscribe succesfully you may need additional packages installed. 
+
+So for Ubuntu folowing packages are required:
+    build-essential
+    cmake
+    libqt4-dev
+    libdbus-1-dev
+
+For 64 bit Ubuntu you need also to install folowing packages:
+    ia32-libs
+    libc6-dev-i386 (maverick only, see notes)
+    g++-multilib
+
+    (Note: this will work for maverick (10.10) version, for lucid and karmic 
+     /usr/lib32/libstdc++.so.5 is missing in ia32-libs so you would have to 
+     find it see https://bugs.launchpad.net/ubuntu/+source/ia32-libs/+bug/431091 )
+    (Note: On 64 bit if you get "undefined reference std::_Rb_tree_increment..." link error it is
+     possible that link /usr/lib32/libstdc++.so points to /usr/lib32/libstdc++.so.5... change it
+     so it points /usr/lib32/libstdc++.so.6...)
+
+For 64 bit Ubuntu libdbus-1-dev does not have link for i386 libdbus-1.so you may need to create one manually:
+     sudo ln -s libdbus-1.so.3 /lib/i386-linux-gnu/libdbus-1.so
+    
+
 To compile and install, first download release from http://qlscribe.sourceforge.net/
 or check out project from subversion repository for particular release:
 
@@ -30,7 +54,7 @@ Include files should be in ${LIGHTSCRIBEDIR}/include and lib in ${LIGHTSCRIBEDIR
 You need manually install dbus config and service files. They are located in INSTALL_PATH/share/qlscribe
 So on my ubuntu system I do 
     sudo cp /usr/local/share/qlscribe/lightscribe.conf /etc/dbus-1/system.d/ 
-    sudo cp /usr/local/share/qlscribe/org.lightscribe.Manager.service /usr/share/dbus-1/system-services/
+    sudo cp /usr/local/share/qlscribe/org.lightscribe.printManager.service /usr/share/dbus-1/system-services/
     sudo /etc/init.d/dbus reload
 
 Your system may have different path please refer dbus system daemon documentation

NEWS

@@ -1,5 +1,10 @@
 NEWS - list of user-visible changes between releases of qlscribe
 
+New in 0.16
+    Fixed build on 64 bit Ubuntu Saucy
+    Fixed bug with alarm() not found
+    Added instructions for 64 bit
+
 New in 0.15
     Added ability to align regular text to left, right or center the same way as rounded text
     Fixed issue with filters in open dialog

cmake/FindDbus32.cmake

@@ -32,7 +32,7 @@ FIND_LIBRARY( DBUS_LIBRARY dbus-1 )
 get_filename_component( _dbusLibPath ${DBUS_LIBRARY} PATH )
 
 FIND_PATH( DBUS_LIBINCLUDE_DIR dbus/dbus-arch-deps.h
-           PATHS /lib /usr/lib /usr/local/lib ${_dbusLibPath}
+           PATHS /lib /usr/lib /usr/local/lib /usr/lib/x86_64-linux-gnu /usr/lib/i386-linux-gnu ${_dbusLibPath}
            PATH_SUFFIXES dbus-1.0/include )
 
 if( DBUS_INCLUDE_DIR AND DBUS_LIBINCLUDE_DIR AND DBUS_LIBRARY )

debian/changelog

@@ -1,4 +1,5 @@
-qlscribe (0.15-0ubuntu1) unstable; urgency=low
+qlscribe (0.15-0lenny1) unstable; urgency=low
+  * Release 0.16 imported
   * Release 0.15 imported
   * Release 0.14 imported
   * Release 0.13 imported

debian/control

@@ -2,7 +2,7 @@ Source: qlscribe
 Section: qt
 Priority: optional
 Maintainer: Vyacheslav Kononenko <vyacheslav@kononenko.net>
-Build-Depends: debhelper (>= 7)
+Build-Depends: debhelper (>= 7), cmake, qt4-qmake, libqt4-dev, libdbus-1-dev, lightscribepublicsdk, lightscribe
 Standards-Version: 3.7.3
 Homepage: http://qlscribe.sourceforge.net/
 

lscribed/drives.cpp

@@ -278,7 +278,7 @@ void Drive::routine()
 
          function = "LS_DiscPrintMgr_EnumDiscPrinters";
          EnumDiscPrinters printers = manager.EnumDiscPrinters();
-         if( m_index >= printers.Count() )
+         if( m_index >= int( printers.Count() ) )
             throw std::string( "internal error: invalid index" );
 
          DiscPrinter printer = printers.Item( m_index );

lscribed/main.cpp

@@ -23,6 +23,7 @@
 #include <signal.h>
 #include <stdlib.h>
 #include <syslog.h>
+#include <unistd.h>
 
 #include "lscribed.h"
 #include "dbuscpp.h"

src/mainwindow.cpp

@@ -545,7 +545,7 @@ void MainWindow::onMenuAbout()
    QMessageBox::about( this,
                        tr( "About" ),
                        tr( "<h3>qlscribe - Qt lisghtScribe</h3>"
-                           "<p>release 0.15 $Revision$</p>"
+                           "<p>release 0.16 $Revision$</p>"
                            "<p>visit project at home page "
                            "<a href=\"http://qlscribe.sourceforge.net/\">qlscribe.sourceforge.net</a></p>" ) );
 }

src/qdialogpixmap.cpp

@@ -123,7 +123,7 @@ void QDialogPixmap::onLoadImage()
    filter += tr( ");;All Files (*.*)" );
 
    QFileDialog fd( this, "Load image:", QString(), filter );
-   fd.setOption( QFileDialog::DontUseNativeDialog ); // for testing
+   //fd.setOption( QFileDialog::DontUseNativeDialog ); // for testing
 
    bool injectPreview = QSettings().value( cfgInjectPreview, true ).toBool();
    PreviewInjector pj( injectPreview ? &fd : 0 );

src/qlightpixmapitem.cpp

@@ -123,7 +123,7 @@ void QShapeControllerPixmap::readData( const QString &element,
       }
       pixmapItem->imageName( data );
       pixmapItem->setPixmap( pixmap );
-      pixmapItem->setOffset( -QPointF( pixmap.size().height(), pixmap.size().width()  ) / 2.0 );
+      pixmapItem->setOffset( -QPointF( pixmap.size().width(), pixmap.size().height()  ) / 2.0 );
       return;
    }
 }

src/qlightscribe.cpp

@@ -109,21 +109,22 @@ QLightDrive::QLightDrive( QObject *parent, const QString &path, const QString &n
 static
 void printScene( QCDScene *scene, QByteArray &array )
 {
-   QImage image( 2772, 2772, QImage::Format_RGB888 );
-   image.fill( 0xFFFFFFFF );
+    const int resolution = 2772;
+    QImage image( resolution, resolution, QImage::Format_RGB888 );
+    image.fill( 0xFFFFFFFF );
 
-   scene->clearSelection();
-   {
-      QPainter painter( &image );
-      scene->render( &painter, image.rect() );
-   }
-   image.setDotsPerMeterX( 23622 );
-   image.setDotsPerMeterY( 23622 );
+    scene->clearSelection();
+    {
+        QPainter painter( &image );
+        scene->render( &painter, image.rect() );
+    }
+    image.setDotsPerMeterX( resolution * 8 );
+    image.setDotsPerMeterY( resolution * 8 );
 
-   array.clear();
-   QBuffer buffer( &array );
-   buffer.open( QIODevice::WriteOnly );
-   image.save( &buffer, "bmp", 100 );
+    array.clear();
+    QBuffer buffer( &array );
+    buffer.open( QIODevice::WriteOnly );
+    image.save( &buffer, "bmp", 100 );
 }
 
 QPixmap QLightDrive::preview( const PrintParameters &params, QCDScene *scene, const QSize &size ) throw( QString )