diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | Documentation/debconf7/pbuilder.tex | 23 | ||||
| -rw-r--r-- | debian/changelog | 3 | ||||
| -rwxr-xr-x | pbuilder-satisfydepends-aptitude | 2 |
4 files changed, 22 insertions, 12 deletions
@@ -2,6 +2,12 @@ * Documentation/pbuilder-doc.xml: update and clarify documentation. + +2007-04-29 Loic Minier <lool@dooz.org> + + * pbuilder-satisfydepends-aptitude: Pass --without-recommends to + aptitude. + 2007-04-22 Junichi Uekawa <dancer@debian.org> * examples/execute_installtest.sh: update install test so that it can handle more than one packages. diff --git a/Documentation/debconf7/pbuilder.tex b/Documentation/debconf7/pbuilder.tex index 1dfd542..676cb1a 100644 --- a/Documentation/debconf7/pbuilder.tex +++ b/Documentation/debconf7/pbuilder.tex @@ -1,5 +1,7 @@ \documentclass[a4paper]{article} +\usepackage{graphicx} \usepackage{url} +\usepackage{wrapfig} \begin{document} @@ -35,19 +37,20 @@ build & once per package & build the Debian package inside chroot \\ \hline \end{tabular} +\newpage{} \subsection{A developer use-case in using pbuilder} -Here is a day in developer-life. +Let me examine a typical sequence of events in a day of a Debian Developer. -\begin{itemize} - \item looks at bug report - \item fixes package source - \item builds package using debuild - \item installs package - \item tests package - \item pbuilder - \item upload -\end{itemize} +%\begin{wrapfigure}{rt}{0.4\hsize}\includegraphics[width=1\hsize]{develcycle.eps}\end{wrapfigure} + +\begin{center} + \includegraphics[width=0.6\hsize]{develcycle.eps} +\end{center} + +pbuilder is built in to the process as a checking system to ensure +package quality. \footnote{This is an example. Some people do not build +package locally and entirely work inside chroots.} \subsection{Development structure} diff --git a/debian/changelog b/debian/changelog index 651bc2f..202cd78 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,7 +7,8 @@ pbuilder (0.167) UNRELEASED; urgency=low [ Loic Minier ] * Tune aptitude opts in pbuilder-satisfydepends-aptitude to handle complex - dependencies in experimental and to support unsigned APT repositories. + dependencies in experimental, to support unsigned APT repositories, and to + not install Recommends. -- Junichi Uekawa <dancer@debian.org> Sat, 5 May 2007 19:25:12 +0900 diff --git a/pbuilder-satisfydepends-aptitude b/pbuilder-satisfydepends-aptitude index af08796..5ae27e8 100755 --- a/pbuilder-satisfydepends-aptitude +++ b/pbuilder-satisfydepends-aptitude @@ -86,7 +86,7 @@ EOF $CHROOTEXEC sh -c "dpkg-deb -b \"$BUILD_DEP_DEB_DIR/pbuilder-satisfydepends-dummy\"" $CHROOTEXEC apt-get -y --force-yes install aptitude $CHROOTEXEC dpkg -i "$BUILD_DEP_DEB_DIR/pbuilder-satisfydepends-dummy.deb" || true - $CHROOTEXEC aptitude -y -o Aptitude::CmdLine::Ignore-Trust-Violations=true -o Aptitude::ProblemResolver::StepScore=100 install pbuilder-satisfydepends-dummy + $CHROOTEXEC aptitude -y --without-recommends -o Aptitude::CmdLine::Ignore-Trust-Violations=true -o Aptitude::ProblemResolver::StepScore=100 install pbuilder-satisfydepends-dummy # check whether the aptitude's resolver kept the package if ! $CHROOTEXEC dpkg -l pbuilder-satisfydepends-dummy 2>/dev/null | grep -q ^ii; then echo "Aptitude couldn't satisfy the build dependencies" |