Changeset 4777


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

Updated to 2.3.2-1

Location:
qstopmotion/trunk/fuentes
Files:
1 added
3 deleted
8 edited

Legend:

Unmodified
Added
Removed
  • qstopmotion/trunk/fuentes/CMakeLists.txt

    r4776 r4777  
    365365)
    366366
     367SET(
     368    DEB_FILES
     369    deb/qstopmotion.xpm       # DEB Icon is installed in a separate step
     370    deb/changelog             # DEB changelog file
     371    deb/changelog.gz          # DEB changelog file compressed
     372    deb/copyright             # DEB copyright file
     373    deb/qstopmotion.menu      # DEB .menu is installed in a separate step for Debian systems
     374    deb/postinst              # DEB post installation script file, call update-menus
     375)
     376
     377SET(
     378    RPM_FILES
     379    rpm/qstopmotion.png       # RPM Icon is installed in a separate step
     380)
     381
    367382###############################################################################
    368383# gPhoto2 support
     
    582597    file(COPY ${GENERAL_FILES} DESTINATION "share/qstopmotion/")
    583598    file(COPY ${UNIX_FILES} DESTINATION "share/qstopmotion/")
     599    file(COPY ${DEB_FILES} DESTINATION "share/qstopmotion/deb/")
     600    file(COPY ${RPM_FILES} DESTINATION "share/qstopmotion/rpm/")
    584601ENDIF(UNIX AND NOT APPLE)
    585602
     
    682699    )
    683700ENDIF(UNIX AND NOT APPLE)
     701
     702# installation on DEB systems
     703IF(CPACK_BINARY_DEB)
     704    message("Special task for deb package!")
     705   
     706    # installation of the icon file
     707    install(
     708        FILES "deb/qstopmotion.xpm"
     709        DESTINATION ${QSTOPMOTION_PIXMAP_INSTALL_DIR}
     710    )
     711
     712    # installation of the .menufile file
     713    install(
     714        FILES "deb/qstopmotion.menu"
     715        DESTINATION ${QSTOPMOTION_MENUFILE_INSTALL_DIR}
     716    )
     717
     718    # installation of the changelog file
     719    install(
     720        FILES "deb/changelog.gz"
     721        DESTINATION ${QSTOPMOTION_MANUAL_INSTALL_DIR}
     722    )
     723
     724    # installation of the copyright file
     725    install(
     726        FILES "deb/copyright"
     727        DESTINATION ${QSTOPMOTION_MANUAL_INSTALL_DIR}
     728    )
     729ENDIF(CPACK_BINARY_DEB)
     730
     731# installation on RPM systems
     732IF(CPACK_BINARY_RPM)
     733    message("Special task for rpm package!")
     734   
     735    # installation of the general-purpose files
     736    install(
     737        FILES ${GENERAL_FILES}
     738        DESTINATION ${QSTOPMOTION_GENERALS_INSTALL_DIR}
     739    )
     740
     741    # installation of the icon file
     742    install(
     743        FILES "rpm/qstopmotion.png"
     744        DESTINATION ${QSTOPMOTION_PIXMAP_INSTALL_DIR}
     745    )
     746ENDIF(CPACK_BINARY_RPM)
    684747
    685748# installation on Windows systems
     
    9961059# SET(CPACK_NSIS_MUI_FINISHPAGE_RUN "qstopmotion.exe"
    9971060
     1061###############################################################################
     1062# DEB package - Linux only (Debian, OpenSuse, Ubuntu, ...)
     1063###############################################################################
     1064
     1065IF ("${LSB_DISTRIB}" MATCHES "Ubuntu|Debian")
     1066    # We need to alter the architecture names as per distro rules
     1067    IF ("${CPACK_PACKAGE_ARCHITECTURE}" MATCHES "i[3-6]86")
     1068        SET(
     1069            CPACK_PACKAGE_ARCHITECTURE
     1070            "i386"
     1071        )
     1072    ENDIF ("${CPACK_PACKAGE_ARCHITECTURE}" MATCHES "i[3-6]86")
     1073    IF ("${CPACK_PACKAGE_ARCHITECTURE}" MATCHES "x86_64")
     1074        SET(
     1075            CPACK_PACKAGE_ARCHITECTURE
     1076            "amd64"
     1077        )
     1078    ENDIF ("${CPACK_PACKAGE_ARCHITECTURE}" MATCHES "x86_64")
     1079    SET(
     1080        CPACK_SYSTEM_NAME
     1081        "${LSB_DISTRIB}-${CPACK_PACKAGE_ARCHITECTURE}"
     1082    )
     1083
     1084    # Set the dependencies based on the distro version
     1085    # thus only one package is build you must list here *any* depending libraries,
     1086    # even if they are only used in one module
     1087    IF ("${LSB_DISTRIB}" MATCHES "Ubuntu14.04")
     1088        SET(
     1089            CPACK_DEBIAN_PACKAGE_DEPENDS
     1090            "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)"
     1091        )
     1092    ENDIF ("${LSB_DISTRIB}" MATCHES "Ubuntu14.04")
     1093    IF ("${LSB_DISTRIB}" MATCHES "Ubuntu16.04")
     1094        SET(
     1095            CPACK_DEBIAN_PACKAGE_DEPENDS
     1096            "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)"
     1097        )
     1098    ENDIF ("${LSB_DISTRIB}" MATCHES "Ubuntu16.04")
     1099    IF ("${LSB_DISTRIB}" MATCHES "Debian7.*")
     1100        SET(
     1101            CPACK_DEBIAN_PACKAGE_DEPENDS
     1102            "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)"
     1103        )
     1104    ENDIF ("${LSB_DISTRIB}" MATCHES "Debian7.*")
     1105    IF ("${LSB_DISTRIB}" MATCHES "Debian8.*")
     1106        SET(
     1107            CPACK_DEBIAN_PACKAGE_DEPENDS
     1108            "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)"
     1109        )
     1110    ENDIF ("${LSB_DISTRIB}" MATCHES "Debian8.*")
     1111    IF (NOT CPACK_DEBIAN_PACKAGE_DEPENDS)
     1112        MESSAGE ("WARNING: ${LSB_DISTRIB} not supported yet.\nPlease set deps in CMakeLists.txt before packaging.")
     1113    ENDIF (NOT CPACK_DEBIAN_PACKAGE_DEPENDS)
     1114ENDIF ("${LSB_DISTRIB}" MATCHES "Ubuntu|Debian")
     1115MESSAGE("CPACK_DEBIAN_PACKAGE_DEPENDS: ${CPACK_DEBIAN_PACKAGE_DEPENDS}")
     1116
     1117# Mandatory
     1118# CPACK_DEBIAN_PACKAGE_NAME = CPACK_PACKAGE_NAME
     1119MESSAGE("CPACK_DEBIAN_PACKAGE_NAME: ${CPACK_DEBIAN_PACKAGE_NAME}")
     1120# CPACK_DEBIAN_PACKAGE_VERSION = CPACK_PACKAGE_VERSION
     1121MESSAGE("CPACK_DEBIAN_PACKAGE_VERSION: ${CPACK_DEBIAN_PACKAGE_VERSION}")
     1122# CPACK_DEBIAN_PACKAGE_ARCHITECTURE = dpkg output       # dpkg --print-architecture ???
     1123MESSAGE("CPACK_DEBIAN_PACKAGE_ARCHITECTURE: ${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}")
     1124# CPACK_DEBIAN_PACKAGE_MAINTAINER = CPACK_PACKAGE_CONTACT
     1125MESSAGE("CPACK_DEBIAN_PACKAGE_MAINTAINER: ${CPACK_DEBIAN_PACKAGE_MAINTAINER}")
     1126SET(
     1127    CPACK_DEBIAN_PACKAGE_DESCRIPTION
     1128    "create stop motion animations\n qStopMotion can be used to create stop motion animations."
     1129)
     1130MESSAGE("CPACK_DEBIAN_PACKAGE_DESCRIPTION: ${CPACK_DEBIAN_PACKAGE_DESCRIPTION}")
     1131SET(
     1132    CPACK_DEBIAN_PACKAGE_SECTION
     1133    "graphics"
     1134)
     1135MESSAGE("CPACK_DEBIAN_PACKAGE_SECTION: ${CPACK_DEBIAN_PACKAGE_SECTION}")
     1136SET(
     1137    CPACK_DEBIAN_PACKAGE_PRIORITY
     1138    "optional"
     1139)
     1140MESSAGE("CPACK_DEBIAN_PACKAGE_PRIORITY: ${CPACK_DEBIAN_PACKAGE_PRIORITY}")
     1141
     1142# Options
     1143
     1144SET(CPACK_DEBIAN_PACKAGE_HOMEPAGE ${QSTOPMOTION_HOMEPAGE})
     1145# CPACK_DEBIAN_PACKAGE_SHLIBDEPS
     1146# SET(CPACK_DEBIAN_PACKAGE_DEBUG "ON")
     1147# CPACK_DEBIAN_PACKAGE_DEBUG
     1148# CPACK_DEBIAN_PACKAGE_ENHANCES
     1149# CPACK_DEBIAN_PACKAGE_BREAKS
     1150# CPACK_DEBIAN_PACKAGE_CONFLICTS
     1151# CPACK_DEBIAN_PACKAGE_PROVIDES
     1152# CPACK_DEBIAN_PACKAGE_REPLACES
     1153SET(
     1154    CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA
     1155    "${CMAKE_SOURCE_DIR}/deb/postinst"
     1156)
     1157
     1158###############################################################################
     1159# RPM package - Linux only (Fedora, Red Hat, CentOS, Mandriva, ...)
     1160###############################################################################
     1161
     1162# Mandatory
     1163SET(
     1164    CPACK_RPM_PACKAGE_SUMMARY
     1165    ${CPACK_PACKAGE_DESCRIPTION_SUMMARY}
     1166)
     1167MESSAGE("CPACK_RPM_PACKAGE_SUMMARY: ${CPACK_RPM_PACKAGE_SUMMARY}")
     1168# CPACK_RPM_PACKAGE_NAME = CPACK_PACKAGE_NAME
     1169MESSAGE("CPACK_RPM_PACKAGE_NAME: ${CPACK_RPM_PACKAGE_NAME}")
     1170# CPACK_RPM_PACKAGE_VERSION = CPACK_PACKAGE_VERSION
     1171MESSAGE("CPACK_RPM_PACKAGE_VERSION: ${CPACK_RPM_PACKAGE_VERSION}")
     1172# SET(CPACK_RPM_PACKAGE_RELEASE "1")
     1173MESSAGE("CPACK_RPM_PACKAGE_RELEASE: ${CPACK_RPM_PACKAGE_RELEASE}")
     1174SET(
     1175    CPACK_RPM_PACKAGE_LICENSE
     1176    "GPLv2"
     1177)
     1178MESSAGE("CPACK_RPM_PACKAGE_LICENSE: ${CPACK_RPM_PACKAGE_LICENSE}")
     1179SET(
     1180    CPACK_RPM_PACKAGE_GROUP
     1181    "Applications/Multimedia"
     1182)
     1183MESSAGE("CPACK_RPM_PACKAGE_GROUP: ${CPACK_RPM_PACKAGE_GROUP}")
     1184# CPACK_RPM_PACKAGE_VENDOR = CPACK_PACKAGE_VENDOR
     1185MESSAGE("CPACK_RPM_PACKAGE_VENDOR: ${CPACK_RPM_PACKAGE_VENDOR}")
     1186# CPACK_RPM_PACKAGE_MAINTAINER = CPACK_PACKAGE_CONTACT
     1187MESSAGE("CPACK_RPM_PACKAGE_MAINTAINER: ${CPACK_RPM_PACKAGE_MAINTAINER}")
     1188
     1189# Options
     1190# SET(CPACK_RPM_PACKAGE_ARCHITECTURE "noarch")
     1191SET(
     1192    CPACK_RPM_PACKAGE_URL
     1193    ${QSTOPMOTION_HOMEPAGE}
     1194)
     1195# CPACK_RPM_PACKAGE_DESCRIPTION = CPACK_PACKAGE_DESCRIPTION_FILE
     1196# CPACK_RPM_COMPRESSION_TYPE
     1197# requireses must be in a aphabetic order
     1198# Qt5: qt5-qtbase - Core, Concurrent, DBus, Network, Sql, Test, Xml
     1199# Qt5: qt5-qtbase-gui - Gui, OpenGL, PrintSupport, Widgets, XcbQpa
     1200# Qt5: qt5-qtimageformats - Qt5 image format plugins
     1201# Qt5: qt5-qtmultimedia - Multimedia, MultimediaQuick, MultimediaWidgets
     1202SET(
     1203    CPACK_RPM_PACKAGE_REQUIRES
     1204    "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"
     1205)
     1206MESSAGE("CPACK_RPM_PACKAGE_REQUIRES: ${CPACK_RPM_PACKAGE_REQUIRES}")
     1207# CPACK_RPM_PACKAGE_SUGGESTS
     1208# CPACK_RPM_PACKAGE_PROVIDES
     1209
     1210# SET(CPACK_RPM_SPEC_INSTALL_POST "desktop-file-validate /usr/share/applications/qstopmotion.desktop")
     1211
     1212# SET(CPACK_RPM_PRE_INSTALL_SCRIPT_FILE "pre_install.sh")
     1213# SET(CPACK_RPM_POST_INSTALL_SCRIPT_FILE "post_install.sh")
     1214# SET(CPACK_RPM_PRE_UNINSTALL_SCRIPT_FILE "pre_install.sh")
     1215# SET(CPACK_RPM_POST_UNINSTALL_SCRIPT_FILE "post_install.sh")
     1216
     1217# Prevent conflicts with the filesystem package
     1218SET(
     1219    CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION
     1220    "/usr/bin"
     1221    "/usr/share/applications"
     1222    "/usr/share/icons"
     1223    "/usr/share/pixmaps"
     1224    "/usr/share/man"
     1225    "/usr/share/man/man1"
     1226)
    9981227
    9991228###############################################################################
  • qstopmotion/trunk/fuentes/debian/changelog

    r4774 r4777  
    1 qstopmotion (2.3.2-1~getdeb1) xenial; urgency=medium
     1qstopmotion (2.3.2-1) unstable; urgency=low
    22
    3   * New upstream version
    4       * Some spelling corrections.
    5       * Update of the Czech translation.
     3  * Initial release (Closes: #827840)
    64
    7  -- Christoph Korn <christoph.korn@getdeb.net>  Mon, 14 Nov 2016 18:46:56 +0100
    8 
    9 qstopmotion (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 
    15 qstopmotion (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 
    21 qstopmotion (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 
    31 qstopmotion (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 
    41 qstopmotion (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
     5 -- Adrian Knoth <adi@drcomp.erfurt.thur.de>  Mon, 14 Nov 2016 20:58:37 +0100
  • qstopmotion/trunk/fuentes/debian/compat

    r4774 r4777  
    1 9
     110
  • qstopmotion/trunk/fuentes/debian/control

    r4774 r4777  
    22Section: video
    33Priority: optional
    4 Maintainer: Christoph Korn <christoph.korn@getdeb.net>
    5 Build-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
    13 Standards-Version: 3.9.7
    14 Homepage: http://www.qstopmotion.org/
     4Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers@lists.alioth.debian.org>
     5Uploaders: Adrian Knoth <adi@drcomp.erfurt.thur.de>
     6Build-Depends: debhelper (>=10),
     7 libgphoto2-dev,
     8 libxml2-dev,
     9 libv4l-dev,
     10 qtbase5-dev,
     11 cmake
     12Standards-Version: 3.9.8
     13Homepage: http://www.qstopmotion.org
     14Vcs-Git: https://anonscm.debian.org/git/pkg-multimedia/qstopmotion.git
     15Vcs-Browser: https://anonscm.debian.org/gitweb/?p=pkg-multimedia/qstopmotion.git
    1516
    1617Package: qstopmotion
    1718Architecture: any
    18 Depends: ${shlibs:Depends},
    19          ${misc:Depends}
    20 Description: 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.
     19Depends: ${shlibs:Depends}, ${misc:Depends}
     20Recommends: ffmpeg,
     21 v4l-utils
     22Description: 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.
  • qstopmotion/trunk/fuentes/debian/copyright

    r4774 r4777  
    1 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
     1Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
    22Upstream-Name: qstopmotion
    3 Source: http://sourceforge.net/projects/qstopmotion/files/
     3Source: http://www.qstopmotion.org
    44
    55Files: *
    6 Copyright: Ralf Lange <ralf.lange@longsoft.de>
    7            Bjoern Erik Nilsen <bjoern.nilsen@bjoernen.com>
    8            Fredrik Berg Kjoelstad <fredrikbk@hotmail.com>
    9 License: GPL-2.0+
     6Copyright: 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>
     9License: GPL-2+
    1010
    1111Files: debian/*
    12 Copyright: 2013 Christoph Korn <christoph.korn@getdeb.net>
    13 License: GPL-2.0+
     12Copyright: 2016 Adrian Knoth <adi@drcomp.erfurt.thur.de>
     13License: GPL-2+
    1414
    15 License: GPL-2.0+
     15License: GPL-2+
    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 <http://www.gnu.org/licenses/>
     27 along with this program. If not, see <https://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/series

    r4776 r4777  
    1 cmakelists.patch
    2 makeBuild
  • qstopmotion/trunk/fuentes/debian/rules

    r4774 r4777  
    11#!/usr/bin/make -f
     2#export DH_VERBOSE = 1
     3
     4
     5# see FEATURE AREAS in dpkg-buildflags(1)
     6export 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
    215%:
    3         dh $@
     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
  • qstopmotion/trunk/fuentes/debian/watch

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