[SCM] Git repository for devscripts branch, master, updated. v2.11.7-66-ga1d2539

James McCoy jamessan at debian.org
Sat Jun 16 16:20:57 UTC 2012


The following commit has been merged in the master branch:
commit 4b3ebd39feb0f631870e8b8aacd91a3cea7205f9
Author: James McCoy <jamessan at debian.org>
Date:   Sat Jun 16 11:44:14 2012 -0400

    mk-build-deps: Provide a more descriptive README.Debian for generated packages.
    
    Closes: #675337
    Signed-off-by: James McCoy <jamessan at debian.org>

diff --git a/Makefile b/Makefile
index c4695c4..2907a5a 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@ include Makefile.common
 DESTDIR =
 
 PERL_MODULES = Devscripts
-EXAMPLES = conf.default
+EXAMPLES = conf.default README.mk-build-deps
 
 PREFIX ?= /usr
 DOCDIR ?= $(PREFIX)/share/doc/devscripts
diff --git a/README.mk-build-deps b/README.mk-build-deps
new file mode 100644
index 0000000..bc7dae2
--- /dev/null
+++ b/README.mk-build-deps
@@ -0,0 +1,15 @@
+ at packagename@ for Debian
+
+
+This package has the sole purpose of installing packages required for
+building the Debian package indicated by its name; it does so by
+depending on these packages:
+
+ at depends@
+
+It was generated by the mk-build-deps program from the information in
+the Build-Depends field(s) of the source package.
+
+ at packagename@ can be safely removed after the package it was created for
+is built.  If that breaks anything, a dependency is missing in the
+package's Depends field.
diff --git a/debian/changelog b/debian/changelog
index 3996c10..34f105a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,8 @@ devscripts (2.11.9) UNRELEASED; urgency=low
   [ James McCoy ]
   * debchange: Add more documentation about the effects of changelog
     heuristic.  (Closes: #673974)
+  * mk-build-deps: Provide a more descriptive README.Debian for generated
+    packages.  Thanks to chrysn for the patch.  (Closes: #675337)
 
  -- David Prévot <taffit at debian.org>  Thu, 31 May 2012 12:12:02 -0400
 
diff --git a/scripts/mk-build-deps.pl b/scripts/mk-build-deps.pl
index 15fb512..8140cc4 100755
--- a/scripts/mk-build-deps.pl
+++ b/scripts/mk-build-deps.pl
@@ -367,6 +367,7 @@ sub build_equiv
 	$arch = $opt_arch;
     }
 
+    my $readme = '/usr/share/devscripts/README.mk-build-deps';
     open EQUIVS, "| equivs-build $args-"
 	or die "$progname: Failed to execute equivs-build: $!\n";
     print EQUIVS "Section: devel\n" .
@@ -375,6 +376,10 @@ sub build_equiv
     "Package: $opts->{name}-$opts->{type}\n".
     "Architecture: $arch\n".
     "Depends: build-essential, $opts->{depends}\n";
+
+    # Allow the file not to exist to ease testing
+    print EQUIVS "Readme: $readme\n" if -r $readme;
+
     print EQUIVS "Version: $opts->{version}\n" if $opts->{version};
 
     print EQUIVS "Description: build-dependencies for $opts->{name}\n" .

-- 
Git repository for devscripts



More information about the devscripts-devel mailing list