[Piuparts-commits] [SCM] piuparts git repository branch, piatti.git, updated. f3d478e5f291baaf9e84d1982ca5e2e6b353a232

[Holger Levsen]

The following commit has been merged in the piatti.git branch:
commit edb07aa7866934b904ddac2a943baef9196791d5
Author: Holger Levsen <holger at layer-acht.org>
Date:   Wed Feb 1 11:15:47 2012 +0100

    be more accurate

diff --git a/org/piuparts.debian.org/etc/piuparts.conf.goldwasser b/org/piuparts.debian.org/etc/piuparts.conf.goldwasser
index c2be315..b9a422f 100644
--- a/org/piuparts.debian.org/etc/piuparts.conf.goldwasser
+++ b/org/piuparts.debian.org/etc/piuparts.conf.goldwasser
@@ -33,7 +33,7 @@ log-file = sid.log
 known_circular_depends = libc6 libgcc1 multiarch-support coreutils dpkg libswitch-perl perl perl-modules ghostscript gs-cjk-resource libgs9 odbcinst odbcinst1debian2 python-imaging python-imaging-tk g++-4.4 libstdc++6-4.4-dev libqt4-dbus qdbus g++-4.6 libstdc++6-4.6-dev ca-certificates-java openjdk-6-jre-headless openjdk-6-jre-lib dmsetup libdevmapper1.02.1 uqm uqm-content libmaven-scm-java libmaven2-core-java libwagon-java liblwp-protocol-https-perl libwww-perl acheck acheck-rules libmono-corlib2.0-cil libmono-posix2.0-cil libmono-security2.0-cil libmono-system2.0-cil mono-2.0-gac mono-gac mono-runtime libmono-system-data-linq2.0-cil libmono-system-web2.0-cil libmono-wcf3.0-cil libmono2.0-cil libntrack0 ntrack-module-libnl-0 ntrack-module-rtnetlink-0 xemacs21 xemacs21-bin xemacs21-mule xemacs21-mule-canna-wnn xemacs21-nomule xemacs21-support aide aide-common gamin libgamin0 monodoc-browser monodoc-http monodoc-manual openjdk-7-jre-headless openjdk-7-jre-lib libgeronimo-jpa-2.0-spec-java libgeronimo-osgi-support-java libosgi-compendium-java bochs bochs-wx tasksel tasksel-data g++-4.5 libstdc++6-4.5-dev gcj-4.6-jdk libgcj12-dev gdc-4.6 libphobos2-4.6-dev gdc-4.4 libphobos-4.4-dev gcj-4.4-jdk libgcj10-dev pcb-common pcb-gtk pcb-lesstif ggz-gtk-games ggz-gtk-games-data ggz-sdl-games ggz-sdl-games-data gnat-gps gnat-gps-common gnuift gnuift-perl heroes-common heroes-ggi heroes-sdl libverto-glib1 libverto-libev1 libverto1 strongswan-ikev1 strongswan-ikev2 strongswan-nm strongswan-starter klogd sysklogd apt-watch-backend apt-watch-interface coq coq-theories hugs libhugs-base libhugs-haskell98 libreoffice-core libreoffice-common libreoffice-style-default opendnssec-enforcer opendnssec-enforcer-backend
 
 [testing2sid]
-description = Debian main: package installation in testing and upgrade to sid, then removal and purge test.
+description = Debian main: package installation in testing and dist-upgrade to sid, then removal and purge test.
 master-command = PYTHONPATH=/org/piuparts.debian.org/lib/python2.6/dist-packages:/org/piuparts.debian.org/lib/python2.7/dist-packages python /org/piuparts.debian.org/share/piuparts/piuparts-master testing2sid
 packages-url = http://ftp.de.debian.org/debian/dists/sid/main/binary-amd64/Packages.bz2
 sources-url = http://ftp.de.debian.org/debian/dists/sid/main/source/Sources.bz2
@@ -60,7 +60,7 @@ log-file = wheezy.log
 known_circular_depends = libc6 libgcc1 multiarch-support coreutils dpkg libswitch-perl perl perl-modules odbcinst odbcinst1debian2 python-imaging python-imaging-tk g++-4.4 libstdc++6-4.4-dev g++-4.6 libstdc++6-4.6-dev ca-certificates-java openjdk-6-jre-headless openjdk-6-jre-lib dmsetup libdevmapper1.02.1 uqm uqm-content libmaven-scm-java libmaven2-core-java libwagon-java acheck acheck-rules liblwp-protocol-https-perl libwww-perl libmono-corlib2.0-cil libmono-posix2.0-cil libmono-security2.0-cil libmono-system2.0-cil mono-2.0-gac mono-gac mono-runtime libmono-system-data-linq2.0-cil libmono-system-web2.0-cil libmono-wcf3.0-cil libmono2.0-cil ghostscript gs-cjk-resource libgs9 xemacs21 xemacs21-bin xemacs21-mule xemacs21-mule-canna-wnn xemacs21-nomule xemacs21-support aide aide-common libntrack0 ntrack-module-libnl-0 ntrack-module-rtnetlink-0 gamin libgamin0 monodoc-browser monodoc-http monodoc-manual openjdk-7-jre-headless openjdk-7-jre-lib libgeronimo-jpa-2.0-spec-java libgeronimo-osgi-support-java libosgi-compendium-java bochs bochs-wx tasksel tasksel-data g++-4.5 libstdc++6-4.5-dev python-netcdf python-scientific gcj-4.6-jdk libgcj12-dev gdc-4.4 libphobos-4.4-dev gcj-4.4-jdk libgcj10-dev gdc-4.6 libphobos2-4.6-dev pcb-common pcb-gtk pcb-lesstif ggz-gtk-games ggz-gtk-games-data ggz-sdl-games ggz-sdl-games-data gnuift gnuift-perl heroes-common heroes-ggi heroes-sdl libverto-glib1 libverto-libev1 libverto1 strongswan-ikev1 strongswan-ikev2 strongswan-nm strongswan-starter klogd sysklogd apt-watch-backend apt-watch-interface coq coq-theories hugs libhugs-base libhugs-haskell98 libreoffice-core libreoffice-common libreoffice-style-default opendnssec-enforcer opendnssec-enforcer-backend
  
 [squeeze2wheezy]
-description = Debian main: package installation in squeeze and upgrade to wheezy, then removal and purge test.
+description = Debian main: package installation in squeeze and dist-upgrade to wheezy, then removal and purge test.
 master-command = PYTHONPATH=/org/piuparts.debian.org/lib/python2.6/dist-packages:/org/piuparts.debian.org/lib/python2.7/dist-packages python /org/piuparts.debian.org/share/piuparts/piuparts-master squeeze2wheezy
 packages-url = http://ftp.de.debian.org/debian/dists/wheezy/main/binary-amd64/Packages.bz2
 sources-url = http://ftp.de.debian.org/debian/dists/wheezy/main/source/Sources.bz2
diff --git a/org/piuparts.debian.org/etc/piuparts.conf.piatti b/org/piuparts.debian.org/etc/piuparts.conf.piatti
index aa79220..48b4507 100644
--- a/org/piuparts.debian.org/etc/piuparts.conf.piatti
+++ b/org/piuparts.debian.org/etc/piuparts.conf.piatti
@@ -39,7 +39,7 @@ known_circular_depends = libc6 libgcc1 multiarch-support coreutils dpkg libswitc
 
 [testing2sid]
 precedence = 3
-description = Debian main: package installation in sid and upgrade to testing, then removal and purge test.
+description = Debian main: package installation in sid and dist-upgrade to testing, then removal and purge test.
 master-command = PYTHONPATH=/org/piuparts.debian.org/lib/python2.6/dist-packages:/org/piuparts.debian.org/lib/python2.7/dist-packages python /org/piuparts.debian.org/share/piuparts/piuparts-master testing2sid
 packages-url = http://piatti.debian.org/debian/dists/sid/main/binary-amd64/Packages.bz2
 sources-url = http://piatti.debian.org/debian/dists/sid/main/source/Sources.bz2
@@ -68,7 +68,7 @@ known_circular_depends = libc6 libgcc1 multiarch-support coreutils dpkg libswitc
 
 [squeeze2wheezy]
 precedence = 2
-description = Debian main: package installation in squeeze and upgrade to wheezy, then removal and purge test.
+description = Debian main: package installation in squeeze and dist-upgrade to wheezy, then removal and purge test.
 master-command = PYTHONPATH=/org/piuparts.debian.org/lib/python2.6/dist-packages:/org/piuparts.debian.org/lib/python2.7/dist-packages python /org/piuparts.debian.org/share/piuparts/piuparts-master squeeze2wheezy
 packages-url = http://piatti.debian.org/debian/dists/wheezy/main/binary-amd64/Packages.bz2
 sources-url = http://piatti.debian.org/debian/dists/wheezy/main/source/Sources.bz2
@@ -97,7 +97,7 @@ known_circular_depends = libc6 libgcc1 debconf debconf-english debconf-i18n abus
 
 [lenny2squeeze]
 precedence = 5
-description = Debian main: package installation in lenny and upgrade to squeeze, then removal and purge test.
+description = Debian main: package installation in lenny and dist-upgrade to squeeze, then removal and purge test.
 master-command = PYTHONPATH=/org/piuparts.debian.org/lib/python2.6/dist-packages:/org/piuparts.debian.org/lib/python2.7/dist-packages python /org/piuparts.debian.org/share/piuparts/piuparts-master lenny2squeeze
 packages-url = http://piatti.debian.org/debian/dists/squeeze/main/binary-amd64/Packages.bz2
 sources-url = http://piatti.debian.org/debian/dists/squeeze/main/source/Sources.bz2

-- 
piuparts git repository