Changeset 4774


Ignore:
Timestamp:
May 16, 2017, 12:45:15 PM (2 years ago)
Author:
Juanma
Message:

Updated to 2.3.2-1

Location:
qstopmotion/trunk/fuentes/debian
Files:
9 edited

Legend:

Unmodified
Added
Removed
  • qstopmotion/trunk/fuentes/debian/changelog

    r4773 r4774  
    1 qstopmotion (2.3.2-1) unstable; urgency=low
     1qstopmotion (2.3.2-1~getdeb1) xenial; urgency=medium
    22
    3   * Initial release (Closes: #827840)
     3  * New upstream version
     4      * Some spelling corrections.
     5      * Update of the Czech translation.
    46
    5  -- Adrian Knoth <adi@drcomp.erfurt.thur.de>  Mon, 14 Nov 2016 20:58:37 +0100
     7 -- Christoph Korn <christoph.korn@getdeb.net>  Mon, 14 Nov 2016 18:46:56 +0100
     8
     9qstopmotion (2.3.1-1~getdeb1) xenial; urgency=medium
     10
     11  * New upstream version
     12
     13 -- Christoph Korn <christoph.korn@getdeb.net>  Tue, 09 Aug 2016 17:41:18 +0200
     14
     15qstopmotion (2.2.0-1~getdeb1) xenial; urgency=medium
     16
     17  * New upstream version
     18
     19 -- Christoph Korn <christoph.korn@getdeb.net>  Mon, 09 May 2016 12:44:11 +0200
     20
     21qstopmotion (2.0.2-1~getdeb1) trusty; urgency=medium
     22
     23  * New upstream version
     24    * Update the Ubuntu package generation. Fix most of the lintian
     25      messages.
     26    * Add the CentOS package generation.
     27    * Bug fixing.
     28
     29 -- Christoph Korn <christoph.korn@getdeb.net>  Wed, 23 Sep 2015 19:19:10 +0200
     30
     31qstopmotion (2.0.0-1~getdeb1) trusty; urgency=medium
     32
     33  * New upstream version
     34    * Remove of the Gstreamer grabber from the Windows platform.
     35    * On Windows qStopMotion can be started as an portable application.
     36    * Video4Linux2 grabber on the Linux platform.
     37    * Camera controller for the Video4Linux2 grabber.
     38
     39 -- Christoph Korn <christoph.korn@getdeb.net>  Fri, 02 Jan 2015 22:07:52 +0100
     40
     41qstopmotion (1.0.1-1~getdeb1) precise; urgency=low
     42
     43  * Initial release (LP: #1187151)
     44
     45 -- Christoph Korn <christoph.korn@getdeb.net>  Wed, 05 Jun 2013 19:24:56 +0200
  • qstopmotion/trunk/fuentes/debian/compat

    r4773 r4774  
    1 10
     19
  • qstopmotion/trunk/fuentes/debian/control

    r4773 r4774  
    22Section: video
    33Priority: optional
    4 Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers@lists.alioth.debian.org>
    5 Uploaders: Adrian Knoth <adi@drcomp.erfurt.thur.de>
    6 Build-Depends: debhelper (>=10),
    7  libgphoto2-dev,
    8  libxml2-dev,
    9  libv4l-dev,
    10  qtbase5-dev,
    11  cmake
    12 Standards-Version: 3.9.8
    13 Homepage: http://www.qstopmotion.org
    14 Vcs-Git: https://anonscm.debian.org/git/pkg-multimedia/qstopmotion.git
    15 Vcs-Browser: https://anonscm.debian.org/gitweb/?p=pkg-multimedia/qstopmotion.git
     4Maintainer: Christoph Korn <christoph.korn@getdeb.net>
     5Build-Depends: debhelper (>= 9),
     6               cmake,
     7               qtbase5-dev,
     8               libgphoto2-dev,
     9               libgstreamer-plugins-base0.10-dev,
     10               libgstreamer0.10-dev,
     11               linux-libc-dev,
     12               libv4l-dev
     13Standards-Version: 3.9.7
     14Homepage: http://www.qstopmotion.org/
    1615
    1716Package: qstopmotion
    1817Architecture: any
    19 Depends: ${shlibs:Depends}, ${misc:Depends}
    20 Recommends: ffmpeg,
    21  v4l-utils
    22 Description: Application for creating stop-motion animation movies
    23  The users will be able to create stop-motions from pictures imported
    24  from a camera or from the harddrive and export the animation to
    25  different video formats such as mpeg or avi.
     18Depends: ${shlibs:Depends},
     19         ${misc:Depends}
     20Description: Creates stop-motion animation movies
     21 qStopMotion is a free application for creating stop-motion
     22 animation movies. The users will be able to create
     23 stop-motions from pictures imported from a camera or from
     24 the harddrive and export the animation to different video
     25 formats such as mpeg or avi.
  • qstopmotion/trunk/fuentes/debian/copyright

    r4773 r4774  
    1 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
     1Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
    22Upstream-Name: qstopmotion
    3 Source: http://www.qstopmotion.org
     3Source: http://sourceforge.net/projects/qstopmotion/files/
    44
    55Files: *
    6 Copyright: 2005-2016 Ralf Lange <ralf.lange@longsoft.de>
    7  2005-2016 Bjoern Erik Nilsen <bjoern.nilsen@bjoernen.com>
    8  2005-2008 Fredrik Berg Kjoelstad <fredrikbk@hotmail.com>
    9 License: GPL-2+
     6Copyright: Ralf Lange <ralf.lange@longsoft.de>
     7           Bjoern Erik Nilsen <bjoern.nilsen@bjoernen.com>
     8           Fredrik Berg Kjoelstad <fredrikbk@hotmail.com>
     9License: GPL-2.0+
    1010
    1111Files: debian/*
    12 Copyright: 2016 Adrian Knoth <adi@drcomp.erfurt.thur.de>
    13 License: GPL-2+
     12Copyright: 2013 Christoph Korn <christoph.korn@getdeb.net>
     13License: GPL-2.0+
    1414
    15 License: GPL-2+
     15License: GPL-2.0+
    1616 This package is free software; you can redistribute it and/or modify
    1717 it under the terms of the GNU General Public License as published by
     
    2525 .
    2626 You should have received a copy of the GNU General Public License
    27  along with this program. If not, see <https://www.gnu.org/licenses/>
     27 along with this program. If not, see <http://www.gnu.org/licenses/>
    2828 .
    2929 On Debian systems, the complete text of the GNU General
    3030 Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
     31
  • qstopmotion/trunk/fuentes/debian/patches/cmakelists.patch

    r446 r4774  
    11# do not access the debian directory with cmake.
    2 Index: qstopmotion-2.0.2/CMakeLists.txt
     2Index: qstopmotion-2.3.2/CMakeLists.txt
    33===================================================================
    4 --- qstopmotion-2.0.2.orig/CMakeLists.txt       2015-09-15 19:46:36.000000000 +0200
    5 +++ qstopmotion-2.0.2/CMakeLists.txt    2015-09-23 19:23:40.108945000 +0200
    6 @@ -333,21 +333,6 @@
     4--- qstopmotion-2.3.2.orig/CMakeLists.txt       2016-11-14 18:47:25.417331203 +0100
     5+++ qstopmotion-2.3.2/CMakeLists.txt    2016-11-14 18:48:10.586971157 +0100
     6@@ -364,21 +364,6 @@
    77     linux/qstopmotion.1.gz      # Linux man page compressed
    88 )
     
    2424-
    2525 ###############################################################################
    26  # GStreamer support
     26 # gPhoto2 support
    2727 #
    28 @@ -586,8 +571,6 @@
     28@@ -596,8 +581,6 @@
    2929     file(COPY ${ICON_FILES} DESTINATION "share/qstopmotion/")
    3030     file(COPY ${GENERAL_FILES} DESTINATION "share/qstopmotion/")
     
    3232-    file(COPY ${DEB_FILES} DESTINATION "share/qstopmotion/deb/")
    3333-    file(COPY ${RPM_FILES} DESTINATION "share/qstopmotion/rpm/")
    34  
    35  ENDIF(WIN32)
    36  
    37 @@ -707,52 +690,6 @@
     34 ENDIF(UNIX AND NOT APPLE)
     35 
     36 ###############################################################################
     37@@ -699,52 +682,6 @@
    3838     )
    39  ENDIF(UNIX)
     39 ENDIF(UNIX AND NOT APPLE)
    4040 
    4141-# installation on DEB systems
     
    8787 # installation on Windows systems
    8888 IF(WIN32)
    89      # installation of ffmpeg
    90 @@ -965,171 +902,6 @@
     89     IF(CMAKE_CL_64)
     90@@ -1058,172 +995,6 @@
     91 # Run the application on the finish page
    9192 # SET(CPACK_NSIS_MUI_FINISHPAGE_RUN "qstopmotion.exe"
    9293 
    93  ###############################################################################
     94-###############################################################################
    9495-# DEB package - Linux only (Debian, OpenSuse, Ubuntu, ...)
    9596-###############################################################################
     
    117118-    # thus only one package is build you must list here *any* depending libraries,
    118119-    # even if they are only used in one module
    119 -    IF ("${LSB_DISTRIB}" MATCHES "Ubuntu12.04")
    120 -        SET(
    121 -            CPACK_DEBIAN_PACKAGE_DEPENDS
    122 -            "libc6 (>=2.11), ffmpeg (>=0.8.9), gstreamer0.10-plugins-base (>=0.10.36), libqtcore4 (>=4.8.1), libqtgui4 (>=4.8.1), libqt4-xml (>=4.8.1), libv4l-0 (>=0.8.6), libgphoto2-2 (>=2.4.11), libgphoto2-port0 (>=2.4.11)"
    123 -        )
    124 -    ENDIF ("${LSB_DISTRIB}" MATCHES "Ubuntu12.04")
    125120-    IF ("${LSB_DISTRIB}" MATCHES "Ubuntu14.04")
    126121-        SET(
    127122-            CPACK_DEBIAN_PACKAGE_DEPENDS
    128 -            "libc6 (>=2.11), libavbin0 (>=7-1), gstreamer0.10-plugins-base (>=0.10.36), libqtcore4 (>=4.8.1), libqtgui4 (>=4.8.1), libqt4-xml (>=4.8.1), libv4l-0 (>=0.8.6), libgphoto2-6 (>=2.5.3)"
     123-            "libc6 (>=2.11), libavbin0 (>=7-1), libqt5core5 (>=5.2.1) | libqt5core5a (>=5.2.1), libqt5gui5 (>=5.2.1), libqt5widgets5 (>=5.2.1), libqt5xml5 (>=5.2.1), libv4l-0 (>=1.0.0), libgphoto2-6 (>=2.5.3), qt5-image-formats-plugins (>=5.2.1)"
    129124-        )
    130125-    ENDIF ("${LSB_DISTRIB}" MATCHES "Ubuntu14.04")
    131 -    IF ("${LSB_DISTRIB}" MATCHES "Debian6.*")
    132 -        SET(
    133 -            CPACK_DEBIAN_PACKAGE_DEPENDS
    134 -            "libc6 (>=2.11), ffmpeg (>=0.8.9), gstreamer0.10-plugins-base (>=0.10.36), libqtcore4 (>=4.8.2), libqtgui4 (>=4.8.2), libqt4-xml (>=4.8.2), libv4l-0 (>=0.8.8), libgphoto2-2 (>=2.4.14), libgphoto2-port0 (>=2.4.14)"
    135 -        )
    136 -    ENDIF ("${LSB_DISTRIB}" MATCHES "Debian6.*")
     126-    IF ("${LSB_DISTRIB}" MATCHES "Ubuntu16.04")
     127-        SET(
     128-            CPACK_DEBIAN_PACKAGE_DEPENDS
     129-            "libc6 (>=2.11), ffmpeg (>=2.8.6), libqt5core5 (>=5.3.2) | libqt5core5a (>=5.3.2), libqt5gui5 (>=5.3.2), libqt5widgets5 (>=5.3.2), libqt5xml5 (>=5.3.2), libv4l-0 (>=1.0.0), libgphoto2-6 (>=2.5.3), qt5-image-formats-plugins (>=5.3.2)"
     130-        )
     131-    ENDIF ("${LSB_DISTRIB}" MATCHES "Ubuntu16.04")
    137132-    IF ("${LSB_DISTRIB}" MATCHES "Debian7.*")
    138133-        SET(
    139134-            CPACK_DEBIAN_PACKAGE_DEPENDS
    140 -            "libc6 (>=2.11), ffmpeg (>=0.8.9), gstreamer0.10-plugins-base (>=0.10.36), libqtcore4 (>=4.8.2), libqtgui4 (>=4.8.2), libqt4-xml (>=4.8.2), libv4l-0 (>=0.8.8), libgphoto2-2 (>=2.4.14), libgphoto2-port0 (>=2.4.14)"
     135-            "libc6 (>=2.11), ffmpeg (>=0.8.9), libqtcore4 (>=4.8.2), libqtgui4 (>=4.8.2), libqt4-xml (>=4.8.2), libv4l-0 (>=0.8.8), libgphoto2-2 (>=2.4.14), libgphoto2-port0 (>=2.4.14)"
    141136-        )
    142137-    ENDIF ("${LSB_DISTRIB}" MATCHES "Debian7.*")
     
    144139-        SET(
    145140-            CPACK_DEBIAN_PACKAGE_DEPENDS
    146 -            "libc6 (>=2.11), libav-tools (>=6:11.3), gstreamer0.10-plugins-base (>=0.10.36), libqtcore4 (>=4.8.2), libqtgui4 (>=4.8.2), libqt4-xml (>=4.8.2), libv4l-0 (>=0.8.8), libgphoto2-6 (>=2.5.3)"
     141-            "libc6 (>=2.11), libav-tools (>=6:11.3), libqt5core5 (>=5.3.2) | libqt5core5a (>=5.3.2), libqt5gui5 (>=5.3.2), libqt5widgets5 (>=5.3.2), libqt5xml5 (>=5.3.2), libv4l-0 (>=1.0.0), libgphoto2-6 (>=2.5.3), qt5-image-formats-plugins (>=5.3.2)"
    147142-        )
    148143-    ENDIF ("${LSB_DISTRIB}" MATCHES "Debian8.*")
     
    234229-# CPACK_RPM_COMPRESSION_TYPE
    235230-# requireses must be in a aphabetic order
     231-# Qt5: qt5-qtbase - Core, Concurrent, DBus, Network, Sql, Test, Xml
     232-# Qt5: qt5-qtbase-gui - Gui, OpenGL, PrintSupport, Widgets, XcbQpa
     233-# Qt5: qt5-qtimageformats - Qt5 image format plugins
     234-# Qt5: qt5-qtmultimedia - Multimedia, MultimediaQuick, MultimediaWidgets
    236235-SET(
    237236-    CPACK_RPM_PACKAGE_REQUIRES
    238 -    "glibc >= 2.12, ffmpeg >= 0.8.9, gstreamer >= 0.10.29, qt >= 4.6.2, libv4l >= 0.6.3, libgphoto2 >= 2.4.7"
     237-    "glibc >= 2.12, libgphoto2 >= 2.4.7, libv4l >= 0.6.3, qt5-qtbase >= 5.2.0, qt5-qtbase-gui >= 5.2.0, qt5-qtimageformats >= 5.2.0"
    239238-)
    240239-MESSAGE("CPACK_RPM_PACKAGE_REQUIRES: ${CPACK_RPM_PACKAGE_REQUIRES}")
     
    252251-SET(
    253252-    CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION
     253-    "/usr/bin"
    254254-    "/usr/share/applications"
     255-    "/usr/share/icons"
    255256-    "/usr/share/pixmaps"
    256 -)
    257 -
    258 -###############################################################################
     257-    "/usr/share/man"
     258-    "/usr/share/man/man1"
     259-)
     260 
     261 ###############################################################################
    259262 # Activate packaging functionality
    260  ###############################################################################
    261  
  • qstopmotion/trunk/fuentes/debian/patches/ftbfs.patch

    r446 r4774  
    11# The Debug causes compile errors. Remove it.
    2 Index: qstopmotion-2.0.2/src/frontends/qtfrontend/qtfrontend.cpp
     2Index: qstopmotion-2.3.1/src/frontends/qtfrontend/qtfrontend.cpp
    33===================================================================
    4 --- qstopmotion-2.0.2.orig/src/frontends/qtfrontend/qtfrontend.cpp      2015-09-23 19:32:56.332747447 +0200
    5 +++ qstopmotion-2.0.2/src/frontends/qtfrontend/qtfrontend.cpp   2015-09-23 19:32:56.332747447 +0200
    6 @@ -39,7 +39,6 @@
    7  
    8  QtFrontend::QtFrontend(int &argc, char **argv)
    9  {
    10 -    qDebug("QtFrontend::Constructor --> Start");
    11  
    12      domainFacade         = NULL;
    13      viewFacade           = NULL;
    14 @@ -62,13 +61,11 @@
    15  #endif
    16  
    17  
    18 -    qDebug("QtFrontend::Constructor --> End");
    19  }
    20  
     4--- qstopmotion-2.3.1.orig/src/frontends/qtfrontend/qtfrontend.cpp      2016-08-09 17:45:32.498100882 +0200
     5+++ qstopmotion-2.3.1/src/frontends/qtfrontend/qtfrontend.cpp   2016-08-09 17:45:32.498100882 +0200
     6@@ -73,8 +73,6 @@
    217 
    228 QtFrontend::~QtFrontend()
    239 {
    24 -    qDebug("QtFrontend::Destructor --> Start");
    25  
     10-    qDebug() << "QtFrontend::Destructor --> Start";
     11-
    2612     // Save the size and position of the application
    2713     QSize appSize = mw->size();
    28 @@ -124,7 +121,6 @@
     14     QPoint appPos = mw->pos();
     15@@ -104,17 +102,11 @@
     16 
     17     delete stApp;
     18     stApp = NULL;
     19-
     20-    qDebug() << "QtFrontend::Destructor --> End";
     21 }
     22 
     23 
     24 bool QtFrontend::checkApplicationDirectory(char *binDirName)
     25 {
     26-    qDebug() << "QtFrontend::checkApplicationDirectory --> Start";
     27-
     28-    qDebug() << "QtFrontend::checkApplicationDirectory --> Call command:" << binDirName;
     29-
     30     bool hasCorrectPermissions = true;
     31     QDir homeDir = QDir::home();
     32     QString userDirName;
     33@@ -128,8 +120,6 @@
     34             showCritical(tr("Create directory"),
    2935                 tr("You do not have the necessary permissions to run qStopMotion.\n"
    3036                 "You need permission to create the .qstopmotion directory in your home directory."));
    31  
    32 -            qDebug("QtFrontend::checkApplicationDirectory --> End (Error)");
     37-
     38-            qDebug() << "QtFrontend::checkApplicationDirectory --> End (Error)";
    3339             return 1;
    3440         }
    3541     }
    36 @@ -143,7 +139,6 @@
     42@@ -147,8 +137,6 @@
     43             showCritical(tr("Check Permissions"),
    3744                 tr("You do not have the necessary permissions to run qStopMotion.\n"
    3845                 "You need permission to read, write and execute on the .qstopmotion directory."));
    39  
    40 -            qDebug("QtFrontend::checkApplicationDirectory --> End (Error)");
     46-
     47-            qDebug() << "QtFrontend::checkApplicationDirectory --> End (Error)";
    4148             return 1;
    4249         }
    4350     }
    44 @@ -343,27 +338,22 @@
     51@@ -168,7 +156,6 @@
     52     if (pathLength == -1)
     53     {
     54         QString command = Util::checkCommand(binDirName);
     55-        qDebug() << "QtFrontend::checkApplicationDirectory --> Check command:" << command;
     56         absoluteAppName = Util::convertPathFromOsSpecific(QString(command));
     57         pathLength = absoluteAppName.lastIndexOf("/bin/");
     58     }
     59@@ -197,9 +184,6 @@
     60         pathLength = absoluteAppName.lastIndexOf("/");
     61         appBinDirName.append(absoluteAppName.left(pathLength + 1));
     62     }
     63-    qDebug() << "QtFrontend::checkApplicationDirectory --> Application Direcory:" << appApplicationDirName;
     64-    qDebug() << "QtFrontend::checkApplicationDirectory --> Application Binary Direcory:" << appBinDirName;
     65-
     66 #if defined(Q_OS_WIN32) || defined(Q_OS_WIN64)
     67     // Windows version
     68 
     69@@ -253,34 +237,24 @@
     70 
     71 #endif
     72 
     73-    qDebug() << "QtFrontend::checkApplicationDirectory --> Application Manual Direcory:" << appManualDirName;
     74-    qDebug() << "QtFrontend::checkApplicationDirectory --> Application Translations Direcory:" << appTranslationsDirName;
     75-    qDebug() << "QtFrontend::checkApplicationDirectory --> Application Graphics Direcory:" << appGraphicsDirName;
     76-
     77-
     78     otherDirName.clear();
     79     otherDirName.append(appGraphicsDirName);
     80     otherDirName.append(PreferencesTool::iconsDirectory);
     81     otherDirName.append(QLatin1String("/"));
     82     appIconsDirName.append(otherDirName);
     83-    qDebug() << "QtFrontend::checkApplicationDirectory --> Application Icon Direcory:" << appIconsDirName;
     84 
     85     otherDirName.clear();
     86     otherDirName.append(appGraphicsDirName);
     87     otherDirName.append(PreferencesTool::picturesDirectory);
     88     otherDirName.append(QLatin1String("/"));
     89     appPicturesDirName.append(otherDirName);
     90-    qDebug() << "QtFrontend::checkApplicationDirectory --> Application Pictures Direcory:" << appPicturesDirName;
     91 
     92-    qDebug() << "QtFrontend::checkApplicationDirectory --> End";
     93     return 0;
     94 }
     95 
     96 
     97 void QtFrontend::init()
     98 {
     99-    qDebug() << "QtFrontend::init --> Start";
     100-
     101     QString iconFile(getGraphicsDirName());
     102     iconFile.append(QLatin1String("qstopmotion_splash_screen.png"));
     103     QSplashScreen *splash = new QSplashScreen;
     104@@ -347,28 +321,21 @@
     105     delete splash;
    45106 
    46107     // this->testMainWidget();
    47  
    48 -    qDebug("QtFrontend::init --> End");
     108-
     109-    qDebug() << "QtFrontend::init --> End";
    49110 }
    50111 
     
    52113 bool QtFrontend::handleArguments(int argc, char **argv)
    53114 {
    54 -    qDebug("QtFrontend::handleArguments --> Start");
    55  
     115-    qDebug() << "QtFrontend::handleArguments --> Start";
     116-
    56117     if (argc < 2) {
    57118         // No arguments
    58 -        qDebug("QtFrontend::handleArguments --> End (false)");
     119-        qDebug() << "QtFrontend::handleArguments --> End (false)";
    59120         return false;
    60121     }
     
    62123     if (QFileInfo(argv[1]).isReadable()) {
    63124         mw->openProject(argv[1]);
    64 -        qDebug("QtFrontend::handleArguments --> End (true)");
     125-        qDebug() << "QtFrontend::handleArguments --> End (true)";
    65126         return true;
    66127     }
    67128 
    68 -    qDebug("QtFrontend::handleArguments --> End (false)");
     129-    qDebug() << "QtFrontend::handleArguments --> End (false)";
    69130     return false;
    70131 }
    71132 
    72 @@ -618,7 +608,6 @@
     133@@ -623,8 +590,6 @@
    73134 
    74135 void QtFrontend::initializePreferences()
    75136 {
    76 -    qDebug("QtFrontend::initializePreferences --> Start");
    77  
     137-    qDebug() << "QtFrontend::initializePreferences --> Start";
     138-
    78139     QDir homeDir = QDir::home();
    79140     QString preferencesFile = homeDir.absolutePath();
    80 @@ -633,20 +622,14 @@
     141     preferencesFile.append(QLatin1String("/"));
     142@@ -638,20 +603,14 @@
    81143         // File doesn't exist or is corrupt
    82144         setDefaultPreferences();
    83145     }
    84146-
    85 -    qDebug("QtFrontend::initializePreferences --> End");
     147-    qDebug() << "QtFrontend::initializePreferences --> End";
    86148 }
    87149 
     
    89151 void QtFrontend::setDefaultPreferences()
    90152 {
    91 -    qDebug("QtFrontend::setDefaultPreferences --> Start");
     153-    qDebug() << "QtFrontend::setDefaultPreferences --> Start";
    92154-
    93155     preferencesTool->setVersion(PreferencesTool::preferencesVersion);
     
    95157     // preferencesTool->setEncoderDefaults();
    96158-
    97 -    qDebug("QtFrontend::setDefaultPreferences --> End");
    98  }
    99  
    100  
    101 @@ -731,11 +714,8 @@
     159-    qDebug() << "QtFrontend::setDefaultPreferences --> End";
     160 }
     161 
     162 
     163@@ -736,11 +695,8 @@
    102164 {
    103165     bool ret;
    104166 
    105 -    qDebug("QtFrontend::startGrabber --> Start");
     167-    qDebug() << "QtFrontend::startGrabber --> Start";
    106168-
    107169     ret = mw->startGrabber();
    108170 
    109 -    qDebug("QtFrontend::startGrabber --> End");
     171-    qDebug() << "QtFrontend::startGrabber --> End";
    110172     return ret;
    111173 }
    112174 
    113 @@ -744,22 +724,15 @@
     175@@ -749,22 +705,15 @@
    114176 {
    115177     bool ret;
    116178 
    117 -    qDebug("QtFrontend::on --> Start");
     179-    qDebug() << "QtFrontend::on --> Start";
    118180-
    119181     ret = mw->isGrabberInited();
    120182 
    121 -    qDebug("QtFrontend::on --> End");
     183-    qDebug() << "QtFrontend::on --> End";
    122184     return ret;
    123185 }
     
    126188 void QtFrontend::stopGrabber()
    127189 {
    128 -    qDebug("QtFrontend::stopGrabber --> Start");
     190-    qDebug() << "QtFrontend::stopGrabber --> Start";
    129191-
    130192     mw->stopGrabber();
    131193-
    132 -    qDebug("QtFrontend::stopGrabber --> End");
    133  }
    134  
    135  
    136 @@ -889,57 +862,47 @@
     194-    qDebug() << "QtFrontend::stopGrabber --> End";
     195 }
     196 
     197 
     198@@ -881,57 +830,41 @@
    137199 
    138200 bool QtFrontend::isRecoveryMode()
    139201 {
    140 -    qDebug("QtFrontend::isRecoveryMode --> Start");
    141  
     202-    qDebug() << "QtFrontend::isRecoveryMode --> Start";
     203-
    142204     if (QFile::exists(getTempDirName()) == false) {
    143 -        qDebug("QtFrontend::isRecoveryMode --> End (False)");
     205-        qDebug() << "QtFrontend::isRecoveryMode --> End (False)";
    144206         return false;
    145207     }
    146208 
    147209     // Everything is intact and we have to run in recovery mode
    148 -    qDebug("QtFrontend::isRecoveryMode --> End (True)");
     210-    qDebug() << "QtFrontend::isRecoveryMode --> End (True)";
    149211     return true;
    150212 }
     
    153215 bool QtFrontend::recoverProject()
    154216 {
    155 -    qDebug("QtFrontend::recoverProject --> Start");
    156  
     217-    qDebug() << "QtFrontend::recoverProject --> Start";
     218-
    157219     int ret = askQuestion(tr("Recovery"),
    158220                   tr("Something caused qStopmotion to exit abnormally\n"
     
    160222     // The user wants to recover
    161223     if (ret != 0) {
    162 -        qDebug("QtFrontend::recoverProject --> End (False)");
     224-        qDebug() << "QtFrontend::recoverProject --> End (False)";
    163225         return false;
    164226     }
     
    167229     bool recovered = getProject()->recoverProject();
    168230 
    169 -    qDebug("QtFrontend::recoverProject --> End");
     231-    qDebug() << "QtFrontend::recoverProject --> End";
    170232     return recovered;
    171233 }
     
    174236 void QtFrontend::startDialog()
    175237 {
    176 -    qDebug("QtFrontend::startDialog --> Start");
    177  
     238-    qDebug() << "QtFrontend::startDialog --> Start";
     239-
    178240     mw->startDialog();
    179  
    180 -    qDebug("QtFrontend::startDialog --> End");
     241-
     242-    qDebug() << "QtFrontend::startDialog --> End";
    181243 }
    182244 
     
    184246 void QtFrontend::setToolBarState(int newState)
    185247 {
    186 -    qDebug("MainWindowGUI::setToolBarState --> Start");
    187  
     248-    qDebug() << "MainWindowGUI::setToolBarState --> Start";
     249-
    188250     mw->setToolBarState(newState);
    189  
    190 -    qDebug("MainWindowGUI::setToolBarState --> End");
    191  }
    192  
    193  
    194 @@ -1071,55 +1034,45 @@
     251-
     252-    qDebug() << "MainWindowGUI::setToolBarState --> End";
     253 }
     254 
     255 
     256@@ -1075,55 +1008,45 @@
    195257 
    196258 void QtFrontend::test(QWidget *parentWidget, int level)
  • qstopmotion/trunk/fuentes/debian/patches/series

    r4773 r4774  
     1cmakelists.patch
  • qstopmotion/trunk/fuentes/debian/rules

    r4773 r4774  
    11#!/usr/bin/make -f
    2 #export DH_VERBOSE = 1
    3 
    4 
    5 # see FEATURE AREAS in dpkg-buildflags(1)
    6 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
    7 
    8 # see ENVIRONMENT in dpkg-buildflags(1)
    9 # package maintainers to append CFLAGS
    10 #export DEB_CFLAGS_MAINT_APPEND  = -Wall -pedantic
    11 # package maintainers to append LDFLAGS
    12 #export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
    13 
    14 
    152%:
    16         dh $@ --buildsystem=cmake --parallel
    17 
    18 
    19 # dh_make generated override targets
    20 # This is example for Cmake (See https://bugs.debian.org/641051 )
    21 #override_dh_auto_configure:
    22 #       dh_auto_configure -- #  -DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH)
    23 
     3        dh $@
  • qstopmotion/trunk/fuentes/debian/watch

    r4773 r4774  
    1 # Compulsory line, this is a version 4 file
    2 version=4
    3 
    4 # SourceForge hosted projects
    5 http://sf.net/qstopmotion/ qstopmotion-(.*)-Source\.tar\.gz debian uupdate
     1version=3
     2http://sf.net/qstopmotion/qstopmotion-([\d\.]+)-Source\.tar\.(?:gz|bz2|xz)?
Note: See TracChangeset for help on using the changeset viewer.