DEB tqt3: Create tqt3-examples.tar.gz in a reproducible way.

Remove attic.tar.gz from libtqt3-compat-headers.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 25907a6cf2711ca6b96cfd686a58e6c773d2f890)

2 files changed, 12 insertions, 16 deletions

diff --git a/debian/_base/dependencies/tqt3/debian/rules b/debian/_base/dependencies/tqt3/debian/rules
index 40d633ba9..42061c75a 100755
--- a/debian/_base/dependencies/tqt3/debian/rules
+++ b/debian/_base/dependencies/tqt3/debian/rules
@@ -305,9 +305,12 @@ binary-indep: build install
 	for a in `cd $(DEBIAN)/doc/tqt3-examples/ && find $(DEBIAN)/doc/tqt3-examples/ -name '.moc'`; do rm -rf "$$a"; done
 	for a in `cd $(DEBIAN)/doc/tqt3-examples/ && find $(DEBIAN)/doc/tqt3-examples/ -name '.obj'`; do rm -rf "$$a"; done
 	for a in `cd $(DEBIAN)/doc/tqt3-examples/ && find $(DEBIAN)/doc/tqt3-examples/ -name 'Makefile'`; do rm -f "$$a"; done
-	install -D `pwd`/debian/maintain/build-examples.sh `pwd`/debian/doc/tqt3-examples/build-examples
-	chmod 755 `pwd`/debian/doc/tqt3-examples/build-examples
-	cd `pwd`/debian/doc/ && tar cvvfz tqt3-examples.tar.gz tqt3-examples/
+	install -Dpm 755 `pwd`/debian/maintain/build-examples.sh `pwd`/debian/doc/tqt3-examples/build-examples
+	cd `pwd`/debian/doc/ && \
+	find tqt3-examples/ -type f -print0 | LC_ALL=C sort -z | \
+	tar cvv --no-recursion --null -T - \
+	    --pax-option=exthdr.name=%d/PaxHeaders/%f,delete=atime,delete=ctime | \
+	gzip -n > tqt3-examples.tar.gz
 	install -D `pwd`/debian/doc/tqt3-examples.tar.gz `pwd`/debian/tqt3-examples/usr/share/doc/tqt3-examples/tqt3-examples.tar.gz
 
 	# proceed
@@ -391,11 +394,6 @@ binary-arch: build install
 	cd `pwd`/debian/tqt3-dev-tools/usr/share/tqt3/mkspecs/ && for a in *; do cd "$$a" && cat qmake.conf | sed 's/\$$(QTDIR)\/include/\/usr\/share\/tqt3\/include/g' | sed 's/\$$(QTDIR)/\/usr\/share\/tqt3/g' | \
 	sed 's/\-I\/usr\/include/&\/tqt3/g' >> qmake.conf.new && mv qmake.conf.new qmake.conf && cd ../; done
 
-	# build attic package and copy it to libtqt3-ompat-headers
-	cd `pwd`/src/ && tar cvvfz attic.tar.gz attic/
-	install -D `pwd`/src/attic.tar.gz `pwd`/debian/libtqt3-compat-headers/usr/share/doc/libtqt3-compat-headers/attic.tar.gz
-	rm -rf `pwd`/src/attic.tar.gz
-
 	install -D doc/man/man1/moc.1 `pwd`/debian/tqt3-dev-tools/usr/share/man/man1/moc-tqt3.1
 	install -D doc/man/man1/uic.1 `pwd`/debian/tqt3-dev-tools/usr/share/man/man1/uic-tqt3.1
 	install -D doc/man/man1/lrelease.1 `pwd`/debian/tqt3-dev-tools/usr/share/man/man1/lrelease-tqt3.1
diff --git a/ubuntu/_base/dependencies/tqt3/debian/rules b/ubuntu/_base/dependencies/tqt3/debian/rules
index 40d633ba9..42061c75a 100755
--- a/ubuntu/_base/dependencies/tqt3/debian/rules
+++ b/ubuntu/_base/dependencies/tqt3/debian/rules
@@ -305,9 +305,12 @@ binary-indep: build install
 	for a in `cd $(DEBIAN)/doc/tqt3-examples/ && find $(DEBIAN)/doc/tqt3-examples/ -name '.moc'`; do rm -rf "$$a"; done
 	for a in `cd $(DEBIAN)/doc/tqt3-examples/ && find $(DEBIAN)/doc/tqt3-examples/ -name '.obj'`; do rm -rf "$$a"; done
 	for a in `cd $(DEBIAN)/doc/tqt3-examples/ && find $(DEBIAN)/doc/tqt3-examples/ -name 'Makefile'`; do rm -f "$$a"; done
-	install -D `pwd`/debian/maintain/build-examples.sh `pwd`/debian/doc/tqt3-examples/build-examples
-	chmod 755 `pwd`/debian/doc/tqt3-examples/build-examples
-	cd `pwd`/debian/doc/ && tar cvvfz tqt3-examples.tar.gz tqt3-examples/
+	install -Dpm 755 `pwd`/debian/maintain/build-examples.sh `pwd`/debian/doc/tqt3-examples/build-examples
+	cd `pwd`/debian/doc/ && \
+	find tqt3-examples/ -type f -print0 | LC_ALL=C sort -z | \
+	tar cvv --no-recursion --null -T - \
+	    --pax-option=exthdr.name=%d/PaxHeaders/%f,delete=atime,delete=ctime | \
+	gzip -n > tqt3-examples.tar.gz
 	install -D `pwd`/debian/doc/tqt3-examples.tar.gz `pwd`/debian/tqt3-examples/usr/share/doc/tqt3-examples/tqt3-examples.tar.gz
 
 	# proceed
@@ -391,11 +394,6 @@ binary-arch: build install
 	cd `pwd`/debian/tqt3-dev-tools/usr/share/tqt3/mkspecs/ && for a in *; do cd "$$a" && cat qmake.conf | sed 's/\$$(QTDIR)\/include/\/usr\/share\/tqt3\/include/g' | sed 's/\$$(QTDIR)/\/usr\/share\/tqt3/g' | \
 	sed 's/\-I\/usr\/include/&\/tqt3/g' >> qmake.conf.new && mv qmake.conf.new qmake.conf && cd ../; done
 
-	# build attic package and copy it to libtqt3-ompat-headers
-	cd `pwd`/src/ && tar cvvfz attic.tar.gz attic/
-	install -D `pwd`/src/attic.tar.gz `pwd`/debian/libtqt3-compat-headers/usr/share/doc/libtqt3-compat-headers/attic.tar.gz
-	rm -rf `pwd`/src/attic.tar.gz
-
 	install -D doc/man/man1/moc.1 `pwd`/debian/tqt3-dev-tools/usr/share/man/man1/moc-tqt3.1
 	install -D doc/man/man1/uic.1 `pwd`/debian/tqt3-dev-tools/usr/share/man/man1/uic-tqt3.1
 	install -D doc/man/man1/lrelease.1 `pwd`/debian/tqt3-dev-tools/usr/share/man/man1/lrelease-tqt3.1