[Build-common-hackers] Bug#272758: marked as done (autogenerated debian/control)

Debian Bug Tracking System owner@bugs.debian.org
Fri, 24 Sep 2004 15:18:12 -0700


Your message dated Fri, 24 Sep 2004 18:02:04 -0400
with message-id <E1CAy8i-0000u1-00@newraff.debian.org>
and subject line Bug#272758: fixed in cdbs 0.4.23-1
has caused the attached Bug report to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what I am
talking about this indicates a serious mail system misconfiguration
somewhere.  Please contact me immediately.)

Debian bug tracking system administrator
(administrator, Debian Bugs database)

--------------------------------------
Received: (at submit) by bugs.debian.org; 21 Sep 2004 20:25:55 +0000
>From rmh@khazad.dyndns.org Tue Sep 21 13:25:55 2004
Return-path: <rmh@khazad.dyndns.org>
Received: from 86.red-80-24-13.pooles.rima-tde.net (khazad.dyndns.org) [80.24.13.86] 
	by spohr.debian.org with esmtp (Exim 3.35 1 (Debian))
	id 1C9rD0-0002kX-00; Tue, 21 Sep 2004 13:25:55 -0700
Received: from aragorn ([192.168.0.1] helo=khazad.dyndns.org)
	by khazad.dyndns.org with esmtp (Exim 3.36 #1 (Debian))
	id 1C9rKk-00008Y-00; Tue, 21 Sep 2004 22:33:54 +0200
Received: from rmh by khazad.dyndns.org with local (Exim 4.34)
	id 1C9rBG-000ELn-NY; Tue, 21 Sep 2004 22:24:06 +0200
Content-Type: multipart/mixed; boundary="===============1756639698=="
MIME-Version: 1.0
From: Robert Millan <rmh@debian.org>
To: Debian Bug Tracking System <submit@bugs.debian.org>
Subject: autogenerated debian/control
X-Mailer: reportbug 2.99.3
Date: Tue, 21 Sep 2004 22:24:06 +0200
Message-Id: <E1C9rBG-000ELn-NY@khazad.dyndns.org>
Sender: <rmh@khazad.dyndns.org>
Delivered-To: submit@bugs.debian.org
X-Spam-Checker-Version: SpamAssassin 2.60-bugs.debian.org_2004_03_25 
	(1.212-2003-09-23-exp) on spohr.debian.org
X-Spam-Status: No, hits=-8.0 required=4.0 tests=BAYES_00,HAS_PACKAGE 
	autolearn=no version=2.60-bugs.debian.org_2004_03_25
X-Spam-Level: 

This is a multi-part MIME message sent by reportbug.

--===============1756639698==
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

Package: cdbs
Version: 0.4.22-1.5
Severity: wishlist
Tags: patch

This patch allows cdbs to be smarter and add packages to the Build-Depends
line in debian/control (possibly other lines in the future too).

I implemented support to add "debhelper (>= 4.1.0)" when debhelper.mk is
included, and "bzip" or "unzip" when tarball.mk is included and the upstream
tarball is compressed with one of these.  Also, the user can customise it and
add other build-dependencies by initialising the CDBS_BUILD_DEPENDS variable.

Note:  In the patch, replace 0.4.22-2 with whatever is the first official
version of cdbs that supports this feature.

-- System Information:
Debian Release: 3.1
  APT prefers unstable
  APT policy: (500, 'unstable')
Architecture: kfreebsd-i386 (i386)
Kernel: GNU/kFreeBSD 5.2.1-6
Locale: LANG=C, LC_CTYPE=C (ignored: LC_ALL set to C)

-- no debconf information

--===============1756639698==
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename="autogen.diff"

diff -ur cdbs-0.4.22.old/1/rules/buildcore.mk.in cdbs-0.4.22/1/rules/buildcore.mk.in
--- cdbs-0.4.22.old/1/rules/buildcore.mk.in	2004-02-15 07:13:30.000000000 +0100
+++ cdbs-0.4.22/1/rules/buildcore.mk.in	2004-09-21 19:40:49.000000000 +0200
@@ -100,6 +100,11 @@
 # can also hook in other stuff here.  Many of the included rules and classes
 # add stuff to this rule.
 clean:: testdir testroot cleanbuilddir
+ifneq ($(DEB_AUTO_UPDATE_DEBIAN_CONTROL),)
+	cat debian/control.in \
+	| sed "s/@cdbs@/$(CDBS_BUILD_DEPENDS)/g" \
+	> debian/control
+endif
 
 # This rule is called before the common-install target.  It's currently only
 # used by debhelper.mk, to run dh_clean -k.
diff -ur cdbs-0.4.22.old/1/rules/buildvars.mk.in cdbs-0.4.22/1/rules/buildvars.mk.in
--- cdbs-0.4.22.old/1/rules/buildvars.mk.in	2004-08-07 04:21:09.000000000 +0200
+++ cdbs-0.4.22/1/rules/buildvars.mk.in	2004-09-21 22:13:15.000000000 +0200
@@ -74,4 +74,10 @@
 	DEB_DESTDIR = $(CURDIR)/debian/tmp/
 endif
 
+ifeq ($(CDBS_BUILD_DEPENDS), )
+CDBS_BUILD_DEPENDS	= cdbs (>= 0.4.22-2)
+else
+CDBS_BUILD_DEPENDS	:= cdbs (>= 0.4.22-2), $(CDBS_BUILD_DEPENDS)
+endif
+
 endif
diff -ur cdbs-0.4.22.old/1/rules/debhelper.mk.in cdbs-0.4.22/1/rules/debhelper.mk.in
--- cdbs-0.4.22.old/1/rules/debhelper.mk.in	2004-08-27 02:48:37.000000000 +0200
+++ cdbs-0.4.22/1/rules/debhelper.mk.in	2004-09-21 20:38:41.000000000 +0200
@@ -74,6 +74,8 @@
 
 include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
 
+CDBS_BUILD_DEPENDS	:= $(CDBS_BUILD_DEPENDS), debhelper (>= 4.1.0)
+
 DH_COMPAT=4
 
 ifeq ($(DEB_VERBOSE_ALL), yes)
diff -ur cdbs-0.4.22.old/1/rules/tarball.mk.in cdbs-0.4.22/1/rules/tarball.mk.in
--- cdbs-0.4.22.old/1/rules/tarball.mk.in	2004-08-27 02:40:59.000000000 +0200
+++ cdbs-0.4.22/1/rules/tarball.mk.in	2004-09-21 20:39:12.000000000 +0200
@@ -29,6 +29,18 @@
 
 include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
 
+# The user developper may override this variable to choose which tarballs
+# to unpack.
+
+DEB_TARBALL ?= $(wildcard *.tgz *.tar.gz *.tar.bz *.tar.bz2 *.zip)
+
+ifneq (, $(findstring .bz2, $(DEB_TARBALL)))
+CDBS_BUILD_DEPENDS    := $(CDBS_BUILD_DEPENDS), bzip2
+endif
+ifneq (, $(findstring .zip, $(DEB_TARBALL)))
+CDBS_BUILD_DEPENDS    := $(CDBS_BUILD_DEPENDS), unzip
+endif
+
 ifeq ($(DEB_TAR_SRCDIR),)
 $(error You must specify DEB_TAR_SRCDIR)
 endif
@@ -38,11 +50,6 @@
 DEB_SRCDIR = $(_cdbs_tarball_dir)/$(DEB_TAR_SRCDIR)
 DEB_BUILDDIR ?= $(DEB_SRCDIR)
 
-# The user developper may override this variable to choose which tarballs
-# to unpack.
-
-DEB_TARBALL ?= $(wildcard *.tgz *.tar.gz *.tar.bz *.tar.bz2 *.zip)
-
 # This is not my finest piece of work.
 # Essentially, it's never right to unpack a tarball more than once
 # so we have to emit stamps.  The stamps then have to be the rule

--===============1756639698==--

---------------------------------------
Received: (at 272758-close) by bugs.debian.org; 24 Sep 2004 22:08:21 +0000
>From katie@ftp-master.debian.org Fri Sep 24 15:08:21 2004
Return-path: <katie@ftp-master.debian.org>
Received: from newraff.debian.org [208.185.25.31] (mail)
	by spohr.debian.org with esmtp (Exim 3.35 1 (Debian))
	id 1CAyEn-0000A3-00; Fri, 24 Sep 2004 15:08:21 -0700
Received: from katie by newraff.debian.org with local (Exim 3.35 1 (Debian))
	id 1CAy8i-0000u1-00; Fri, 24 Sep 2004 18:02:04 -0400
From: Jeff Bailey <jbailey@raspberryginger.com>
To: 272758-close@bugs.debian.org
X-Katie: $Revision: 1.51 $
Subject: Bug#272758: fixed in cdbs 0.4.23-1
Message-Id: <E1CAy8i-0000u1-00@newraff.debian.org>
Sender: Archive Administrator <katie@ftp-master.debian.org>
Date: Fri, 24 Sep 2004 18:02:04 -0400
Delivered-To: 272758-close@bugs.debian.org
X-Spam-Checker-Version: SpamAssassin 2.60-bugs.debian.org_2004_03_25 
	(1.212-2003-09-23-exp) on spohr.debian.org
X-Spam-Status: No, hits=-6.0 required=4.0 tests=BAYES_00,HAS_BUG_NUMBER 
	autolearn=no version=2.60-bugs.debian.org_2004_03_25
X-Spam-Level: 
X-CrossAssassin-Score: 6

Source: cdbs
Source-Version: 0.4.23-1

We believe that the bug you reported is fixed in the latest version of
cdbs, which is due to be installed in the Debian FTP archive:

cdbs_0.4.23-1.dsc
  to pool/main/c/cdbs/cdbs_0.4.23-1.dsc
cdbs_0.4.23-1.tar.gz
  to pool/main/c/cdbs/cdbs_0.4.23-1.tar.gz
cdbs_0.4.23-1_all.deb
  to pool/main/c/cdbs/cdbs_0.4.23-1_all.deb



A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to 272758@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Jeff Bailey <jbailey@raspberryginger.com> (supplier of updated cdbs package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmaster@debian.org)


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Format: 1.7
Date: Fri, 24 Sep 2004 13:34:28 -0400
Source: cdbs
Binary: cdbs
Architecture: source all
Version: 0.4.23-1
Distribution: unstable
Urgency: low
Maintainer: CDBS Hackers <build-common-hackers@lists.alioth.debian.org>
Changed-By: Jeff Bailey <jbailey@raspberryginger.com>
Description: 
 cdbs       - common build system for Debian packages
Closes: 235961 265562 266982 267254 268483 272758
Changes: 
 cdbs (0.4.23-1) unstable; urgency=low
 .
   * Thanks to Robert Millan for the NMU's!
     Acknowledging: (Closes: #235961, #268483, #265562, #266982, #267254)
 .
   * Apply Robert's patch to generate config's from config.in.
     (Closes: #272758).  Further tweaked to honour debian/control as a
     target, and to make sure that cdbs doesn't depend on cdbs.
 .
   * Use this new feature in CDBS.
Files: 
 4ec70c08c8df904f703c1740edf72c71 854 devel optional cdbs_0.4.23-1.dsc
 d27992e27edfe256e40b3c1e5ac1a163 210423 devel optional cdbs_0.4.23-1.tar.gz
 92a7448440bc26ea2807845ec654a6cc 61194 devel optional cdbs_0.4.23-1_all.deb

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.5 (GNU/Linux)

iD8DBQFBVJZj5M5hmdCYCpkRApPaAJ0e5u6FA5ZZtYocm32aK4YPJJwZ/QCdH65Q
xXrjUdXpNfN88e7zrE47Ak0=
=KlD+
-----END PGP SIGNATURE-----