[debian-edu-commits] debian-edu/pkg-team/ 01/03: Honor CONTRIBUTORS override

[Javier Serrano Polo]

This is an automated email from the git hooks/post-receive script.

jasp00-guest pushed a commit to branch master
in repository lmms.

commit 45ca34c581f43faaf4dadcf5005e3cf036852afc
Author: Javier Serrano Polo <javier at jasp.net>
Date:   Mon Aug 29 20:50:06 2016 +0200

    Honor CONTRIBUTORS override
---
 debian/changelog                        |  1 +
 debian/patches/honor-contributors.patch | 40 +++++++++++++++++++++++++++++++++
 debian/patches/series                   |  1 +
 3 files changed, 42 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index ba983cb..495910d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ lmms (1.1.3-4) unstable; urgency=medium
   * Dropped unused build dependencies.
   * Dropped workaround for #824715, wineg++ is fixed.
   * Added contributors.
+  * Honor CONTRIBUTORS override.
 
  -- Javier Serrano Polo <javier at jasp.net>  Wed, 08 Jun 2016 01:25:37 +0200
 
diff --git a/debian/patches/honor-contributors.patch b/debian/patches/honor-contributors.patch
new file mode 100644
index 0000000..1dbd65d
--- /dev/null
+++ b/debian/patches/honor-contributors.patch
@@ -0,0 +1,40 @@
+Description: Honor CONTRIBUTORS override
+ When building from the source tarball, there is no Git history from LMMS and no
+ CONTRIBUTORS file, which is used by AboutDialog. When packaging in Debian, the
+ CONTRIBUTORS file can be added and configured with
+ -DCONTRIBUTORS=/path/to/CONTRIBUTORS. However, there is Git history from the
+ Debian packaging and that information is the one embedded in the program. With
+ this patch, Git history is ignored if -DCONTRIBUTORS is set.
+Author: Javier Serrano Polo <javier at jasp.net>
+Bug: https://github.com/LMMS/lmms/pull/2975
+Applied-Upstream: 1.1.91
+
+Index: lmms-1.1.3/CMakeLists.txt
+===================================================================
+--- lmms-1.1.3.orig/CMakeLists.txt	2016-06-07 18:49:57.000000000 +0200
++++ lmms-1.1.3/CMakeLists.txt	2016-08-29 20:46:03.000000000 +0200
+@@ -367,9 +367,13 @@
+ 
+ SET(lmms_MOC ${lmms_INCLUDES})
+ 
+-# Get list of all committers from git history, ordered by number of commits
++# Get list of all committers from git history, ordered by number of commits.
++# The CONTRIBUTORS file is used by AboutDialog. This information can be provided
++# with -DCONTRIBUTORS=/path/to/CONTRIBUTORS instead. For instance, to generate
++# this file for version 1.1.3, the command is:
++# 	git shortlog -sne v1.1.3 | cut -c8-
+ FIND_PACKAGE(Git)
+-IF(GIT_FOUND)
++IF(GIT_FOUND AND NOT CONTRIBUTORS)
+ 	SET(CONTRIBUTORS "${CMAKE_BINARY_DIR}/CONTRIBUTORS")
+ 	EXECUTE_PROCESS(
+ 		COMMAND "${GIT_EXECUTABLE}" shortlog -sne
+@@ -377,7 +381,7 @@
+ 		OUTPUT_FILE "${CONTRIBUTORS}"
+ 		WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
+ 		TIMEOUT 1)
+-ENDIF(GIT_FOUND)
++ENDIF()
+ 
+ SET(lmms_EMBEDDED_RESOURCES "${CMAKE_SOURCE_DIR}/AUTHORS" "${CMAKE_SOURCE_DIR}/COPYING" "${CONTRIBUTORS}")
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 5cd49da..d1e4810 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -15,3 +15,4 @@ license-gpl3.patch
 copyright-fixes.patch
 sort-glob.patch
 contributors.patch
+honor-contributors.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/pkg-team/lmms.git