reproducible debian: add 7 new pkg sets: mate, mate_build-depends, maint_debian-python, maint_debian-qa, maint_debian-science, maint_pkg-fonts-devel and maint_pkg-games-devel

4 files changed, 160 insertions, 91 deletions

diff --git a/bin/reproducible_common.sh b/bin/reproducible_common.sh
index 7a1668da..da0bf0b0 100755
--- a/bin/reproducible_common.sh
+++ b/bin/reproducible_common.sh
@@ -108,28 +108,35 @@ META_PKGSET[10]="gnome"
 META_PKGSET[11]="gnome_build-depends"
 META_PKGSET[12]="kde"
 META_PKGSET[13]="kde_build-depends"
-META_PKGSET[14]="xfce"
-META_PKGSET[15]="xfce_build-depends"
-META_PKGSET[16]="freedombox"
-META_PKGSET[17]="freedombox_build-depends"
-META_PKGSET[18]="grml"
-META_PKGSET[19]="grml_build-depends"
-META_PKGSET[20]="tails"
-META_PKGSET[21]="tails_build-depends"
-META_PKGSET[22]="subgraph_OS"
-META_PKGSET[23]="subgraph_OS_build-depends"
-META_PKGSET[24]="maint_debian-boot"
-META_PKGSET[25]="maint_debian-med"
-META_PKGSET[26]="maint_debian-ocaml"
-META_PKGSET[27]="maint_debian-x"
-META_PKGSET[28]="maint_lua"
-META_PKGSET[29]="maint_pkg-golang-maintainers"
-META_PKGSET[30]="maint_pkg-haskell-maintainers"
-META_PKGSET[31]="maint_pkg-java-maintainers"
-META_PKGSET[32]="maint_pkg-javascript-devel"
-META_PKGSET[33]="maint_pkg-perl-maintainers"
-META_PKGSET[34]="maint_pkg-php-pear"
-META_PKGSET[35]="maint_pkg-ruby-extras-maintainers"
+META_PKGSET[14]="mate"
+META_PKGSET[15]="mate_build-depends"
+META_PKGSET[16]="xfce"
+META_PKGSET[17]="xfce_build-depends"
+META_PKGSET[18]="freedombox"
+META_PKGSET[19]="freedombox_build-depends"
+META_PKGSET[20]="grml"
+META_PKGSET[21]="grml_build-depends"
+META_PKGSET[22]="tails"
+META_PKGSET[23]="tails_build-depends"
+META_PKGSET[24]="subgraph_OS"
+META_PKGSET[25]="subgraph_OS_build-depends"
+META_PKGSET[26]="maint_debian-boot"
+META_PKGSET[27]="maint_debian-med"
+META_PKGSET[28]="maint_debian-ocaml"
+META_PKGSET[29]="maint_debian-python"
+META_PKGSET[30]="maint_debian-qa"
+META_PKGSET[31]="maint_debian-science"
+META_PKGSET[32]="maint_debian-x"
+META_PKGSET[33]="maint_lua"
+META_PKGSET[34]="maint_pkg-fonts-devel"
+META_PKGSET[35]="maint_pkg-games-devel"
+META_PKGSET[36]="maint_pkg-golang-maintainers"
+META_PKGSET[37]="maint_pkg-haskell-maintainers"
+META_PKGSET[38]="maint_pkg-java-maintainers"
+META_PKGSET[39]="maint_pkg-javascript-devel"
+META_PKGSET[40]="maint_pkg-perl-maintainers"
+META_PKGSET[41]="maint_pkg-php-pear"
+META_PKGSET[42]="maint_pkg-ruby-extras-maintainers"
 
 # 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 9b12f97b..6df5487d 100755
--- a/bin/reproducible_create_meta_pkg_sets.sh
+++ b/bin/reproducible_create_meta_pkg_sets.sh
@@ -312,18 +312,21 @@ update_pkg_sets() {
 	fi
 	progress_info 13
 
-	# xfce and everything it depends on
+	# mate and everything it depends on
 	if [ ! -z $(find $TPATH -maxdepth 1 -mtime +0 -name ${META_PKGSET[14]}.pkgset) ] || [ ! -f $TPATH/${META_PKGSET[14]}.pkgset ] ; then
-		chdist --data-dir=$CHPATH grep-dctrl-packages $DISTNAME -X \( -FPriority required --or -FPackage xfce4 \) > ${TMPFILE2}
+		chdist --data-dir=$CHPATH grep-dctrl-packages $DISTNAME -X \( -FPriority required --or -FPackage mate-desktop-environment --or -FPackage mate-desktop-environment-extras \) > ${TMPFILE2}
 		get_installable_set ${META_PKGSET[14]}.pkgset
 		if [ -f $TMPFILE ] ; then
 			convert_from_deb822_into_source_packages_only
+			# also add the packages maintained by the team
+			# (maybe add the depends of those packages too?)
+			grep-dctrl -sPackage -n -FMaintainer,Uploaders pkg-mate-team@lists.alioth.debian.org $SOURCES >> $TMPFILE
 			update_if_similar ${META_PKGSET[14]}.pkgset
 		fi
 	fi
 	progress_info 14
 
-	# all build depends of xfce
+	# all build depends of mate
 	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
@@ -335,43 +338,66 @@ update_pkg_sets() {
 	fi
 	progress_info 15
 
-	# freedombox-setup and plinth and everything they depend on
+	# xfce and everything it depends on
 	if [ ! -z $(find $TPATH -maxdepth 1 -mtime +0 -name ${META_PKGSET[16]}.pkgset) ] || [ ! -f $TPATH/${META_PKGSET[16]}.pkgset ] ; then
-		chdist --data-dir=$CHPATH grep-dctrl-packages $DISTNAME -X \( -FPriority required --or -FPackage freedombox-setup --or -FPackage plinth \) > ${TMPFILE2}
+		chdist --data-dir=$CHPATH grep-dctrl-packages $DISTNAME -X \( -FPriority required --or -FPackage xfce4 \) > ${TMPFILE2}
 		get_installable_set ${META_PKGSET[16]}.pkgset
 		if [ -f $TMPFILE ] ; then
 			convert_from_deb822_into_source_packages_only
+			update_if_similar ${META_PKGSET[16]}.pkgset
+		fi
+	fi
+	progress_info 16
+
+	# all build depends of xfce
+	rm -f $TMPFILE
+	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" | sort -u >> $TMPFILE
+		done
+		packages_list_to_deb822
+		convert_from_deb822_into_source_packages_only
+		update_if_similar ${META_PKGSET[17]}.pkgset
+	fi
+	progress_info 17
+
+	# freedombox-setup and plinth and everything they depend on
+	if [ ! -z $(find $TPATH -maxdepth 1 -mtime +0 -name ${META_PKGSET[18]}.pkgset) ] || [ ! -f $TPATH/${META_PKGSET[18]}.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[18]}.pkgset
+		if [ -f $TMPFILE ] ; then
+			convert_from_deb822_into_source_packages_only
 			# hardcoded list of source packages
 			# derived from looking at "@package.required" in $src-plinth/plinth/modules/*py
 			# see https://wiki.debian.org/FreedomBox/Manual/Developer#Specifying_module_dependencies
 			for PKG in avahi deluge easy-rsa ejabberd ez-ipupdate firewalld ikiwiki jwchat monkeysphere mumble network-manager ntp obfs4proxy openvpn owncloud php-dropbox php5 postgresql-common privoxy python-letsencrypt quassel roundcube shaarli sqlite3 tor torsocks transmission unattended-upgrades ; do
 				echo $PKG >> $TMPFILE
 			done
-			update_if_similar ${META_PKGSET[16]}.pkgset
+			update_if_similar ${META_PKGSET[18]}.pkgset
 		fi
 	fi
-	progress_info 16
+	progress_info 18
 
 	# all build depends of freedombox-setup and plinth
 	rm -f $TMPFILE
-	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
+	if [ ! -z $(find $TPATH -maxdepth 1 -mtime +0 -name ${META_PKGSET[19]}.pkgset) ] || [ ! -f $TPATH/${META_PKGSET[19]}.pkgset ] ; then
+		for PKG in $(cat $TPATH/${META_PKGSET[18]}.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[17]}.pkgset
+		update_if_similar ${META_PKGSET[19]}.pkgset
 	fi
-	progress_info 17
+	progress_info 19
 
 	# grml
-	if [ ! -z $(find $TPATH -maxdepth 1 -mtime +0 -name ${META_PKGSET[18]}.pkgset) ] || [ ! -f $TPATH/${META_PKGSET[18]}.pkgset ] ; then
+	if [ ! -z $(find $TPATH -maxdepth 1 -mtime +0 -name ${META_PKGSET[20]}.pkgset) ] || [ ! -f $TPATH/${META_PKGSET[20]}.pkgset ] ; then
 		curl http://grml.org/files/grml64-full_latest/dpkg.selections | cut -f1 > $TMPFILE
 		if ! grep '<title>404 Not Found</title>' $TMPFILE ; then
 			echo "parsing $TMPFILE now..."
 			packages_list_to_deb822
 			convert_from_deb822_into_source_packages_only
-			update_if_similar ${META_PKGSET[18]}.pkgset
+			update_if_similar ${META_PKGSET[20]}.pkgset
 		else
 			MESSAGE="Warning: could not download grml's latest dpkg.selections file, skipping pkg set..."
 			echo $MESSAGE
@@ -379,29 +405,29 @@ update_pkg_sets() {
 			ABORT=true
 		fi
 	fi
-	progress_info 18
+	progress_info 20
 
 	# all build depends of grml
 	rm -f $TMPFILE
-	if [ ! -z $(find $TPATH -maxdepth 1 -mtime +0 -name ${META_PKGSET[19]}.pkgset) ] || [ ! -f $TPATH/${META_PKGSET[19]}.pkgset ] ; then
-		for PKG in $(cat $TPATH/${META_PKGSET[18]}.pkgset) ; do
+	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
 		echo "parsing $TMPFILE now..."
 		packages_list_to_deb822
 		convert_from_deb822_into_source_packages_only
-		update_if_similar ${META_PKGSET[19]}.pkgset
+		update_if_similar ${META_PKGSET[21]}.pkgset
 	fi
-	progress_info 19
+	progress_info 21
 
 	# tails
-	if [ ! -z $(find $TPATH -maxdepth 1 -mtime +0 -name ${META_PKGSET[20]}.pkgset) ] || [ ! -f $TPATH/${META_PKGSET[20]}.pkgset ] ; then
+	if [ ! -z $(find $TPATH -maxdepth 1 -mtime +0 -name ${META_PKGSET[22]}.pkgset) ] || [ ! -f $TPATH/${META_PKGSET[22]}.pkgset ] ; then
 		curl http://nightly.tails.boum.org/build_Tails_ISO_feature-stretch/lastSuccessful/archive/latest.iso.build-manifest > $TMPFILE
 		if ! grep '<title>404 Not Found</title>' $TMPFILE ; then
 			echo "parsing $TMPFILE now..."
 			tails_build_manifest_to_deb822 "$TMPFILE" "$PACKAGES"
 			convert_from_deb822_into_source_packages_only
-			update_if_similar ${META_PKGSET[20]}.pkgset
+			update_if_similar ${META_PKGSET[22]}.pkgset
 		else
 			MESSAGE="Warning: could not download tail's latest packages file(s), skipping tails pkg set..."
 			echo $MESSAGE
@@ -409,132 +435,168 @@ update_pkg_sets() {
 			ABORT=true
 		fi
 	fi
-	progress_info 20
+	progress_info 22
 
 	# all build depends of tails
 	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
+	if [ -z $(find $TPATH -maxdepth 1 -mtime +0 -name ${META_PKGSET[23]}.pkgset) ] || [ ! -f $TPATH/${META_PKGSET[23]}.pkgset ] ; then
+		for PKG in $(cat $TPATH/${META_PKGSET[22]}.pkgset) ; do
 			grep-dctrl -sBuild-Depends -n -X -FPackage $PKG $SOURCES | sed "s#([^()]*)##g ; s#\[[^][]*\]##g ; s#,##g" | sort -u >> $TMPFILE
 		done
 		echo "parsing $TMPFILE now..."
 		packages_list_to_deb822
 		convert_from_deb822_into_source_packages_only
-		update_if_similar ${META_PKGSET[21]}.pkgset
+		update_if_similar ${META_PKGSET[23]}.pkgset
 	fi
-	progress_info 21
+	progress_info 23
 
 	# installed by Subgraph OS
-	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
 		# one day we will get a proper data provider from Subgraph OSA...
 		# (so far it was a manual "dpkg -l")
 		cat /srv/jenkins/bin/reproducible_installed_by_subgraphos > $TMPFILE
 		packages_list_to_deb822
 		convert_from_deb822_into_source_packages_only
-		update_if_similar ${META_PKGSET[22]}.pkgset
+		update_if_similar ${META_PKGSET[24]}.pkgset
 	fi
-	progress_info 22
+	progress_info 24
 
 	# all build depends of Subgraph OS
 	rm -f $TMPFILE
-	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
 		for PKG in $(cat /srv/jenkins/bin/reproducible_installed_by_subgraphos) ; 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[23]}.pkgset
+		update_if_similar ${META_PKGSET[25]}.pkgset
 	fi
-	progress_info 23
+	progress_info 25
 
 	# debian-boot@l.d.o 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 debian-boot@lists.debian.org $SOURCES > $TMPFILE
-		update_if_similar ${META_PKGSET[24]}.pkgset
+		update_if_similar ${META_PKGSET[26]}.pkgset
 	fi
-	progress_info 24
+	progress_info 26
 
 	# Debian Med Packaging Team <debian-med-packaging@lists.alioth.debian.org>
-	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 debian-med-packaging@lists.alioth.debian.org $SOURCES > $TMPFILE
-		update_if_similar ${META_PKGSET[25]}.pkgset
+		update_if_similar ${META_PKGSET[27]}.pkgset
 	fi
-	progress_info 25
+	progress_info 27
 
 	# debian-ocaml-maint@l.d.o maintainers
-	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 debian-ocaml-maint@lists.debian.org $SOURCES > $TMPFILE
-		update_if_similar ${META_PKGSET[26]}.pkgset
+		update_if_similar ${META_PKGSET[28]}.pkgset
 	fi
-	progress_info 26
+	progress_info 28
+
+	# debian python maintainers
+	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 python-modules-team@lists.alioth.debian.org $SOURCES > $TMPFILE
+		grep-dctrl -sPackage -n -FMaintainer,Uploaders python-apps-team@lists.alioth.debian.org $SOURCES >> $TMPFILE
+		update_if_similar ${META_PKGSET[29]}.pkgset
+	fi
+	progress_info 29
+
+	# debian-qa maintainers
+	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 packages@qa.debian.org $SOURCES > $TMPFILE
+		update_if_similar ${META_PKGSET[30]}.pkgset
+	fi
+	progress_info 30
+
+	# Debian Science Team
+	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-science-maintainers@lists.alioth.debian.org $SOURCES > $TMPFILE
+		update_if_similar ${META_PKGSET[31]}.pkgset
+	fi
+	progress_info 31
 
 	# debian-x@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[32]}.pkgset) ] || [ ! -f $TPATH/${META_PKGSET[32]}.pkgset ] ; then
 		grep-dctrl -sPackage -n -FMaintainer,Uploaders debian-x@lists.debian.org $SOURCES > $TMPFILE
-		update_if_similar ${META_PKGSET[27]}.pkgset
+		update_if_similar ${META_PKGSET[32]}.pkgset
 	fi
-	progress_info 27
+	progress_info 32
 
 	# lua packages
-	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[33]}.pkgset) ] || [ ! -f $TPATH/${META_PKGSET[33]}.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[28]}.pkgset
+		update_if_similar ${META_PKGSET[33]}.pkgset
 	fi
-	progress_info 28
+	progress_info 33
+
+	# pkg-fonts-devel
+	if [ ! -z $(find $TPATH -maxdepth 1 -mtime +0 -name ${META_PKGSET[34]}.pkgset) ] || [ ! -f $TPATH/${META_PKGSET[34]}.pkgset ] ; then
+		grep-dctrl -sPackage -n -FMaintainer,Uploaders pkg-fonts-devel@lists.alioth.debian.org $SOURCES > $TMPFILE
+		update_if_similar ${META_PKGSET[34]}.pkgset
+	fi
+	progress_info 34
+
+	# pkg-games-devel
+	if [ ! -z $(find $TPATH -maxdepth 1 -mtime +0 -name ${META_PKGSET[35]}.pkgset) ] || [ ! -f $TPATH/${META_PKGSET[35]}.pkgset ] ; then
+		grep-dctrl -sPackage -n -FMaintainer,Uploaders pkg-games-devel@lists.alioth.debian.org $SOURCES > $TMPFILE
+		update_if_similar ${META_PKGSET[35]}.pkgset
+	fi
+	progress_info 35
 
 	# pkg-golang-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[36]}.pkgset) ] || [ ! -f $TPATH/${META_PKGSET[36]}.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[29]}.pkgset
+		update_if_similar ${META_PKGSET[36]}.pkgset
 	fi
-	progress_info 29
+	progress_info 36
 
 	# pkg-haskell-maintainers
-	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[37]}.pkgset) ] || [ ! -f $TPATH/${META_PKGSET[37]}.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[30]}.pkgset
+		update_if_similar ${META_PKGSET[37]}.pkgset
 	fi
-	progress_info 30
+	progress_info 37
 
 	# pkg-java-maintainers
-	if [ ! -z $(find $TPATH -maxdepth 1 -mtime +0 -name ${META_PKGSET[31]}.pkgset) ] || [ ! -f $TPATH/${META_PKGSET[31]}.pkgset ] ; then
+	if [ ! -z $(find $TPATH -maxdepth 1 -mtime +0 -name ${META_PKGSET[38]}.pkgset) ] || [ ! -f $TPATH/${META_PKGSET[38]}.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[31]}.pkgset
+		update_if_similar ${META_PKGSET[38]}.pkgset
 	fi
-	progress_info 31
+	progress_info 38
 
 	# pkg-javascript-devel
-	if [ ! -z $(find $TPATH -maxdepth 1 -mtime +0 -name ${META_PKGSET[32]}.pkgset) ] || [ ! -f $TPATH/${META_PKGSET[32]}.pkgset ] ; then
+	if [ ! -z $(find $TPATH -maxdepth 1 -mtime +0 -name ${META_PKGSET[39]}.pkgset) ] || [ ! -f $TPATH/${META_PKGSET[39]}.pkgset ] ; then
 		grep-dctrl -sPackage -n -FMaintainer,Uploaders pkg-javascript-devel@lists.alioth.debian.org $SOURCES > $TMPFILE
-		update_if_similar ${META_PKGSET[32]}.pkgset
+		update_if_similar ${META_PKGSET[39]}.pkgset
 	fi
-	progress_info 32
+	progress_info 39
 
 	# pkg-perl-maintainers
-	if [ ! -z $(find $TPATH -maxdepth 1 -mtime +0 -name ${META_PKGSET[33]}.pkgset) ] || [ ! -f $TPATH/${META_PKGSET[33]}.pkgset ] ; then
+	if [ ! -z $(find $TPATH -maxdepth 1 -mtime +0 -name ${META_PKGSET[40]}.pkgset) ] || [ ! -f $TPATH/${META_PKGSET[40]}.pkgset ] ; then
 		grep-dctrl -sPackage -n -FMaintainer,Uploaders pkg-perl-maintainers@lists.alioth.debian.org $SOURCES > $TMPFILE
-		update_if_similar ${META_PKGSET[33]}.pkgset
+		update_if_similar ${META_PKGSET[40]}.pkgset
 	fi
-	progress_info 33
+	progress_info 40
 
 	# pkg-php-pear
-	if [ ! -z $(find $TPATH -maxdepth 1 -mtime +0 -name ${META_PKGSET[34]}.pkgset) ] || [ ! -f $TPATH/${META_PKGSET[34]}.pkgset ] ; then
+	if [ ! -z $(find $TPATH -maxdepth 1 -mtime +0 -name ${META_PKGSET[41]}.pkgset) ] || [ ! -f $TPATH/${META_PKGSET[41]}.pkgset ] ; then
 		grep-dctrl -sPackage -n -FMaintainer,Uploaders pkg-php-pear@lists.alioth.debian.org $SOURCES > $TMPFILE
-		update_if_similar ${META_PKGSET[34]}.pkgset
+		update_if_similar ${META_PKGSET[41]}.pkgset
 	fi
-	progress_info 34
+	progress_info 41
 
 	# pkg-ruby-extras-maintainers
-	if [ ! -z $(find $TPATH -maxdepth 1 -mtime +0 -name ${META_PKGSET[35]}.pkgset) ] || [ ! -f $TPATH/${META_PKGSET[35]}.pkgset ] ; then
+	if [ ! -z $(find $TPATH -maxdepth 1 -mtime +0 -name ${META_PKGSET[42]}.pkgset) ] || [ ! -f $TPATH/${META_PKGSET[42]}.pkgset ] ; then
 		grep-dctrl -sPackage -n -FMaintainer,Uploaders pkg-ruby-extras-maintainers@lists.alioth.debian.org $SOURCES > $TMPFILE
-		update_if_similar ${META_PKGSET[35]}.pkgset
+		update_if_similar ${META_PKGSET[42]}.pkgset
 	fi
-	progress_info 35
+	progress_info 42
 
 }
 
diff --git a/bin/reproducible_html_pkg_sets.sh b/bin/reproducible_html_pkg_sets.sh
index 72d67215..72389dc6 100755
--- a/bin/reproducible_html_pkg_sets.sh
+++ b/bin/reproducible_html_pkg_sets.sh
@@ -96,7 +96,7 @@ create_pkg_sets_navigation() {
 	write_page "<br />"
 	for i in $(seq 1 ${#META_PKGSET[@]}) ; do
 		case $i in
-			7|10|16|24)	write_page "<br />"
+			7|10|18|26)	write_page "<br />"
 				;;
 			*)	;;
 		esac
diff --git a/userContent/reproducible/static/style.css b/userContent/reproducible/static/style.css
index 839a0c1f..e870996f 100644
--- a/userContent/reproducible/static/style.css
+++ b/userContent/reproducible/static/style.css
@@ -40,7 +40,7 @@ img.overview {
 }
 
 img.metaoverview {
-	max-width: 5.3%;
+	max-width: 4.3%;
 }
 
 .beta {