[SCM] dgedit/master: Remove d/patches: they have been upstreamed

viccuad-guest at users.alioth.debian.org viccuad-guest at users.alioth.debian.org
Thu Dec 17 14:33:47 UTC 2015


The following commit has been merged in the master branch:
commit 1b8b1fd6109f6e046dd6582030a28c6a508e222e
Author: viccuad <me at viccuad.me>
Date:   Thu Dec 17 15:30:19 2015 +0100

    Remove d/patches: they have been upstreamed

diff --git a/debian/patches/reproducible-sort.patch b/debian/patches/reproducible-sort.patch
deleted file mode 100644
index c5365d3..0000000
--- a/debian/patches/reproducible-sort.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Description: 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.
-Author: Víctor Cuadrado Juan <me at viccuad.me>
-Origin: Debian
-Reviewed-by: Víctor Cuadrado Juan <me at viccuad.me>
-Last-Update: 2015-11-18
----
---- 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
- 
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index f2fa83a..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-reproducible-sort.patch

-- 
dgedit packaging



More information about the pkg-multimedia-commits mailing list