From 682c07a3d373983c33cdea5d724fcc4c0e73ddb3 Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Sun, 15 May 2016 02:18:14 +0200 Subject: reproducible debian: change order of pkg sets, sort team maintainance sets alphabetically --- bin/reproducible_common.sh | 20 ++++++------- bin/reproducible_create_meta_pkg_sets.sh | 48 ++++++++++++++++---------------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/bin/reproducible_common.sh b/bin/reproducible_common.sh index c3f30f3a..bbeaf102 100755 --- a/bin/reproducible_common.sh +++ b/bin/reproducible_common.sh @@ -118,17 +118,17 @@ 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_pkg-perl-maintainers" -META_PKGSET[25]="maint_pkg-java-maintainers" -META_PKGSET[26]="maint_pkg-haskell-maintainers" -META_PKGSET[27]="maint_pkg-ruby-extras-maintainers" +META_PKGSET[24]="maint_debian-boot" +META_PKGSET[25]="maint_debian-ocaml" +META_PKGSET[26]="maint_debian-x" +META_PKGSET[27]="maint_lua" META_PKGSET[28]="maint_pkg-golang-maintainers" -META_PKGSET[29]="maint_pkg-php-pear" -META_PKGSET[30]="maint_pkg-javascript-devel" -META_PKGSET[31]="maint_debian-boot" -META_PKGSET[32]="maint_debian-ocaml" -META_PKGSET[33]="maint_debian-x" -META_PKGSET[34]="maint_lua" +META_PKGSET[29]="maint_pkg-haskell-maintainers" +META_PKGSET[30]="maint_pkg-java-maintainers" +META_PKGSET[31]="maint_pkg-javascript-devel" +META_PKGSET[32]="maint_pkg-perl-maintainers" +META_PKGSET[33]="maint_pkg-php-pear" +META_PKGSET[34]="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 3c6d127b..fe1f5f36 100755 --- a/bin/reproducible_create_meta_pkg_sets.sh +++ b/bin/reproducible_create_meta_pkg_sets.sh @@ -425,33 +425,31 @@ update_pkg_sets() { fi progress_info 23 - # pkg-perl-maintainers + # 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 - grep-dctrl -sPackage -n -FMaintainer,Uploaders pkg-perl-maintainers@lists.alioth.debian.org $SOURCES > $TMPFILE + grep-dctrl -sPackage -n -FMaintainer,Uploaders debian-boot@lists.debian.org $SOURCES > $TMPFILE update_if_similar ${META_PKGSET[24]}.pkgset fi progress_info 24 - # pkg-java-maintainers + # debian-ocaml-maint@l.d.o maintainers 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-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 + grep-dctrl -sPackage -n -FMaintainer,Uploaders debian-ocaml-maint@lists.debian.org $SOURCES > $TMPFILE update_if_similar ${META_PKGSET[25]}.pkgset fi progress_info 25 - # pkg-haskell-maintainers + # debian-x@l.d.o maintainers 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-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 + grep-dctrl -sPackage -n -FMaintainer,Uploaders debian-x@lists.debian.org $SOURCES > $TMPFILE update_if_similar ${META_PKGSET[26]}.pkgset fi progress_info 26 - # pkg-ruby-extras-maintainers + # lua packages 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-ruby-extras-maintainers@lists.alioth.debian.org $SOURCES > $TMPFILE + 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[27]}.pkgset fi progress_info 27 @@ -464,45 +462,47 @@ update_pkg_sets() { fi progress_info 28 - # pkg-php-pear + # pkg-haskell-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 pkg-php-pear@lists.alioth.debian.org $SOURCES > $TMPFILE + 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[29]}.pkgset fi progress_info 29 - # pkg-javascript-devel + # pkg-java-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 pkg-javascript-devel@lists.alioth.debian.org $SOURCES > $TMPFILE + 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[30]}.pkgset fi progress_info 30 - # debian-boot@l.d.o maintainers + # pkg-javascript-devel 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-boot@lists.debian.org $SOURCES > $TMPFILE + grep-dctrl -sPackage -n -FMaintainer,Uploaders pkg-javascript-devel@lists.alioth.debian.org $SOURCES > $TMPFILE update_if_similar ${META_PKGSET[31]}.pkgset fi progress_info 31 - # debian-ocaml-maint@l.d.o maintainers + # pkg-perl-maintainers 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-ocaml-maint@lists.debian.org $SOURCES > $TMPFILE + grep-dctrl -sPackage -n -FMaintainer,Uploaders pkg-perl-maintainers@lists.alioth.debian.org $SOURCES > $TMPFILE update_if_similar ${META_PKGSET[32]}.pkgset fi progress_info 32 - # debian-x@l.d.o maintainers + # pkg-php-pear if [ ! -z $(find $TPATH -maxdepth 1 -mtime +0 -name ${META_PKGSET[33]}.pkgset) ] || [ ! -f $TPATH/${META_PKGSET[33]}.pkgset ] ; then - grep-dctrl -sPackage -n -FMaintainer,Uploaders debian-x@lists.debian.org $SOURCES > $TMPFILE + grep-dctrl -sPackage -n -FMaintainer,Uploaders pkg-php-pear@lists.alioth.debian.org $SOURCES > $TMPFILE update_if_similar ${META_PKGSET[33]}.pkgset fi progress_info 33 - # lua packages + # pkg-ruby-extras-maintainers if [ ! -z $(find $TPATH -maxdepth 1 -mtime +0 -name ${META_PKGSET[34]}.pkgset) ] || [ ! -f $TPATH/${META_PKGSET[34]}.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 + grep-dctrl -sPackage -n -FMaintainer,Uploaders pkg-ruby-extras-maintainers@lists.alioth.debian.org $SOURCES > $TMPFILE update_if_similar ${META_PKGSET[34]}.pkgset fi progress_info 34 -- cgit v1.2.3-70-g09d2