Kenshi Muto <[EMAIL PROTECTED]> writes:

> source-dependencies information provided by buildd.debian.org seem
> stopped a service since Since 2005.
>
> update-sourcedeps command in sbuild trys to download:
> wget http://buildd.debian.org/andrea/$ARCH/source-dependencies-stable.gz
> wget http://buildd.debian.org/andrea/$ARCH/source-dependencies-testing.gz
> wget http://buildd.debian.org/andrea/$ARCH/source-dependencies-unstable.gz
>
> But these files don't exist.
> I couldn't find any alternative locations.

It appears that the service is indeed stopped, and update-sourcedeps
will no longer work.

As a result, I have removed update-sourcedeps from sbuild, and marked
sourcedeps support as obsolete.  We will remove all sourcedeps after
the release of Etch, so it will use only package Source-Depends for
Lenny.

Thanks for reporting this.  The patch I have applied is attached.


Regards,
Roger

-- 
  .''`.  Roger Leigh
 : :' :  Debian GNU/Linux             http://people.debian.org/~rleigh/
 `. `'   Printing on GNU/Linux?       http://gutenprint.sourceforge.net/
   `-    GPG Public Key: 0x25BFB848   Please GPG sign your mail.
Index: debian/changelog
===================================================================
--- debian/changelog	(revision 1085)
+++ debian/changelog	(working copy)
@@ -16,9 +16,16 @@
       + Add package information into the key of the %entries hash, in
         order to cope with multiple packages being returned by apt-cache.
         Based on a patch by Goswin von Brederlow for Bug #408091.
+  * sbuild.conf: Obsolete $source_dependencies.
   * sbuild.conf.local:
     - Add pgp_options from sbuild.conf (Closes: #398128).
     - Add check_watches.
+    - Obsolete $source_dependencies.
+  * update-sourcedeps, update-sourcedeps.1.in: Remove (Closes: 409642).
+    Thanks to Kenshi Muto for reporting that it no longer works.
+  * debian/rules, debian/manpages, debian/README.Debian: Remove support
+    for update-sourcedeps, and note that sourcedeps support is obsoleted
+    and will be removed in Lenny.
 
  --
 
Index: debian/rules
===================================================================
--- debian/rules	(revision 1085)
+++ debian/rules	(working copy)
@@ -10,7 +10,6 @@
 	avg-pkg-build-time.1	\
 	sbuild.1		\
 	sbuild-setup.7		\
-	update-sourcedeps.1	\
 	Sbuild/Log.pm
 
 %: %.in
@@ -49,7 +48,7 @@
 	dh_clean -k
 	dh_installdirs
 
-	$(INSTALL) -m 755 sbuild update-sourcedeps avg-pkg-build-time \
+	$(INSTALL) -m 755 sbuild avg-pkg-build-time \
 		$(DESTDIR)/usr/bin/
 	$(INSTALL) -m 644 Sbuild.pm $(DESTDIR)/usr/share/perl5/
 	$(INSTALL) -m 644 Sbuild/Chroot.pm $(DESTDIR)/usr/share/perl5/Sbuild/Chroot.pm
Index: debian/manpages
===================================================================
--- debian/manpages	(revision 1085)
+++ debian/manpages	(working copy)
@@ -1,4 +1,3 @@
 avg-pkg-build-time.1
 sbuild.1
 sbuild-setup.7
-update-sourcedeps.1
Index: debian/README.Debian
===================================================================
--- debian/README.Debian	(revision 1085)
+++ debian/README.Debian	(working copy)
@@ -39,21 +39,15 @@
 
   src-deps
   --------
-  src-deps are useful for building packages that don't have a
-  Build-Depends line.  See http://buildd.debian.org/andrea and the
-  update-sourcedeps man page for more information.
+  Manual source dependencies are obsolete.  While sbuild will
+  continue to support source-dependencies files for Etch,
+  update-sourcedeps no longer works and has been removed.
+  This is because the source-dependencies files are no longer
+  generated for download.  All support for source-dependencies
+  files will be removed in Lenny.  All packages must now
+  provide Source-Depends[-Indep] in their debian/control file.
 
-  The update-sourcedeps script will fetch the source-dependencies-*
-  files and put them in place.
 
-  If you decide to use src-deps you are responsible for keeping them
-  up to date, maybe with a cron job.
-
-  On a modern Debian installation, src-deps are of limited use,
-  because Build-Depends are now required.  As a result, src-deps are
-  now optional, and in most cases may be completely ignored.
-
-
 NOTE: sbuild must be run in the directory that has the
 chroot-{stable,testing,unstable} symlink or it won't find
 the chroot and will build in base.  When using schroot,
@@ -61,4 +55,4 @@
 must be available.
 
 
- -- Roger Leigh <[EMAIL PROTECTED]>, Thu,  9 Mar 2006 21:23:10 +0000
+ -- Roger Leigh <[EMAIL PROTECTED]>, Sat, 10 Feb 2007 20:11:53 +0000
Index: update-sourcedeps
===================================================================
--- update-sourcedeps	(revision 1085)
+++ update-sourcedeps	(working copy)
@@ -1,65 +0,0 @@
-#!/bin/sh
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
-#
-# $Id$
-#
-
-set -e
-
-set +e	# don't die if .sbuildrc is missing
-dbfull=$(cat /usr/share/sbuild/sbuild.conf /etc/sbuild/sbuild.conf ~/.sbuildrc 2>/dev/null | \
-	sed -n '/^\$source_dependencies\>/s/.*"\(.*\)".*/\1/p' | tail -n 1)
-set -e
-
-dbdir=${dbfull%/*}
-if [ -z "$dbdir" ]; then
-    dbdir=/var/lib/sbuild
-fi
-file=source-dependencies
-
-tmp=/tmp/update-sourcedep.$$
-arch=$(dpkg --print-installation-architecture)
-host=buildd.debian.org
-dir=andrea/$arch
-
-mkdir $tmp
-cd $tmp
-
-trap 'rm -rf $tmp ; exit 1' 1 2 3 13 15
-trap 'rm -rf $tmp' 0
-
-done=""
-for distribution in stable testing unstable; do
-
-	name=$file-$distribution
-    if wget --tries=3 -q http://$host/$dir/$name.gz; then
-		gunzip $name.gz
-		if ! cmp -s $name $dbdir/$name; then
-			done="$done $distribution"
-			cp $name $dbdir/
-			chmod 664 $dbdir/$name
-			if [ -x /usr/bin/sourcedeps-makerev ]; then
-				/usr/bin/sourcedeps-makerev $dbdir/$name >$dbdir/$name.rev
-			fi
-		fi
-	fi
-done
-
-if [ -n "$done" ]; then
-	echo "Updated source-dependencies for:$done"
-fi
-
-exit 0
Index: sbuild.conf.local
===================================================================
--- sbuild.conf.local	(revision 1085)
+++ sbuild.conf.local	(working copy)
@@ -5,6 +5,8 @@
 # settings, not defaults for this package
 
 # File with the source dependencies (also used by update-sourcedeps)
+# Note that source dependencies are obsolete, and support will be removed
+# in Lenny.
 #$source_dependencies = "/var/lib/sbuild/source-dependencies";
 
 # Name of a database for logging package build times (optional, no database
Index: update-sourcedeps.1.in
===================================================================
--- update-sourcedeps.1.in	(revision 1085)
+++ update-sourcedeps.1.in	(working copy)
@@ -1,63 +0,0 @@
-.\" Copyright © 1998  James Troup <[EMAIL PROTECTED]>
-.\" Copyright © 2006  Roger Leigh <[EMAIL PROTECTED]>
-.\"
-.\" sbuild is free software; you can redistribute it and/or modify it
-.\" under the terms of the GNU General Public License as published by
-.\" the Free Software Foundation; either version 2 of the License, or
-.\" (at your option) any later version.
-.\"
-.\" sbuild is distributed in the hope that it will be useful, but
-.\" WITHOUT ANY WARRANTY; without even the implied warranty of
-.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-.\" General Public License for more details.
-.\"
-.\" You should have received a copy of the GNU General Public License
-.\" along with this program; if not, write to the Free Software
-.\" Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-.\" MA  02111-1307  USA
-.TH UPDATE\-SOURCEDEPS 1 "@DATE@" "Version @VERSION@" "Debian sbuild"
-.SH NAME
-update\-sourcedeps \- update the sbuild source dependency files
-.SH SYNOPSIS
-.B update\-sourcedeps
-.SH VERSION
-This man page documents the packaged version of sbuild.  This version
-is maintained by the \fBbuildd-tools\fP project developers on Alioth
-(\f[CR]https://alioth.debian.org/projects/buildd\-tools/\fP).
-.SH DESCRIPTION
-\fBupdate\-sourcedeps\fR updates the source\-dependencies\-* files
-from \f[CR]buildd.debian.org/andrea/\fP.  These dependencies are used
-by sbuild to calculate the Build-Depends for those packages that don't
-include them\[em]mainly potato, and increasingly fewer woody,
-packages.  \fBupdate\-sourcedeps\fR also contains arch-specific and
-package-specific patches that are applied by sbuild after the source
-is unpacked.  These patches work around temporary compiler bugs and
-other transient problems so a package can still be autobuilt and the
-change can be easily reverted without bothering the package
-maintainer.
-.PP
-\fBupdate\-sourcedeps\fR is normally called by buildd.  Since sbuild
-is used by itself here, \fBupdate\-sourcedeps\fR must to be called
-manually (or not).  The source-dependencies-* files aren't required by
-sbuild but are very helpful if you're autobuilding a lot of packages.
-.SH NOTE
-Before you file bugs for build failures be sure you understand the
-difference between src-deps and build-deps and also how the src-dep
-patches work.
-.SH WARNING
-Inappropriate settings in your \fI~/.wgetrc\fP can cause problems.
-The WGETRC environment variable can be used to redirect \fI.wgetrc\fP.
-.SH AUTHORS
-.nf
-James Troup
-Roman Hodek
-.fi
-.SH "SEE ALSO"
-.SP
-.BR sbuild (1).
-.\"#
-.\"# The following sets edit modes for GNU EMACS
-.\"# Local Variables:
-.\"# mode:nroff
-.\"# fill-column:79
-.\"# End:
Index: sbuild.conf
===================================================================
--- sbuild.conf	(revision 1085)
+++ sbuild.conf	(working copy)
@@ -12,6 +12,8 @@
 $mailfrom = "Source Builder <sbuild>";
 
 # File with the source dependencies
+# Note that source dependencies are obsolete, and support will be removed
+# in Lenny.
 $source_dependencies = "/var/lib/sbuild/source-dependencies";
 
 # Directory for writing build logs to

Attachment: pgpaA6NCPDB32.pgp
Description: PGP signature

Reply via email to