On 2012-07-16 23:02, Guillem Jover wrote:
I'll try to give a more detailed review of
the code in few days.
Have you had a chance to review this patch?
Since my last mail, I realized that:
* I forgot some documentation for Dpkg::Deps::deps_parse(), and
* A use_profile option was missing from deps_parse().
Attached is a patch in which these issues are corrected.
Thanks,
--
P. J. McDermott(_/@\_),--.
http://www.pehjota.net/ o o o/ oo \
http://www.pehjota.net/contact.html o \ `-/| |.
o o o~v/_\--/_/
diff -Nru dpkg-1.16.8/debian/changelog dpkg-1.16.8+nmu1/debian/changelog
--- dpkg-1.16.8/debian/changelog2012-07-20 20:39:49.0 -0400
+++ dpkg-1.16.8+nmu1/debian/changelog 2012-07-23 13:32:55.0 -0400
@@ -1,3 +1,10 @@
+dpkg (1.16.8+nmu1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Add support for build profiles.
+
+ -- P. J. McDermott p...@nac.net Sun, 22 Jul 2012 17:00:04 -0400
+
dpkg (1.16.8) unstable; urgency=low
[ Updated programs translations ]
diff -Nru dpkg-1.16.8/dpkg-deb/build.c dpkg-1.16.8+nmu1/dpkg-deb/build.c
--- dpkg-1.16.8/dpkg-deb/build.c2012-07-19 18:38:55.0 -0400
+++ dpkg-1.16.8+nmu1/dpkg-deb/build.c 2012-07-22 16:58:21.0 -0400
@@ -296,6 +296,7 @@
Installer-Menu-Item,
Homepage,
Tag,
+ Build-Profile,
NULL
};
diff -Nru dpkg-1.16.8/man/deb-src-control.5
dpkg-1.16.8+nmu1/man/deb-src-control.5
--- dpkg-1.16.8/man/deb-src-control.5 2012-07-19 08:27:36.0 -0400
+++ dpkg-1.16.8+nmu1/man/deb-src-control.5 2012-07-22 16:58:21.0
-0400
@@ -177,8 +177,9 @@
of packages separated by vertical bar (or pipe) symbols, |. The
groups are separated by commas. Commas are to be read as AND, and pipes
as OR, with pipes binding more tightly. Each package name is
-optionally followed by a version number specification in parentheses and an
-architecture specification in square brackets.
+optionally followed by a version number specification in parentheses, an
+architecture specification in square brackets, and a profile specification
+in angle brackets.
The syntax of the
.BR Build\-Conflicts ,
@@ -188,7 +189,8 @@
fields is a list of comma-separated package names, where the comma is read
as an AND. Specifying alternative packages using a pipe is not supported.
Each package name is optionally followed by a version number specification in
-parentheses and an architecture specification in square brackets.
+parentheses, an architecture specification in square brackets, and a profile
+specification in angle brackets.
A version number may start with a , in which case any later version
will match, and may specify or omit the Debian packaging revision (separated
diff -Nru dpkg-1.16.8/man/dpkg-buildpackage.1
dpkg-1.16.8+nmu1/man/dpkg-buildpackage.1
--- dpkg-1.16.8/man/dpkg-buildpackage.1 2012-07-19 08:27:36.0 -0400
+++ dpkg-1.16.8+nmu1/man/dpkg-buildpackage.12012-07-22 16:58:21.0
-0400
@@ -19,7 +19,7 @@
.\ You should have received a copy of the GNU General Public License
.\ along with this program. If not, see http://www.gnu.org/licenses/.
.
-.TH dpkg\-buildpackage 1 2012-05-04 Debian Project dpkg utilities
+.TH dpkg\-buildpackage 1 2012-07-14 Debian Project dpkg utilities
.SH NAME
dpkg\-buildpackage \- build binary or source packages from sources
.
@@ -135,6 +135,10 @@
of \-a or as a complement to override the default GNU system type
of the target Debian architecture.
.TP
+.BI \-P profile
+Specify the profile we build. The default behavior is to build for no
+specific profile.
+.TP
.BI \-j jobs
Number of jobs allowed to be run simultaneously, equivalent to the
.BR make (1)
diff -Nru dpkg-1.16.8/man/dpkg-checkbuilddeps.1
dpkg-1.16.8+nmu1/man/dpkg-checkbuilddeps.1
--- dpkg-1.16.8/man/dpkg-checkbuilddeps.1 2012-07-19 08:27:36.0
-0400
+++ dpkg-1.16.8+nmu1/man/dpkg-checkbuilddeps.1 2012-07-22 16:58:21.0
-0400
@@ -17,7 +17,7 @@
.\ You should have received a copy of the GNU General Public License
.\ along with this program. If not, see http://www.gnu.org/licenses/.
.
-.TH dpkg\-checkbuilddeps 1 2012-05-22 Debian Project dpkg utilities
+.TH dpkg\-checkbuilddeps 1 2012-07-14 Debian Project dpkg utilities
.SH NAME
dpkg\-checkbuilddeps \- check build dependencies and conflicts
.
@@ -61,6 +61,10 @@
the control file is to be built for the given host architecture instead of
the architecture of the current system.
.TP
+.BI \-P profile
+Check build dependencies/conflicts assuming that the package described in
+the control file is to be built for the given build profile.
+.TP
.BR \-? , \-\-help
Show the usage message and exit.
.TP
diff -Nru dpkg-1.16.8/scripts/Dpkg/Control/Fields.pm
dpkg-1.16.8+nmu1/scripts/Dpkg/Control/Fields.pm
--- dpkg-1.16.8/scripts/Dpkg/Control/Fields.pm 2012-07-19
