reproducibly small changes

3 files changed, 8 insertions, 8 deletions

diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh
index 7c7cefc4..6e07b75f 100755
--- a/bin/reproducible_build.sh
+++ b/bin/reproducible_build.sh
@@ -60,11 +60,11 @@ for SRCPACKAGE in "$@" ; do
 				mv ./results/${LOGFILE} ./results/_success/
 				figlet ${SRCPACKAGE}
 				echo
-				echo "${SRCPACKAGE} build successfull."
+				echo "${SRCPACKAGE} built successfully and reproducibly."
 				let "COUNT_GOOD=COUNT_GOOD+1"
 				GOOD="${SRCPACKAGE} ${GOOD}"
 			else
-				echo "Warning: ${SRCPACKAGE} failed to build reproducible."
+				echo "Warning: ${SRCPACKAGE} failed to build reproducibly."
 				let "COUNT_BAD=COUNT_BAD+1"
 				BAD="${SRCPACKAGE} ${BAD}"
 			fi
@@ -84,6 +84,6 @@ set +x
 echo
 echo
 echo "$COUNT_TOTAL packages attempted to build in total."
-echo "$COUNT_GOOD packages successfully built reproducible: ${GOOD}"
-echo "$COUNT_BAD packages failed to built reproducible: ${BAD}"
+echo "$COUNT_GOOD packages successfully built reproducibly: ${GOOD}"
+echo "$COUNT_BAD packages failed to built reproducibly: ${BAD}"
 echo "The following source packages doesn't exist in sid: $SOURCELESS"
diff --git a/etc/apt/sources.list b/etc/apt/sources.list
index 74d7ad25..3d46cb72 100644
--- a/etc/apt/sources.list
+++ b/etc/apt/sources.list
@@ -6,7 +6,7 @@ deb http://ftp.de.debian.org/debian/ wheezy main
 #deb-src http://ftp.de.debian.org/debian/ wheezy main
 
 # needed for job/reproducible*
-deb-src http://ftp.de.debian.org/debian/ sid main
+deb-src http://ftp.de.debian.org/debian/ sid main contrib
 
 deb http://security.debian.org/ wheezy/updates main
 #deb-src http://security.debian.org/ wheezy/updates main
diff --git a/job-cfg/reproducible.yaml b/job-cfg/reproducible.yaml
index 163080ed..d18957c3 100644
--- a/job-cfg/reproducible.yaml
+++ b/job-cfg/reproducible.yaml
@@ -82,7 +82,7 @@
             my_description: 'Reproducible build all the core packages as defined by UDD as described in https://wiki.debian.org/ReproducibleBuilds'
             my_shell: '/srv/jenkins/bin/reproducible_build.sh acl adduser base-files base-passwd bash binutils bsdmainutils bsdutils build-essential bzip2 coreutils cpp cpp-4.9 dash debconf debhelper debianutils dh-buildinfo diffutils dmsetup dpkg dpkg-dev e2fslibs e2fsprogs file findutils g++ g++-4.9 gcc gcc-4.9 gcc-4.9-base gettext gettext-base grep groff-base gzip hostname init initscripts insserv intltool-debian libacl1 libasan1 libasprintf0c2 libatomic1 libattr1 libaudit1 libaudit-common libblkid1 libbz2-1.0 libc6 libc6-dev libcap2 libcap2-bin libc-bin libc-dev-bin libcilkrts5 libcloog-isl4 libcomerr2 libcroco3 libcryptsetup4 libdb5.3 libdbus-1-3 libdebconfclient0 libdevmapper1.02.1 libdpkg-perl libffi6 libgcc1 libgcc-4.9-dev libgcrypt11 libgcrypt20 libgdbm3 libglib2.0-0 libgmp10 libgomp1 libgpg-error0 libintl-perl libisl10 libitm1 libkmod2 liblzma5 libmagic1 libmount1 libmpc3 libmpfr4 libncurses5 libncurses5-dev libncursesw5 libpam0g libpam-modules libpam-modules-bin libpam-runtime libpcre3 libpipeline1 libprocps3 libquadmath0 libselinux1 libsemanage1 libsemanage-common libsepol1 libss2 libstdc++-4.9-dev libstdc++6 libsystemd-journal0 libsystemd-login0 libtext-unidecode-perl libtimedate-perl libtinfo5 libtinfo-dev libubsan0 libudev1 libunistring0 libustr-1.0-1 libuuid1 libwrap0 libxml2 libxml-libxml-perl libxml-namespacesupport-perl libxml-sax-base-perl libxml-sax-perl linux-libc-dev login lsb-base make man-db mawk mount ncurses-base ncurses-bin passwd patch perl perl-base perl-modules po-debconf procps sed sensible-utils startpar systemd systemd-sysv sysvinit-utils sysv-rc tar texinfo tzdata ucf udev util-linux xz-utils zlib'
         - '{name}_build_build-tools':
-            my_description: 'Reproducible build packages used to build other packages.'
+            my_description: 'Reproducible build packages which are used to build other packages.'
             my_shell: '/srv/jenkins/bin/reproducible_build.sh eglibc gcc-defaults make-dfsg dpkg python python3 ruby ghc php5 tcl asciidoc'
         - '{name}_build_desktop':
             my_description: 'Reproducible build the six major desktops and associated packages.'
@@ -101,14 +101,14 @@
 
         - '{name}_build_security-privacy':
             my_description: 'Reproducible build of security and privacy related packages'
-            my_shell: '/srv/jenkins/bin/reproducible_build.sh apparmor apparmor-profiles-extra assword corkscrew cryptsetup debian-security-support flashproxy gnunet gnunet-fuse gnunet-gtk gnupg gnupg2 gnutls28 https-everywhere iodine irssi-plugin-otr keepassx libotr macchanger mat mozilla-noscript mumble obfs4proxy obfsproxy onioncat onionshare openssl openvpn parcimonie pidgin-otr pinentry privoxy pwgen python-pyptlib python-stem python-torctl python-txtorcon schleuder secure-delete signing-party tcpdump tlsdate tor tor-arm torbrowser-launcher torsocks vidalia wireshark'
+            my_shell: '/srv/jenkins/bin/reproducible_build.sh apparmor apparmor-profiles-extra assword corkscrew cryptsetup debian-security-support flashproxy gnunet gnunet-fuse gnunet-gtk gnupg gnupg2 gnutls28 https-everywhere iodine irssi-plugin-otr keepassx libotr macchanger mat mozilla-noscript mumble obfs4proxy obfsproxy onioncat onionshare openssl openvpn parcimonie pidgin-otr pinentry privoxy pwgen python-pyptlib python-stem python-torctl python-txtorcon secure-delete signing-party tcpdump tlsdate tor tor-arm torbrowser-launcher torsocks vidalia wireshark'
 
         - '{name}_build_d-i':
             my_description: 'Reproducible build of all debian-installer packages'
             my_shell: '/srv/jenkins/bin/reproducible_build.sh aboot-installer anna apt-setup arcboot-installer auto-install base-installer bterm-unifont babelbox busybox cdebconf-entropy cdebconf-terminal cdebconf cdrom-checker cdrom-detect cdrom-retriever choose-mirror clock-setup colo-installer console-setup debian-installer-launcher debian-installer-netboot-images debian-installer-utils debian-installer debootstrap desktop-chooser devicetype-detect dh-di efi-reader elilo-installer etch-support finish-install flash-kernel grub-installer hw-detect installation-locale installation-report iso-scan kbd-chooser kernel-wedge kfreebsd-kernel-di-amd64 kfreebsd-kernel-di-i386 kickseed lenny-support libdebian-installer lilo-installer live-installer localechooser lowmem lvmcfg main-menu mdcfg media-retriever mklibs mountmedia net-retriever netboot-assistant netcfg network-console nobootloader oldsys-preseed os-prober palo-installer partconf partitioner partman-auto-crypto partman-auto-lvm partman-auto-raid partman-auto partman-base partman-basicfilesystems partman-basicmethods partman-btrfs partman-crypto partman-efi partman-ext2r0 partman-ext3 partman-iscsi partman-jfs partman-lvm partman-md partman-multipath partman-nbd partman-newworld partman-palo partman-partitioning partman-prep partman-reiserfs partman-target partman-ufs partman-xfs partman-zfs pkgsel prep-installer preseed quik-installer rescue rootskel-gtk rootskel s390-dasd s390-netdevice s390-sysconfig-writer sarge-support sibyl-installer silo-installer srm-reader tzsetup udpkg usb-discover user-setup userdevfs vmelilo-installer win32-loader yaboot-installer zipl-installer'
 
 # PACKAGES="apache2 asterisk courier icinga icinga2 lighttpd munin mysql-5.5 nginx postfix postgresql squid3"
-# PACKAGES="apparmor apparmor-profiles-extra assword corkscrew cryptsetup debian-security-support flashproxy gnunet gnunet-fuse gnunet-gtk gnupg gnupg2 gnutls28 https-everywhere iodine irssi-plugin-otr keepassx libotr macchanger mat mozilla-noscript mumble obfs4proxy obfsproxy onioncat onionshare openssl openvpn parcimonie pidgin-otr pinentry privoxy pwgen python-pyptlib python-stem python-torctl python-txtorcon schleuder secure-delete signing-party tcpdump tlsdate tor tor-arm torbrowser-launcher torsocks vidalia wireshark"
+# PACKAGES="apparmor apparmor-profiles-extra assword corkscrew cryptsetup debian-security-support flashproxy gnunet gnunet-fuse gnunet-gtk gnupg gnupg2 gnutls28 https-everywhere iodine irssi-plugin-otr keepassx libotr macchanger mat mozilla-noscript mumble obfs4proxy obfsproxy onioncat onionshare openssl openvpn parcimonie pidgin-otr pinentry privoxy pwgen python-pyptlib python-stem python-torctl python-txtorcon secure-delete signing-party tcpdump tlsdate tor tor-arm torbrowser-launcher torsocks vidalia wireshark"
 # echo $PACKAGES | sed -s "s# #\n#g" | sort | xargs echo
 
 # (for i in galculator gpicview leafpad lxappearance lxde-core lxde-icon-theme lxinput lxrandr lxsession-edit lxshortcut lxterminal obconf xarchiver kde-plasma-desktop kde-plasma-netbook kdeadmin  kdeartwork kdegraphics gobby-0.5 kdeedu kdegames kdemultimedia kdenetwork kdeutils kdepim kde-standard kdeaccessibility kdesdk kdetoys kdewebdev calligra kdeplasma-addons kde-runtime plasma-desktop kde-workspace kde-baseapps udisks2 upower kdm gdm3 kde-l10n xfwm4 xfconf xfce4-settings xfce4-panel xfdesktop4 thunar  gtk2-engines-xfce xfce4-session xfce4-appfinder  xfce4-mixer orage  libxfce4ui-utils thunar-volman  tango-icon-theme  xfce4-notifyd xfce4-power-manager evince iceweasel pidgin virt-manager mplayer2 screen mutt marble chromium desktop-base gnome kde-plasma-desktop kde-full kde-standard xfce4 lxde vlc evince iceweasel cups build-essential devscripts wine texlive-full asciidoc vim emacs gnome gnome-core network-manager-gnome cheese evolution evolution-plugins gnome-color-manager gnome-documents gnome-games gnome-nettool nautilus-sendto gnome-orca seahorse totem vinagre alacarte avahi-daemon gimp gnome-media gnome-tweak-tool hamster-applet irssi inkscape libreoffice-gnome abiword gnumeric rhythmbox shotwell simple-scan sound-juicer tomboy tracker-gui transmission-gtk xdg-user-dirs-gtk cups-pk-helper gedit-plugins gnome-shell-extensions gstreamer1.0-libav gstreamer1.0-plugins-ugly rhythmbox-plugins rhythmbox-plugin-cdrecorder rygel-playbin rygel-tracker telepathy-gabble telepathy-rakia telepathy-salut totem-plugins libgtk2-perl cinnamon cinnamon-control-center cinnamon-desktop cinnamon-desktop-environment cinnamon-screensaver cinnamon-session cinnamon-settings-daemon cinnamon-translations gnome-main-menu mate-applets mate-backgrounds mate-common mate-control-center mate-desktop mate-desktop-environment mate-icon-theme mate-icon-theme-faenza mate-indicator-applet mate-media mate-menus mate-netbook mate-netspeed mate-notification-daemon mate-panel mate-polkit mate-power-manager mate-screensaver mate-sensors-applet mate-session-manager mate-settings-daemon mate-system-monitor mate-terminal mate-themes mate-user-share mate-utils ; do apt-cache show $i | grep ^Source | cut -d " " -f2  ; apt-cache show $i | grep -q Source || echo $i ; apt-cache showsrc $i 2>/dev/null | grep ^Package  | cut -d " " -f2 ; done ) | sort -u | grep -v build-essential | xargs echo