reproducible debian: add two new pkg sets: freedombox and freedombox_build-depends

2 files changed, 56 insertions, 33 deletions

diff --git a/bin/reproducible_common.sh b/bin/reproducible_common.sh
index 85430d1d..e97db88c 100755
--- a/bin/reproducible_common.sh
+++ b/bin/reproducible_common.sh
@@ -114,17 +114,19 @@ META_PKGSET[16]="tails"
 META_PKGSET[17]="tails_build-depends"
 META_PKGSET[18]="grml"
 META_PKGSET[19]="grml_build-depends"
-META_PKGSET[20]="maint_pkg-perl-maintainers"
-META_PKGSET[21]="maint_pkg-java-maintainers"
-META_PKGSET[22]="maint_pkg-haskell-maintainers"
-META_PKGSET[23]="maint_pkg-ruby-extras-maintainers"
-META_PKGSET[24]="maint_pkg-golang-maintainers"
-META_PKGSET[25]="maint_pkg-php-pear"
-META_PKGSET[26]="maint_pkg-javascript-devel"
-META_PKGSET[27]="maint_debian-boot"
-META_PKGSET[28]="maint_debian-ocaml"
-META_PKGSET[29]="maint_debian-x"
-META_PKGSET[30]="maint_lua"
+META_PKGSET[20]="freedombox"
+META_PKGSET[21]="freedombox_build-depends"
+META_PKGSET[22]="maint_pkg-perl-maintainers"
+META_PKGSET[23]="maint_pkg-java-maintainers"
+META_PKGSET[24]="maint_pkg-haskell-maintainers"
+META_PKGSET[25]="maint_pkg-ruby-extras-maintainers"
+META_PKGSET[26]="maint_pkg-golang-maintainers"
+META_PKGSET[27]="maint_pkg-php-pear"
+META_PKGSET[28]="maint_pkg-javascript-devel"
+META_PKGSET[29]="maint_debian-boot"
+META_PKGSET[30]="maint_debian-ocaml"
+META_PKGSET[31]="maint_debian-x"
+META_PKGSET[32]="maint_lua"
 
 # sleep 1-23 secs to randomize start times
 delay_start() {
diff --git a/bin/reproducible_create_meta_pkg_sets.sh b/bin/reproducible_create_meta_pkg_sets.sh
index 0f72cfbd..db6d6649 100755
--- a/bin/reproducible_create_meta_pkg_sets.sh
+++ b/bin/reproducible_create_meta_pkg_sets.sh
@@ -343,75 +343,96 @@ update_pkg_sets() {
 		update_if_similar ${META_PKGSET[19]}.pkgset
 	fi
 
-	# pkg-perl-maintainers
+	# freedombox-setup and plinth and everything they depend on
 	if [ ! -z $(find $TPATH -maxdepth 1 -mtime +0 -name ${META_PKGSET[20]}.pkgset) ] || [ ! -f $TPATH/${META_PKGSET[20]}.pkgset ] ; then
+		chdist --data-dir=$CHPATH grep-dctrl-packages $DISTNAME -X \( -FPriority required --or -FPackage freedombox-setup --or -FPackage plinth \) > ${TMPFILE2}
+		get_installable_set ${META_PKGSET[20]}.pkgset
+		if [ -f $TMPFILE ] ; then
+			convert_from_deb822_into_source_packages_only
+			update_if_similar ${META_PKGSET[20]}.pkgset
+		fi
+	fi
+
+	# all build depends of freedombox-setup and plinth
+	rm -f $TMPFILE
+	if [ ! -z $(find $TPATH -maxdepth 1 -mtime +0 -name ${META_PKGSET[21]}.pkgset) ] || [ ! -f $TPATH/${META_PKGSET[21]}.pkgset ] ; then
+		for PKG in $(cat $TPATH/${META_PKGSET[20]}.pkgset) ; do
+			grep-dctrl -sBuild-Depends -n -X -FPackage $PKG $SOURCES | sed "s#([^()]*)##g ; s#\[[^][]*\]##g ; s#,##g" | sort -u >> $TMPFILE
+		done
+		packages_list_to_deb822
+		convert_from_deb822_into_source_packages_only
+		update_if_similar ${META_PKGSET[21]}.pkgset
+	fi
+
+	# pkg-perl-maintainers
+	if [ ! -z $(find $TPATH -maxdepth 1 -mtime +0 -name ${META_PKGSET[22]}.pkgset) ] || [ ! -f $TPATH/${META_PKGSET[22]}.pkgset ] ; then
 		grep-dctrl -sPackage -n -FMaintainer,Uploaders pkg-perl-maintainers@lists.alioth.debian.org $SOURCES > $TMPFILE
-		update_if_similar ${META_PKGSET[20]}.pkgset
+		update_if_similar ${META_PKGSET[22]}.pkgset
 	fi
 
 	# pkg-java-maintainers
-	if [ ! -z $(find $TPATH -maxdepth 1 -mtime +0 -name ${META_PKGSET[21]}.pkgset) ] || [ ! -f $TPATH/${META_PKGSET[21]}.pkgset ] ; then
+	if [ ! -z $(find $TPATH -maxdepth 1 -mtime +0 -name ${META_PKGSET[23]}.pkgset) ] || [ ! -f $TPATH/${META_PKGSET[23]}.pkgset ] ; then
 		grep-dctrl -sPackage -n -FMaintainer,Uploaders pkg-java-maintainers@lists.alioth.debian.org $SOURCES > $TMPFILE
 		grep-dctrl -sPackage -n -FMaintainer,Uploaders openjdk@lists.launchpad.net $SOURCES >> $TMPFILE
 		grep-dctrl -sPackage -n -FBuild-Depends default-jdk -o -FBuild-Depends-Indep default-jdk $SOURCES | sed "s#([^()]*)##g ; s#\[[^][]*\]##g ; s#,##g" | sort -u >> $TMPFILE
-		update_if_similar ${META_PKGSET[21]}.pkgset
+		update_if_similar ${META_PKGSET[23]}.pkgset
 	fi
 
 	# pkg-haskell-maintainers
-	if [ ! -z $(find $TPATH -maxdepth 1 -mtime +0 -name ${META_PKGSET[22]}.pkgset) ] || [ ! -f $TPATH/${META_PKGSET[22]}.pkgset ] ; then
+	if [ ! -z $(find $TPATH -maxdepth 1 -mtime +0 -name ${META_PKGSET[24]}.pkgset) ] || [ ! -f $TPATH/${META_PKGSET[24]}.pkgset ] ; then
 		grep-dctrl -sPackage -n -FMaintainer,Uploaders pkg-haskell-maintainers@lists.alioth.debian.org $SOURCES > $TMPFILE
 		grep-dctrl -sPackage -n -FBuild-Depends ghc $SOURCES | sed "s#([^()]*)##g ; s#\[[^][]*\]##g ; s#,##g" | sort -u >> $TMPFILE
-		update_if_similar ${META_PKGSET[22]}.pkgset
+		update_if_similar ${META_PKGSET[24]}.pkgset
 	fi
 
 	# pkg-ruby-extras-maintainers
-	if [ ! -z $(find $TPATH -maxdepth 1 -mtime +0 -name ${META_PKGSET[23]}.pkgset) ] || [ ! -f $TPATH/${META_PKGSET[23]}.pkgset ] ; then
+	if [ ! -z $(find $TPATH -maxdepth 1 -mtime +0 -name ${META_PKGSET[25]}.pkgset) ] || [ ! -f $TPATH/${META_PKGSET[25]}.pkgset ] ; then
 		grep-dctrl -sPackage -n -FMaintainer,Uploaders pkg-ruby-extras-maintainers@lists.alioth.debian.org $SOURCES > $TMPFILE
-		update_if_similar ${META_PKGSET[23]}.pkgset
+		update_if_similar ${META_PKGSET[25]}.pkgset
 	fi
 
 	# pkg-golang-maintainers
-	if [ ! -z $(find $TPATH -maxdepth 1 -mtime +0 -name ${META_PKGSET[24]}.pkgset) ] || [ ! -f $TPATH/${META_PKGSET[24]}.pkgset ] ; then
+	if [ ! -z $(find $TPATH -maxdepth 1 -mtime +0 -name ${META_PKGSET[26]}.pkgset) ] || [ ! -f $TPATH/${META_PKGSET[26]}.pkgset ] ; then
 		grep-dctrl -sPackage -n -FMaintainer,Uploaders pkg-golang-devel@lists.alioth.debian.org $SOURCES > $TMPFILE
 		grep-dctrl -sPackage -n -FBuild-Depends golang-go $SOURCES | sed "s#([^()]*)##g ; s#\[[^][]*\]##g ; s#,##g" | sort -u >> $TMPFILE
-		update_if_similar ${META_PKGSET[24]}.pkgset
+		update_if_similar ${META_PKGSET[26]}.pkgset
 	fi
 
 	# pkg-php-pear
-	if [ ! -z $(find $TPATH -maxdepth 1 -mtime +0 -name ${META_PKGSET[25]}.pkgset) ] || [ ! -f $TPATH/${META_PKGSET[25]}.pkgset ] ; then
+	if [ ! -z $(find $TPATH -maxdepth 1 -mtime +0 -name ${META_PKGSET[27]}.pkgset) ] || [ ! -f $TPATH/${META_PKGSET[27]}.pkgset ] ; then
 		grep-dctrl -sPackage -n -FMaintainer,Uploaders pkg-php-pear@lists.alioth.debian.org $SOURCES > $TMPFILE
-		update_if_similar ${META_PKGSET[25]}.pkgset
+		update_if_similar ${META_PKGSET[27]}.pkgset
 	fi
 
 	# pkg-javascript-devel
-	if [ ! -z $(find $TPATH -maxdepth 1 -mtime +0 -name ${META_PKGSET[26]}.pkgset) ] || [ ! -f $TPATH/${META_PKGSET[26]}.pkgset ] ; then
+	if [ ! -z $(find $TPATH -maxdepth 1 -mtime +0 -name ${META_PKGSET[28]}.pkgset) ] || [ ! -f $TPATH/${META_PKGSET[28]}.pkgset ] ; then
 		grep-dctrl -sPackage -n -FMaintainer,Uploaders pkg-javascript-devel@lists.alioth.debian.org $SOURCES > $TMPFILE
-		update_if_similar ${META_PKGSET[26]}.pkgset
+		update_if_similar ${META_PKGSET[28]}.pkgset
 	fi
 
 	# debian-boot@l.d.o maintainers
-	if [ ! -z $(find $TPATH -maxdepth 1 -mtime +0 -name ${META_PKGSET[27]}.pkgset) ] || [ ! -f $TPATH/${META_PKGSET[27]}.pkgset ] ; then
+	if [ ! -z $(find $TPATH -maxdepth 1 -mtime +0 -name ${META_PKGSET[29]}.pkgset) ] || [ ! -f $TPATH/${META_PKGSET[29]}.pkgset ] ; then
 		grep-dctrl -sPackage -n -FMaintainer,Uploaders debian-boot@lists.debian.org $SOURCES > $TMPFILE
-		update_if_similar ${META_PKGSET[27]}.pkgset
+		update_if_similar ${META_PKGSET[29]}.pkgset
 	fi
 
 	# debian-ocaml-maint@l.d.o maintainers
-	if [ ! -z $(find $TPATH -maxdepth 1 -mtime +0 -name ${META_PKGSET[28]}.pkgset) ] || [ ! -f $TPATH/${META_PKGSET[28]}.pkgset ] ; then
+	if [ ! -z $(find $TPATH -maxdepth 1 -mtime +0 -name ${META_PKGSET[30]}.pkgset) ] || [ ! -f $TPATH/${META_PKGSET[30]}.pkgset ] ; then
 		grep-dctrl -sPackage -n -FMaintainer,Uploaders debian-ocaml-maint@lists.debian.org $SOURCES > $TMPFILE
-		update_if_similar ${META_PKGSET[28]}.pkgset
+		update_if_similar ${META_PKGSET[30]}.pkgset
 	fi
 
 	# debian-x@l.d.o maintainers
-	if [ ! -z $(find $TPATH -maxdepth 1 -mtime +0 -name ${META_PKGSET[29]}.pkgset) ] || [ ! -f $TPATH/${META_PKGSET[29]}.pkgset ] ; then
+	if [ ! -z $(find $TPATH -maxdepth 1 -mtime +0 -name ${META_PKGSET[31]}.pkgset) ] || [ ! -f $TPATH/${META_PKGSET[31]}.pkgset ] ; then
 		grep-dctrl -sPackage -n -FMaintainer,Uploaders debian-x@lists.debian.org $SOURCES > $TMPFILE
-		update_if_similar ${META_PKGSET[29]}.pkgset
+		update_if_similar ${META_PKGSET[31]}.pkgset
 	fi
 
 	# lua packages
-	if [ ! -z $(find $TPATH -maxdepth 1 -mtime +0 -name ${META_PKGSET[30]}.pkgset) ] || [ ! -f $TPATH/${META_PKGSET[30]}.pkgset ] ; then
+	if [ ! -z $(find $TPATH -maxdepth 1 -mtime +0 -name ${META_PKGSET[32]}.pkgset) ] || [ ! -f $TPATH/${META_PKGSET[32]}.pkgset ] ; then
 		grep-dctrl -sPackage -n -FPackage -e ^lua.* $SOURCES > $TMPFILE
 		grep-dctrl -sPackage -n -FBuild-Depends dh-lua $SOURCES | sed "s#([^()]*)##g ; s#\[[^][]*\]##g ; s#,##g" | sort -u >> $TMPFILE
-		update_if_similar ${META_PKGSET[30]}.pkgset
+		update_if_similar ${META_PKGSET[32]}.pkgset
 	fi
 
 }