Changeset 4777

Timestamp:

May 16, 2017, 12:49:40 PM (4 years ago)

Author:

Juanma

Message:

Updated to 2.3.2-1

Location:

qstopmotion/trunk/fuentes

Files:

• CMakeLists.txt (modified) (4 diffs)
• debian/changelog (modified) (1 diff)
• debian/compat (modified) (1 diff)
• debian/control (modified) (1 diff)
• debian/copyright (modified) (2 diffs)
• debian/patches/cmakelists.patch (deleted)
• debian/patches/ftbfs.patch (deleted)
• debian/patches/makeBuild (deleted)
• debian/patches/series (modified) (1 diff)
• debian/qstopmotion.doc-base (added)
• debian/rules (modified) (1 diff)
• debian/watch (modified) (1 diff)

qstopmotion/trunk/fuentes/CMakeLists.txt

@@ -365 +365 @@
 )
 
+SET(
+    DEB_FILES
+    deb/qstopmotion.xpm       # DEB Icon is installed in a separate step
+    deb/changelog             # DEB changelog file
+    deb/changelog.gz          # DEB changelog file compressed
+    deb/copyright             # DEB copyright file
+    deb/qstopmotion.menu      # DEB .menu is installed in a separate step for Debian systems
+    deb/postinst              # DEB post installation script file, call update-menus
+)
+
+SET(
+    RPM_FILES
+    rpm/qstopmotion.png       # RPM Icon is installed in a separate step
+)
+
 ###############################################################################
 # gPhoto2 support
@@ -582 +597 @@
     file(COPY ${GENERAL_FILES} DESTINATION "share/qstopmotion/")
     file(COPY ${UNIX_FILES} DESTINATION "share/qstopmotion/")
+    file(COPY ${DEB_FILES} DESTINATION "share/qstopmotion/deb/")
+    file(COPY ${RPM_FILES} DESTINATION "share/qstopmotion/rpm/")
 ENDIF(UNIX AND NOT APPLE)
 
@@ -682 +699 @@
     )
 ENDIF(UNIX AND NOT APPLE)
+
+# installation on DEB systems
+IF(CPACK_BINARY_DEB)
+    message("Special task for deb package!")
+    
+    # installation of the icon file
+    install(
+        FILES "deb/qstopmotion.xpm"
+        DESTINATION ${QSTOPMOTION_PIXMAP_INSTALL_DIR}
+    )
+
+    # installation of the .menufile file
+    install(
+        FILES "deb/qstopmotion.menu"
+        DESTINATION ${QSTOPMOTION_MENUFILE_INSTALL_DIR}
+    )
+
+    # installation of the changelog file
+    install(
+        FILES "deb/changelog.gz"
+        DESTINATION ${QSTOPMOTION_MANUAL_INSTALL_DIR}
+    )
+
+    # installation of the copyright file
+    install(
+        FILES "deb/copyright"
+        DESTINATION ${QSTOPMOTION_MANUAL_INSTALL_DIR}
+    )
+ENDIF(CPACK_BINARY_DEB)
+
+# installation on RPM systems
+IF(CPACK_BINARY_RPM)
+    message("Special task for rpm package!")
+    
+    # installation of the general-purpose files
+    install(
+        FILES ${GENERAL_FILES}
+        DESTINATION ${QSTOPMOTION_GENERALS_INSTALL_DIR}
+    )
+
+    # installation of the icon file
+    install(
+        FILES "rpm/qstopmotion.png"
+        DESTINATION ${QSTOPMOTION_PIXMAP_INSTALL_DIR}
+    )
+ENDIF(CPACK_BINARY_RPM)
 
 # installation on Windows systems
@@ -996 +1059 @@
 # SET(CPACK_NSIS_MUI_FINISHPAGE_RUN "qstopmotion.exe"
 
+###############################################################################
+# DEB package - Linux only (Debian, OpenSuse, Ubuntu, ...)
+###############################################################################
+
+IF ("${LSB_DISTRIB}" MATCHES "Ubuntu|Debian")
+    # We need to alter the architecture names as per distro rules
+    IF ("${CPACK_PACKAGE_ARCHITECTURE}" MATCHES "i[3-6]86")
+        SET(
+            CPACK_PACKAGE_ARCHITECTURE
+            "i386"
+        )
+    ENDIF ("${CPACK_PACKAGE_ARCHITECTURE}" MATCHES "i[3-6]86")
+    IF ("${CPACK_PACKAGE_ARCHITECTURE}" MATCHES "x86_64")
+        SET(
+            CPACK_PACKAGE_ARCHITECTURE
+            "amd64"
+        )
+    ENDIF ("${CPACK_PACKAGE_ARCHITECTURE}" MATCHES "x86_64")
+    SET(
+        CPACK_SYSTEM_NAME
+        "${LSB_DISTRIB}-${CPACK_PACKAGE_ARCHITECTURE}"
+    )
+
+    # Set the dependencies based on the distro version
+    # thus only one package is build you must list here *any* depending libraries,
+    # even if they are only used in one module
+    IF ("${LSB_DISTRIB}" MATCHES "Ubuntu14.04")
+        SET(
+            CPACK_DEBIAN_PACKAGE_DEPENDS
+            "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)"
+        )
+    ENDIF ("${LSB_DISTRIB}" MATCHES "Ubuntu14.04")
+    IF ("${LSB_DISTRIB}" MATCHES "Ubuntu16.04")
+        SET(
+            CPACK_DEBIAN_PACKAGE_DEPENDS
+            "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)"
+        )
+    ENDIF ("${LSB_DISTRIB}" MATCHES "Ubuntu16.04")
+    IF ("${LSB_DISTRIB}" MATCHES "Debian7.*")
+        SET(
+            CPACK_DEBIAN_PACKAGE_DEPENDS
+            "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)"
+        )
+    ENDIF ("${LSB_DISTRIB}" MATCHES "Debian7.*")
+    IF ("${LSB_DISTRIB}" MATCHES "Debian8.*")
+        SET(
+            CPACK_DEBIAN_PACKAGE_DEPENDS
+            "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)"
+        )
+    ENDIF ("${LSB_DISTRIB}" MATCHES "Debian8.*")
+    IF (NOT CPACK_DEBIAN_PACKAGE_DEPENDS)
+        MESSAGE ("WARNING: ${LSB_DISTRIB} not supported yet.\nPlease set deps in CMakeLists.txt before packaging.")
+    ENDIF (NOT CPACK_DEBIAN_PACKAGE_DEPENDS)
+ENDIF ("${LSB_DISTRIB}" MATCHES "Ubuntu|Debian")
+MESSAGE("CPACK_DEBIAN_PACKAGE_DEPENDS: ${CPACK_DEBIAN_PACKAGE_DEPENDS}")
+
+# Mandatory
+# CPACK_DEBIAN_PACKAGE_NAME = CPACK_PACKAGE_NAME
+MESSAGE("CPACK_DEBIAN_PACKAGE_NAME: ${CPACK_DEBIAN_PACKAGE_NAME}")
+# CPACK_DEBIAN_PACKAGE_VERSION = CPACK_PACKAGE_VERSION
+MESSAGE("CPACK_DEBIAN_PACKAGE_VERSION: ${CPACK_DEBIAN_PACKAGE_VERSION}")
+# CPACK_DEBIAN_PACKAGE_ARCHITECTURE = dpkg output       # dpkg --print-architecture ???
+MESSAGE("CPACK_DEBIAN_PACKAGE_ARCHITECTURE: ${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}")
+# CPACK_DEBIAN_PACKAGE_MAINTAINER = CPACK_PACKAGE_CONTACT
+MESSAGE("CPACK_DEBIAN_PACKAGE_MAINTAINER: ${CPACK_DEBIAN_PACKAGE_MAINTAINER}")
+SET(
+    CPACK_DEBIAN_PACKAGE_DESCRIPTION
+    "create stop motion animations\n qStopMotion can be used to create stop motion animations."
+)
+MESSAGE("CPACK_DEBIAN_PACKAGE_DESCRIPTION: ${CPACK_DEBIAN_PACKAGE_DESCRIPTION}")
+SET(
+    CPACK_DEBIAN_PACKAGE_SECTION
+    "graphics"
+)
+MESSAGE("CPACK_DEBIAN_PACKAGE_SECTION: ${CPACK_DEBIAN_PACKAGE_SECTION}")
+SET(
+    CPACK_DEBIAN_PACKAGE_PRIORITY
+    "optional"
+)
+MESSAGE("CPACK_DEBIAN_PACKAGE_PRIORITY: ${CPACK_DEBIAN_PACKAGE_PRIORITY}")
+
+# Options
+
+SET(CPACK_DEBIAN_PACKAGE_HOMEPAGE ${QSTOPMOTION_HOMEPAGE})
+# CPACK_DEBIAN_PACKAGE_SHLIBDEPS
+# SET(CPACK_DEBIAN_PACKAGE_DEBUG "ON")
+# CPACK_DEBIAN_PACKAGE_DEBUG
+# CPACK_DEBIAN_PACKAGE_ENHANCES
+# CPACK_DEBIAN_PACKAGE_BREAKS
+# CPACK_DEBIAN_PACKAGE_CONFLICTS
+# CPACK_DEBIAN_PACKAGE_PROVIDES
+# CPACK_DEBIAN_PACKAGE_REPLACES
+SET(
+    CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA
+    "${CMAKE_SOURCE_DIR}/deb/postinst"
+)
+
+###############################################################################
+# RPM package - Linux only (Fedora, Red Hat, CentOS, Mandriva, ...)
+###############################################################################
+
+# Mandatory
+SET(
+    CPACK_RPM_PACKAGE_SUMMARY
+    ${CPACK_PACKAGE_DESCRIPTION_SUMMARY}
+)
+MESSAGE("CPACK_RPM_PACKAGE_SUMMARY: ${CPACK_RPM_PACKAGE_SUMMARY}")
+# CPACK_RPM_PACKAGE_NAME = CPACK_PACKAGE_NAME
+MESSAGE("CPACK_RPM_PACKAGE_NAME: ${CPACK_RPM_PACKAGE_NAME}")
+# CPACK_RPM_PACKAGE_VERSION = CPACK_PACKAGE_VERSION
+MESSAGE("CPACK_RPM_PACKAGE_VERSION: ${CPACK_RPM_PACKAGE_VERSION}")
+# SET(CPACK_RPM_PACKAGE_RELEASE "1")
+MESSAGE("CPACK_RPM_PACKAGE_RELEASE: ${CPACK_RPM_PACKAGE_RELEASE}")
+SET(
+    CPACK_RPM_PACKAGE_LICENSE
+    "GPLv2"
+)
+MESSAGE("CPACK_RPM_PACKAGE_LICENSE: ${CPACK_RPM_PACKAGE_LICENSE}")
+SET(
+    CPACK_RPM_PACKAGE_GROUP
+    "Applications/Multimedia"
+)
+MESSAGE("CPACK_RPM_PACKAGE_GROUP: ${CPACK_RPM_PACKAGE_GROUP}")
+# CPACK_RPM_PACKAGE_VENDOR = CPACK_PACKAGE_VENDOR
+MESSAGE("CPACK_RPM_PACKAGE_VENDOR: ${CPACK_RPM_PACKAGE_VENDOR}")
+# CPACK_RPM_PACKAGE_MAINTAINER = CPACK_PACKAGE_CONTACT
+MESSAGE("CPACK_RPM_PACKAGE_MAINTAINER: ${CPACK_RPM_PACKAGE_MAINTAINER}")
+
+# Options
+# SET(CPACK_RPM_PACKAGE_ARCHITECTURE "noarch")
+SET(
+    CPACK_RPM_PACKAGE_URL
+    ${QSTOPMOTION_HOMEPAGE}
+)
+# CPACK_RPM_PACKAGE_DESCRIPTION = CPACK_PACKAGE_DESCRIPTION_FILE
+# CPACK_RPM_COMPRESSION_TYPE
+# requireses must be in a aphabetic order
+# Qt5: qt5-qtbase - Core, Concurrent, DBus, Network, Sql, Test, Xml
+# Qt5: qt5-qtbase-gui - Gui, OpenGL, PrintSupport, Widgets, XcbQpa
+# Qt5: qt5-qtimageformats - Qt5 image format plugins
+# Qt5: qt5-qtmultimedia - Multimedia, MultimediaQuick, MultimediaWidgets
+SET(
+    CPACK_RPM_PACKAGE_REQUIRES
+    "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"
+)
+MESSAGE("CPACK_RPM_PACKAGE_REQUIRES: ${CPACK_RPM_PACKAGE_REQUIRES}")
+# CPACK_RPM_PACKAGE_SUGGESTS
+# CPACK_RPM_PACKAGE_PROVIDES
+
+# SET(CPACK_RPM_SPEC_INSTALL_POST "desktop-file-validate /usr/share/applications/qstopmotion.desktop")
+
+# SET(CPACK_RPM_PRE_INSTALL_SCRIPT_FILE "pre_install.sh")
+# SET(CPACK_RPM_POST_INSTALL_SCRIPT_FILE "post_install.sh")
+# SET(CPACK_RPM_PRE_UNINSTALL_SCRIPT_FILE "pre_install.sh")
+# SET(CPACK_RPM_POST_UNINSTALL_SCRIPT_FILE "post_install.sh")
+
+# Prevent conflicts with the filesystem package
+SET(
+    CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION
+    "/usr/bin"
+    "/usr/share/applications"
+    "/usr/share/icons"
+    "/usr/share/pixmaps"
+    "/usr/share/man"
+    "/usr/share/man/man1"
+)
 
 ###############################################################################

qstopmotion/trunk/fuentes/debian/changelog

@@ -1 @@
-qstopmotion (2.3.2-1~getdeb1) xenial; urgency=medium
+qstopmotion (2.3.2-1) unstable; urgency=low
 
-  * New upstream version
-      * Some spelling corrections.
-      * Update of the Czech translation.
+  * Initial release (Closes: #827840)
 
- -- Christoph Korn <christoph.korn@getdeb.net>  Mon, 14 Nov 2016 18:46:56 +0100
-
-qstopmotion (2.3.1-1~getdeb1) xenial; urgency=medium
-
-  * New upstream version
-
- -- Christoph Korn <christoph.korn@getdeb.net>  Tue, 09 Aug 2016 17:41:18 +0200
-
-qstopmotion (2.2.0-1~getdeb1) xenial; urgency=medium
-
-  * New upstream version
-
- -- Christoph Korn <christoph.korn@getdeb.net>  Mon, 09 May 2016 12:44:11 +0200
-
-qstopmotion (2.0.2-1~getdeb1) trusty; urgency=medium
-
-  * New upstream version
-    * Update the Ubuntu package generation. Fix most of the lintian
-      messages.
-    * Add the CentOS package generation.
-    * Bug fixing.
-
- -- Christoph Korn <christoph.korn@getdeb.net>  Wed, 23 Sep 2015 19:19:10 +0200
-
-qstopmotion (2.0.0-1~getdeb1) trusty; urgency=medium
-
-  * New upstream version
-    * Remove of the Gstreamer grabber from the Windows platform.
-    * On Windows qStopMotion can be started as an portable application.
-    * Video4Linux2 grabber on the Linux platform.
-    * Camera controller for the Video4Linux2 grabber.
-
- -- Christoph Korn <christoph.korn@getdeb.net>  Fri, 02 Jan 2015 22:07:52 +0100
-
-qstopmotion (1.0.1-1~getdeb1) precise; urgency=low
-
-  * Initial release (LP: #1187151)
-
- -- Christoph Korn <christoph.korn@getdeb.net>  Wed, 05 Jun 2013 19:24:56 +0200
+ -- Adrian Knoth <adi@drcomp.erfurt.thur.de>  Mon, 14 Nov 2016 20:58:37 +0100

qstopmotion/trunk/fuentes/debian/compat

@@ -1 @@
-9
+10

qstopmotion/trunk/fuentes/debian/control

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

qstopmotion/trunk/fuentes/debian/copyright

@@ -1 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: qstopmotion
-Source: http://sourceforge.net/projects/qstopmotion/files/
+Source: http://www.qstopmotion.org
 
 Files: *
-Copyright: Ralf Lange <ralf.lange@longsoft.de>
-           Bjoern Erik Nilsen <bjoern.nilsen@bjoernen.com>
-           Fredrik Berg Kjoelstad <fredrikbk@hotmail.com>
-License: GPL-2.0+
+Copyright: 2005-2016 Ralf Lange <ralf.lange@longsoft.de>
+ 2005-2016 Bjoern Erik Nilsen <bjoern.nilsen@bjoernen.com>
+ 2005-2008 Fredrik Berg Kjoelstad <fredrikbk@hotmail.com>
+License: GPL-2+
 
 Files: debian/*
-Copyright: 2013 Christoph Korn <christoph.korn@getdeb.net>
-License: GPL-2.0+
+Copyright: 2016 Adrian Knoth <adi@drcomp.erfurt.thur.de>
+License: GPL-2+
 
-License: GPL-2.0+
+License: GPL-2+
  This package is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
@@ -25 +25 @@
  .
  You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>
+ along with this program. If not, see <https://www.gnu.org/licenses/>
  .
  On Debian systems, the complete text of the GNU General
  Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
-

qstopmotion/trunk/fuentes/debian/patches/series

@@ -1 @@
-cmakelists.patch
-makeBuild

qstopmotion/trunk/fuentes/debian/rules

@@ -1 +1 @@
 #!/usr/bin/make -f
+#export DH_VERBOSE = 1
+
+
+# see FEATURE AREAS in dpkg-buildflags(1)
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+
+# see ENVIRONMENT in dpkg-buildflags(1)
+# package maintainers to append CFLAGS
+#export DEB_CFLAGS_MAINT_APPEND  = -Wall -pedantic
+# package maintainers to append LDFLAGS
+#export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
+
+
 %:
-        dh $@
+        dh $@ --buildsystem=cmake --parallel
+
+
+# dh_make generated override targets
+# This is example for Cmake (See https://bugs.debian.org/641051 )
+#override_dh_auto_configure:
+#       dh_auto_configure -- #  -DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH)
+

qstopmotion/trunk/fuentes/debian/watch

@@ -1 @@
-version=3
-http://sf.net/qstopmotion/qstopmotion-([\d\.]+)-Source\.tar\.(?:gz|bz2|xz)?
+# Compulsory line, this is a version 4 file
+version=4
+
+# SourceForge hosted projects
+http://sf.net/qstopmotion/ qstopmotion-(.*)-Source\.tar\.gz debian uupdate