Merge branch 'master' of git+ssh://git.debian.org/git/mirror/debian.org

diff --git a/.gitignore b/.gitignore
index 2fa2c59ac3e93559da7c0536c1095c096f033678..83b6be19c27766c3bc15ca2449a140c5b8a9da48 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,36 +1,25 @@
-debian/debian.org-backports.debian.org.debhelper.log
 debian/debian.org-backports.debian.org/
-debian/debian.org-bugs.debian.org-mx.debhelper.log
 debian/debian.org-bugs.debian.org-mx/
-debian/debian.org-bugs.debian.org.debhelper.log
 debian/debian.org-bugs.debian.org/
-debian/debian.org-buildd.debian.org.debhelper.log
 debian/debian.org-buildd.debian.org/
-debian/debian.org-cdbuilder.debian.org.debhelper.log
 debian/debian.org-cdbuilder.debian.org/
-debian/debian.org-ftpmaster.debian.org.debhelper.log
 debian/debian.org-ftpmaster.debian.org/
-debian/debian.org-manpages.debian.org.debhelper.log
 debian/debian.org-manpages.debian.org/
-debian/debian.org-nm.debian.org.debhelper.log
 debian/debian.org-nm.debian.org/
-debian/debian.org-packages.debian.org.debhelper.log
 debian/debian.org-packages.debian.org/
-debian/debian.org-patch-tracker.debian.org.debhelper.log
 debian/debian.org-patch-tracker.debian.org/
-debian/debian.org-planet.debian.org.debhelper.log
 debian/debian.org-planet.debian.org/
-debian/debian.org-qa.debian.org.debhelper.log
 debian/debian.org-qa.debian.org/
-debian/debian.org-recommended.debhelper.log
+debian/debian.org-udd.debian.org/
 debian/debian.org-recommended/
-debian/debian.org-release.debian.org.debhelper.log
+debian/debian.org-recommended-linux/
 debian/debian.org-release.debian.org/
-debian/debian.org-testing-security.debian.org.debhelper.log
+debian/debian.org-snapshot.debian.org/
 debian/debian.org-testing-security.debian.org/
-debian/debian.org-www-master.debian.org.debhelper.log
 debian/debian.org-www-master.debian.org/
-debian/debian.org.debhelper.log
+debian/debian.org-ftpmaster.debian.org-poneys/
 debian/debian.org/
 debian/files
 debian/tmp/
+debian/*.substvars
+debian/*.debhelper.log

diff --git a/apt-in-chroot b/apt-in-chroot
index f1c720199c6ee674ff1798bf926e5ff07a5215b1..4e0028a6748bf5d09bd90f3f2ae1bea4269e34eb 100755 (executable)
--- a/apt-in-chroot
+++ b/apt-in-chroot
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # 
 #  apt-in-chroot - runs apt in a specified chroot
 # 

diff --git a/debian/changelog b/debian/changelog
index 22030b36686082ada3484c2b89eb911eb2513a50..06ce61e23863006e99781d2e5d9d7d95e9ab1380 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,60 @@
-debian.org (XX) XXstable; urgency=low
+debian.org (4XXX) Xnstable; urgency=low
+
+  * planet:
+    - Fix timeout dependency ( | coreutils >> somethingorother)
+    - add libdbi-perl
+    - add libdate-manip-perl
+    - add libdbd-sqlite3-perl
+  * apt-in-chroot: "fix" bashism.
+
+ -- Peter Palfrader <weasel@debian.org>  Fri, 01 Apr 2011 22:55:17 +0200
+
+debian.org (43.3) unstable; urgency=low
+
+  * Add debian.org-udd.debian.org.
+  * Add debian.org-snapshot.debian.org.
+
+ -- Peter Palfrader <weasel@debian.org>  Sat, 26 Mar 2011 22:28:16 +0100
+
+debian.org (43.2) unstable; urgency=low
+
+  [ Stephen Gran ]
+  * debian.org:
+    - add nagios-plugins-standard (>= 1.4.15) | nagios-plugins-basic for
+      check_mailq
+
+  [ Peter Palfrader ]
+  * release
+    - needs edos-debcheck, not edos-distcheck.
+    - python-dev
+  * ftp-poneys
+    - gitstats
+
+ -- Peter Palfrader <weasel@debian.org>  Mon, 21 Mar 2011 22:28:16 +0100
+
+debian.org (43.1) unstable; urgency=low
+
+  * release:
+    - add edos-distcheck
+    - add python2.5-dev
+    - add libapt-pkg-dev
+    - add dpkg-dev
+    - remove obsolete python-simplejson | python (>= 2.6)
+  * Add debian.org-ftpmaster.debian.org-poneys package.
+
+ -- Peter Palfrader <weasel@debian.org>  Sun, 20 Mar 2011 00:36:33 +0100
+
+debian.org (43) unstable; urgency=low
+
+  * buildd.debian.org:
+    - remove dependency on postgresql-8.4 - we do not depend on db servers in
+      debian.org metapackages.
+  * Move lsscsi from -recommended to -recommended-linux as it does not exist
+    on the BSDs.
+
+ -- Peter Palfrader <weasel@debian.org>  Sat, 19 Mar 2011 23:54:49 +0100
+
+debian.org (42) unstable; urgency=low
 
   [ Steve McIntyre ]
   * cdbuilder.debian.org
@@ -13,10 +69,17 @@ debian.org (XX) XXstable; urgency=low
   * -recommended:
     - add busybox-static
     - add lsscsi
+    - add cvs (yes, really)
   * www-master:
     - add ttf-malayalam-fonts
     - add tidy
     - add libjson-perl
+  * ftp-master:
+    - add python-simplejson || python (>= 2.6)
+    - dependency on python-sqlalchemy is no longer versioned
+    - remove irb (now provided by ruby)
+  * buildd.debian.org:
+    - dependency on python-sqlalchemy is no longer versioned
 
   [ Bernd Zeimetz ]
   * nm.d.o:
@@ -26,9 +89,17 @@ debian.org (XX) XXstable; urgency=low
       python-wtforms.
 
   [ Martin Zobel-Helas ]
-  * add ipython to -recommended. 
+  * add ipython to -recommended.
+  * add diffstat to -recommended
+
+  [ Stephen Gran ]
+  * Add wheezy chroots to upgrade-porter-chroots
+
+  [ Francesca Ciceri ]
+  * debian.org-www-master.debian.org:
+    - add libintl-perl
 
- -- Peter Palfrader <weasel@debian.org>  Tue, 28 Dec 2010 15:44:12 +0100
+ -- Peter Palfrader <weasel@debian.org>  Sat, 19 Mar 2011 23:34:04 +0100
 
 debian.org (41.1) stable; urgency=low
 

diff --git a/debian/control b/debian/control
index 6686fccbceb3b0e6e525205e1c8ff32be54270d1..f5279b2a857f2d27752902c0436506d7e19a5811 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Standards-Version: 3.8.1
 
 Package: debian.org
 Architecture: all
-Depends: userdir-ldap, zsh, tcsh, pdksh, ksh, csh, ntp, locales-all, exim4-daemon-heavy | postfix, sudo, libpam-pwdfile, vim, munin-node, gnupg, bzip2, cacert-spi | ca-certificates (>> 20080411), ed, cron, dialog, libterm-readline-gnu-perl, logrotate, syslog-ng (>= 3.1)
+Depends: userdir-ldap, zsh, tcsh, pdksh, ksh, csh, ntp, locales-all, exim4-daemon-heavy | postfix, sudo, libpam-pwdfile, vim, munin-node, gnupg, bzip2, cacert-spi | ca-certificates (>> 20080411), ed, cron, dialog, libterm-readline-gnu-perl, logrotate, syslog-ng (>= 3.1), nagios-plugins-standard (>= 1.4.15) | nagios-plugins-basic
 Recommends: debian.org-recommended
 Conflicts: dchroot-dsa (<= 2:1)
 Description: DSA's host metapackage
@@ -19,7 +19,8 @@ Description: DSA's host metapackage
 Package: debian.org-recommended-linux
 Architecture: all
 Depends: vlan, ifenslave, bridge-utils, iproute,
-       strace
+       strace,
+       lsscsi
 Description: metapackage to pull in recommended, but not essential tools for linux system
  This package depends on packages that are recommended to  be installed on
  every Linux debian.org host but are not essential.
@@ -37,6 +38,7 @@ Depends: debian.org,
                git-svn,
                subversion-tools,
                mercurial,
+               cvs
        ,
        mtr-tiny, tcpdump, tcptraceroute, ndisc6,
        traceroute | not+gnu-linux,
@@ -63,7 +65,6 @@ Depends: debian.org,
        ,
        mcelog | not+amd64 | not+gnu-linux,
        mcelog | not+i386 | not+gnu-linux,
-       lsscsi
        ,
        htop, psmisc,
        lsof | not+gnu-linux,
@@ -77,6 +78,7 @@ Depends: debian.org,
        mmv,
        moreutils,
        patchutils,
+       diffstat,
        netcat-openbsd, socat, telnet
        ,
        deborphan
@@ -187,6 +189,7 @@ Depends: debiandoc-sgml,
        latex-cjk-all,
        latex-cjk-chinese,
        ldap-utils,
+       libintl-perl,
        libnet-ldap-perl,
        libtimedate-perl,
        libwww-perl,
@@ -255,12 +258,10 @@ Depends: edos-distcheck,
        python-psycopg2,
        python-mako,
        python-nose,
-       python-sqlalchemy (>= 0.5),
-       python-sqlalchemy (<< 0.6),
+       python-sqlalchemy,
        quinn-diff,
        r-base-core,
        r-cran-lattice,
-       postgresql-8.4, postgresql-8.4-debversion,
        php5,
        moreutils (>= 0.39~)
 Description: metapackages for buildd.debian.org dependencies
@@ -285,10 +286,11 @@ Description: metapackages for patch-tracker.debian.org dependencies
 Package: debian.org-planet.debian.org
 Architecture: all
 Depends: libwww-perl,
-       timeout,
+       timeout | coreutils (>= 8.0-1),
        debianutils,
        python-django,
-       python
+       python,
+       libdbi-perl, libdate-manip-perl, libdbd-sqlite3-perl
 Description: metapackages for planet.debian.org dependencies
  This package depends on everything that is needed for a planet.debian.org.
 
@@ -306,6 +308,7 @@ Package: debian.org-ftpmaster.debian.org
 Architecture: all
 Depends: apt-utils,
        libapt-pkg-dev,
+       libemail-send-perl,
        python-apt,
        python-debianbts (>= 1.4~bpo50+1),
        lintian,
@@ -317,7 +320,8 @@ Depends: apt-utils,
        python-pygresql,
        python-pyrss2gen,
        python-yaml,
-       python-sqlalchemy (>= 0.5), python-sqlalchemy (<< 0.6),
+       python-rrdtool,
+       python-sqlalchemy,
        binutils-multiarch,
        build-essential,
        devscripts,
@@ -334,7 +338,6 @@ Depends: apt-utils,
        procmail,
        cvs,
        ruby,
-       irb,
        lynx,
        libxml-rss-perl,
        ghostscript,
@@ -344,11 +347,28 @@ Depends: apt-utils,
 Description: metapackage for ftpmaster
  This package depends on everything that is needed for an ftpmaster setup.
 
+Package: debian.org-ftpmaster.debian.org-poneys
+Architecture: all
+Depends: bicyclerepair,
+       dpkg-dev-el,
+       easypg,
+       emacs-goodies-el,
+       pychecker,
+       pylint,
+       python-mode,
+       ruby-elisp,
+       gitstats
+Description: metapackage for ftpmaster extras
+ Things not really needed needed.
+
 Package: debian.org-release.debian.org
 Architecture: all
-Depends: mutt,
+Depends: edos-debcheck,
+       mutt,
        subversion,
        python2.5,
+       python2.5-dev,
+       python-dev,
        devscripts,
        wdiff,
        python-pygresql,
@@ -356,6 +376,8 @@ Depends: mutt,
        python-apt,
        python-debian,
        libapt-pkg-perl,
+       libapt-pkg-dev,
+       dpkg-dev,
        procmail
 Description: metapackage for release
  This package depends on everything that is needed for a release.debian.org
@@ -437,3 +459,34 @@ Depends: db4.8-util,
        rrdtool
 Description: metapackage for qa.debian.org
  This package depends on all the packages that are needed for qa.debian.org setup.
+
+Package: debian.org-udd.debian.org
+Architecture: all
+Depends: graphviz,
+       libapt-pkg-dev,
+       libcgi-simple-perl,
+       libdbd-pg-ruby,
+       libdbi-ruby,
+       libjson-ruby,
+       liblist-moreutils-perl,
+       libmime-tools-perl,
+       libparams-validate-perl,
+       libperl-dev,
+       libmldbm-perl,
+       libsafe-hole-perl,
+       libtext-template-perl,
+       libyaml-syck-perl,
+       python-debian,
+       python-dev,
+       python-psycopg2,
+       python-yaml
+Description: metapackage for udd.debian.org
+ This package depends on all the packages that are needed for udd.debian.org setup.
+
+Package: debian.org-snapshot.debian.org
+Architecture: all
+Depends: ruby, libdbd-pg-ruby1.8, libbz2-ruby1.8, libbz2-ruby1.8, python-yaml, python-psycopg2, python-lockfile, fuse-utils, python-fuse, uuid-runtime,
+       python-dev, gcc,
+       python-pylons
+Description: metapackage for snapshot.debian.org
+ This package depends on all the packages that are needed for snapshot.debian.org setup.

diff --git a/upgrade-porter-chroots b/upgrade-porter-chroots
index a8ad21eb84ce1a58edb3fce5c647cf63d7ddaaf2..9f9ad35708f8803a7f724812cd626597b7e73097 100755 (executable)
--- a/upgrade-porter-chroots
+++ b/upgrade-porter-chroots
@@ -1,8 +1,10 @@
 #!/bin/sh
 
-for d in lenny squeeze sid \
-         lenny_i386 squeeze_i386 sid_i386 \
-         lenny_amd64 squeeze_amd64 sid_amd64 \
+# Do we just want to use dchroot -l ?
+
+for d in lenny squeeze wheezy sid \
+         lenny_i386 squeeze_i386 wheezy_i386 sid_i386 \
+         lenny_amd64 squeeze_amd64 wheezy_amd64 sid_amd64 \
        ; do
        [ -d /chroot/$d ] || continue;
        echo; echo $d; echo