Author: jamessan
Date: 2009-11-20 03:38:01 +0000 (Fri, 20 Nov 2009)
New Revision: 2026
Modified:
trunk/debian/changelog
trunk/scripts/debuild.pl
Log:
Remove references to pbuilder-satisfydepends. Suggest mk-build-deps instead.
(Closes: #446318)
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2009-11-20 03:37:55 UTC (rev 2025)
+++ trunk/debian/changelog 2009-11-20 03:38:01 UTC (rev 2026)
@@ -16,7 +16,10 @@
punctuation characters we strip from the distribution name when we parse
an "Upload to ..." line. (Closes: #548171)
+ Consistently use “--nomainttrailer” in the manpage. (Closes: #544351)
- * debuild: Recognize dpkg-source's -z/-Z options. (Closes: #553205)
+ * debuild:
+ + Recognize dpkg-source's -z/-Z options. (Closes: #553205)
+ + Remove references to pbuilder-satisfydepends. Suggest mk-build-deps
+ instead. (Closes: #446318)
* debcommit:
+ Handle the split up of Dpkg::Changelog in Dpkg 1.15.5.2.
+ Use Dpkg::Changelog::Parse, if available, instead of shelling out to
Modified: trunk/scripts/debuild.pl
===================================================================
--- trunk/scripts/debuild.pl 2009-11-20 03:37:55 UTC (rev 2025)
+++ trunk/scripts/debuild.pl 2009-11-20 03:38:01 UTC (rev 2026)
@@ -1083,15 +1083,13 @@
system('dpkg-checkbuilddeps');
}
if ($?>>8) {
- # Horrible non-Perlish formatting here, but emacs formatting
- # dies miserably if this paragraph is done as a here-document.
- # And even the documented hack doesn't work here :(
- fatal "You do not appear to have all build dependencies
properly met, aborting.\n" .
- "(Use -d flag to override.)\n" .
- "If you have the pbuilder package installed you can run\n" .
- "/usr/lib/pbuilder/pbuilder-satisfydepends as root to
install the\n" .
- "required packages, or you can do it manually using dpkg or
apt using\n" .
- "the error messages just above this message.\n";
+ fatal <<"EOT";
+You do not appear to have all build dependencies properly met, aborting.
+(Use -d flag to override.)
+You can use mk-build-deps to generate a dummy package which Depends on all the
+required packages, or you can install them manually using dpkg or apt using
+the error messages just above this message.
+EOT
}
}
@@ -1296,10 +1294,10 @@
if ($?>>8) {
fatal <<"EOT";
You do not appear to have all build dependencies properly met.
-If you have the pbuilder package installed, you can run
-/usr/lib/pbuilder/pbuilder-satisfydepends as root to install the
-required packages, or you can do it manually using dpkg or apt using
-the error messages just above this message.
+You can use mk-build-deps to generate a dummy package which
+Depends on all the required packages, or you can install them
+manually using dpkg or apt using the error messages just above
+this message.
EOT
}
}
--
To unsubscribe, send mail to [email protected].
