reproducible: new meta-pkg set: xfce

2 files changed, 36 insertions, 17 deletions

diff --git a/bin/reproducible_common.sh b/bin/reproducible_common.sh
index 23dd71ee..ed5b93b8 100755
--- a/bin/reproducible_common.sh
+++ b/bin/reproducible_common.sh
@@ -74,11 +74,13 @@ META_PKGSET[8]="gnome"
 META_PKGSET[9]="gnome_build-depends"
 META_PKGSET[10]="kde"
 META_PKGSET[11]="kde_build-depends"
-META_PKGSET[12]="tails"
-META_PKGSET[13]="tails_build-depends"
-META_PKGSET[14]="grml"
-META_PKGSET[15]="grml_build-depends"
-META_PKGSET[16]="maint_pkg-perl-maintainers"
+META_PKGSET[12]="xfce"
+META_PKGSET[13]="xfce_build-depends"
+META_PKGSET[14]="tails"
+META_PKGSET[15]="tails_build-depends"
+META_PKGSET[16]="grml"
+META_PKGSET[17]="grml_build-depends"
+META_PKGSET[18]="maint_pkg-perl-maintainers"
 
 schedule_packages() {
 	# these packages are manually scheduled, so should have high priority,
diff --git a/bin/reproducible_create_meta_pkg_sets.sh b/bin/reproducible_create_meta_pkg_sets.sh
index 5f50c455..0223cc88 100755
--- a/bin/reproducible_create_meta_pkg_sets.sh
+++ b/bin/reproducible_create_meta_pkg_sets.sh
@@ -191,30 +191,47 @@ update_pkg_sets() {
 		update_if_similar ${META_PKGSET[11]}.pkgset
 	fi
 
-	# tails
+	# xfce and everything it depends on
 	if [ ! -z $(find $TPATH -maxdepth 1 -mtime +0 -name ${META_PKGSET[12]}.pkgset) ] || [ ! -f $TPATH/${META_PKGSET[12]}.pkgset ] ; then
+		chdist --data-dir=$CHPATH grep-dctrl-packages $DISTNAME -X \( -FPriority required --or -FPackage xfce4 \) > ${TMPFILE2}
+		schroot --directory /tmp -c source:jenkins-dpkg-jessie -- dose-deb-coinstall --deb-native-arch=$ARCH --bg=$PACKAGES --fg=${TMPFILE2} > $TMPFILE
+		convert_from_deb822_into_source_packages_only
+		update_if_similar ${META_PKGSET[12]}.pkgset
+	fi
+	# all build depends of xfce
+	rm -f $TMPFILE
+	if [ ! -z $(find $TPATH -maxdepth 1 -mtime +0 -name ${META_PKGSET[13]}.pkgset) ] || [ ! -f $TPATH/${META_PKGSET[13]}.pkgset ] ; then
+		for PKG in $(cat $TPATH/${META_PKGSET[12]}.pkgset) ; do
+			grep-dctrl -sBuild-Depends -n -X -FPackage $PKG $SOURCES | sed "s#([^()]*)##g ; s#\[[^][]*\]##g ; s#,##g" >> $TMPFILE
+		done
+		convert_into_source_packages_only
+		update_if_similar ${META_PKGSET[13]}.pkgset
+	fi
+
+	# tails
+	if [ ! -z $(find $TPATH -maxdepth 1 -mtime +0 -name ${META_PKGSET[14]}.pkgset) ] || [ ! -f $TPATH/${META_PKGSET[14]}.pkgset ] ; then
 		curl http://nightly.tails.boum.org/build_Tails_ISO_feature-jessie/latest.iso.binpkgs > $TMPFILE
 		curl http://nightly.tails.boum.org/build_Tails_ISO_feature-jessie/latest.iso.srcpkgs >> $TMPFILE
 		convert_into_source_packages_only
-		update_if_similar ${META_PKGSET[12]}.pkgset
+		update_if_similar ${META_PKGSET[14]}.pkgset
 	fi
 
 	# all build depends of tails
 	rm -f $TMPFILE
-	if [ -z $(find $TPATH -maxdepth 1 -mtime +0 -name ${META_PKGSET[13]}.pkgset) ] || [ ! -f $TPATH/${META_PKGSET[13]}.pkgset ] ; then
-		for PKG in $(cat $TPATH/${META_PKGSET[12]}.pkgset) ; do
+	if [ -z $(find $TPATH -maxdepth 1 -mtime +0 -name ${META_PKGSET[15]}.pkgset) ] || [ ! -f $TPATH/${META_PKGSET[15]}.pkgset ] ; then
+		for PKG in $(cat $TPATH/${META_PKGSET[14]}.pkgset) ; do
 			grep-dctrl -sBuild-Depends -n -X -FPackage $PKG $SOURCES | sed "s#([^()]*)##g ; s#\[[^][]*\]##g ; s#,##g" >> $TMPFILE
 		done
 		convert_into_source_packages_only
-		update_if_similar ${META_PKGSET[13]}.pkgset
+		update_if_similar ${META_PKGSET[15]}.pkgset
 	fi
 
 	# grml
-	if [ ! -z $(find $TPATH -maxdepth 1 -mtime +0 -name ${META_PKGSET[14]}.pkgset) ] || [ ! -f $TPATH/${META_PKGSET[14]}.pkgset ] ; then
+	if [ ! -z $(find $TPATH -maxdepth 1 -mtime +0 -name ${META_PKGSET[16]}.pkgset) ] || [ ! -f $TPATH/${META_PKGSET[16]}.pkgset ] ; then
 		curl http://grml.org/files/grml64-full_latest/dpkg.selections | cut -f1 > $TMPFILE
 		if ! grep '<title>404 Not Found</title>' $TMPFILE ; then
 			convert_into_source_packages_only
-			update_if_similar ${META_PKGSET[14]}.pkgset
+			update_if_similar ${META_PKGSET[16]}.pkgset
 		else
 			echo "Warning: could not download grml's latest dpkg.selections file, skipping pkg set..."
 		fi
@@ -222,18 +239,18 @@ update_pkg_sets() {
 
 	# all build depends of grml
 	rm -f $TMPFILE
-	if [ ! -z $(find $TPATH -maxdepth 1 -mtime +0 -name ${META_PKGSET[15]}.pkgset) ] || [ ! -f $TPATH/${META_PKGSET[15]}.pkgset ] ; then
-		for PKG in $(cat $TPATH/${META_PKGSET[14]}.pkgset) ; do
+	if [ ! -z $(find $TPATH -maxdepth 1 -mtime +0 -name ${META_PKGSET[17]}.pkgset) ] || [ ! -f $TPATH/${META_PKGSET[17]}.pkgset ] ; then
+		for PKG in $(cat $TPATH/${META_PKGSET[16]}.pkgset) ; do
 			grep-dctrl -sBuild-Depends -n -X -FPackage $PKG $SOURCES | sed "s#([^()]*)##g ; s#\[[^][]*\]##g ; s#,##g" >> $TMPFILE
 		done
 		convert_into_source_packages_only
-		update_if_similar ${META_PKGSET[15]}.pkgset
+		update_if_similar ${META_PKGSET[17]}.pkgset
 	fi
 
 	# pkg-perl-maintainers
-	if [ ! -z $(find $TPATH -maxdepth 1 -mtime +0 -name ${META_PKGSET[16]}.pkgset) ] || [ ! -f $TPATH/${META_PKGSET[16]}.pkgset ] ; then
+	if [ ! -z $(find $TPATH -maxdepth 1 -mtime +0 -name ${META_PKGSET[18]}.pkgset) ] || [ ! -f $TPATH/${META_PKGSET[18]}.pkgset ] ; then
 		grep-dctrl -sPackage -n -FMaintainer pkg-perl-maintainers@lists.alioth.debian.org $SOURCES > $TMPFILE
-		update_if_similar ${META_PKGSET[16]}.pkgset
+		update_if_similar ${META_PKGSET[18]}.pkgset
 	fi
 
 }