[SCM] dgedit/master: Imported Upstream version 0~git20151217

[viccuad-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit cb670122482b5b790a47db54789a9b27138c25cd
Author: viccuad <me at viccuad.me>
Date:   Thu Dec 17 15:06:42 2015 +0100

    Imported Upstream version 0~git20151217

diff --git a/ChangeLog b/ChangeLog
index 8650527..f4117bf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2015-11-19  Bent Bisballe Nyeng  <deva at aasimon.org>
+
+	* Fix reproducibility by sorting first on Moclist.h After grepping "Q_OBJECT", sort the files so the result is deterministic. Use locale C so there isn't differences between machines with different locale in the sorting.
+
+2015-11-18  Bent Bisballe Nyeng  <deva at aasimon.org>
+
+	* Removed unused hugin submodule.
+
 2014-09-10  Bent Bisballe Nyeng  <deva at aasimon.org>
 
 	* Add 'spreader' slider to generate tab.
diff --git a/Makefile.am b/Makefile.am
index b9e2bc8..1456f0a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,11 +3,4 @@ SUBDIRS = src icons tools
 DISTDIRS = src icons tools
 
 EXTRA_DIST = \
-	version.h \
-	hugin/hugin.h \
-	hugin/hugin.hpp \
-	hugin/hugin.c \
-	hugin/hugin_util.h \
-	hugin/hugin_syslog.h \
-	hugin/hugin_syslog.c
-
+	version.h
diff --git a/autogen.sh b/autogen.sh
index c027031..a6d018c 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,25 +1,4 @@
 #!/bin/sh -e
 
-# Check if hugin has been obtained:
-if [ ! -d hugin ]
-then
-		echo "You are missing the hugin submodule."
-		echo "Run"
-		echo " git submodule init"
-		echo " git submodule update"
-		echo "to obtain it."
-		exit 1
-fi
-
-# Check for the existence of cppunit.m4. If missing emulate it.
-mkdir -p actest
-cat << EOF > actest/configure.ac
-AC_INIT([actest], [1.0.0])
-AM_PATH_CPPUNIT(1.9.6)
-EOF
-[ -f acinclude.m4 ] && rm acinclude.m4
-autoreconf -W error actest 2>/dev/null || echo "AC_DEFUN([AM_PATH_CPPUNIT],[echo 'cppunit hack'])" > acinclude.m4
-rm -Rf actest
-
 # Now run autoreconf
 ${AUTORECONF:-autoreconf} -fiv
diff --git a/tools/MocList b/tools/MocList
index 639b668..8111e37 100755
--- a/tools/MocList
+++ b/tools/MocList
@@ -1,9 +1,9 @@
 # -*- mode: shell-script; sh-shell: bash; sh-indentation: 2 -*-
 if [ "$1" = "cc" ]; then
-	grep "Q_OBJECT" *.h | cut -d: -f1 | sed -e 's/^//g;s/\.h/\.moc.cc/g'| xargs echo;
+	grep "Q_OBJECT" *.h | LC_ALL=C sort | cut -d: -f1 | sed -e 's/^//g;s/\.h/\.moc.cc/g'| xargs echo;
 elif [ "$1" = "o" ]; then
-	grep "Q_OBJECT" *.h | cut -d: -f1 | sed -e 's/^//g;s/\.h/\.moc.o/g'| xargs echo;
+	grep "Q_OBJECT" *.h | LC_ALL=C sort | cut -d: -f1 | sed -e 's/^//g;s/\.h/\.moc.o/g'| xargs echo;
 elif [ "$1" = "h" ]; then
-	grep "Q_OBJECT" *.h | cut -d: -f1 | cut -d'/' -f3 | xargs echo;
+	grep "Q_OBJECT" *.h | LC_ALL=C sort | cut -d: -f1 | cut -d'/' -f3 | xargs echo;
 fi
 

-- 
dgedit packaging