[Pbuilder-maint] pbuilder CVS update: pbuilder
pbuilder-satisfydepends THANKS ChangeLog COPYING
pbuilder CVS Commit
pbuilder-maint at lists.alioth.debian.org
Mon May 15 12:46:57 UTC 2006
User: dancer
Date: 06/05/15 12:46:57
Modified: . pbuilder-satisfydepends THANKS ChangeLog COPYING
Log:
* Support for new style architecture specifications (closes: #363193)
Thanks to Peter Eisentraut for patch.
Revision Changes Path
1.26 +16 -3 pbuilder/pbuilder-satisfydepends
CVSWEB Options: -------------------
CVSWeb: Annotate this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/pbuilder-satisfydepends?annotate=1.26&cvsroot=
CVSWeb: View this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/pbuilder-satisfydepends?rev=1.26&content-type=text/x-cvsweb-markup&cvsroot=
CVSWeb: Diff to previous version: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/pbuilder-satisfydepends.diff?r1=1.26&r2=1.25&cvsroot=
-----------------------------------
Index: pbuilder-satisfydepends
===================================================================
RCS file: /cvsroot/pbuilder/pbuilder/pbuilder-satisfydepends,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- pbuilder-satisfydepends 14 May 2006 18:32:32 -0000 1.25
+++ pbuilder-satisfydepends 15 May 2006 12:46:56 -0000 1.26
@@ -40,16 +40,29 @@
return 1;
}
+function expand_arch () {
+ local ARCH="$1"
+ local EXPANDED_ARCH
+ if echo "$ARCH" | grep "-" > /dev/null; then
+ EXPANDED_ARCH=$ARCH
+ else
+ EXPANDED_ARCH="linux-$ARCH"
+ fi
+ local WC1=$(echo $EXPANDED_ARCH | sed 's/^[^-]*/any/')
+ local WC2=$(echo $EXPANDED_ARCH | sed 's/[^-]*$/any/')
+ echo "$ARCH\\|$EXPANDED_ARCH\\|$WC1\\|$WC2"
+}
+
function checkbuilddep_archdeps () {
# returns FALSE on INSTALL
local INSTALLPKG="$1"
local ARCH="$2"
- if echo "$INSTALLPKG" | sed 's/.*\(\[.*\]\)/\1/' | grep "[[/][!]$ARCH[]/]" > /dev/null; then
+ if echo "$INSTALLPKG" | sed 's/.*\(\[.*\]\)/\1/' | grep "[[/][!]\($(expand_arch $ARCH)\)[]/]" > /dev/null; then
# if !$ARCH exists in there, ERROR.
return 0;
fi
if ! echo "$INSTALLPKG" | sed 's/.*\(\[.*\]\)/\1/' | grep "[!]" > /dev/null; then
- if ! echo "$INSTALLPKG" | sed 's/.*\(\[.*\]\)/\1/' | grep "[[/]$ARCH[]/]" > /dev/null; then
+ if ! echo "$INSTALLPKG" | sed 's/.*\(\[.*\]\)/\1/' | grep "[[/]\($(expand_arch $ARCH)\)[]/]" > /dev/null; then
# if $ARCH does not exist, ERROR.
return 0;
fi
1.28 +1 -0 pbuilder/THANKS
CVSWEB Options: -------------------
CVSWeb: Annotate this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/THANKS?annotate=1.28&cvsroot=
CVSWeb: View this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/THANKS?rev=1.28&content-type=text/x-cvsweb-markup&cvsroot=
CVSWeb: Diff to previous version: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/THANKS.diff?r1=1.28&r2=1.27&cvsroot=
-----------------------------------
Index: THANKS
===================================================================
RCS file: /cvsroot/pbuilder/pbuilder/THANKS,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- THANKS 4 Mar 2005 04:49:42 -0000 1.27
+++ THANKS 15 May 2006 12:46:56 -0000 1.28
@@ -38,6 +38,7 @@
Mike Markley <mike at markley.org>
Era Eriksson <era at iki.fi>
Danilo Piazzalunga <danilopiazza at libero.it>
+Peter Eisentraut
I thank them all!
1.380 +6 -1 pbuilder/ChangeLog
CVSWEB Options: -------------------
CVSWeb: Annotate this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/ChangeLog?annotate=1.380&cvsroot=
CVSWeb: View this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/ChangeLog?rev=1.380&content-type=text/x-cvsweb-markup&cvsroot=
CVSWeb: Diff to previous version: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/ChangeLog.diff?r1=1.380&r2=1.379&cvsroot=
-----------------------------------
Index: ChangeLog
===================================================================
RCS file: /cvsroot/pbuilder/pbuilder/ChangeLog,v
retrieving revision 1.379
retrieving revision 1.380
diff -u -r1.379 -r1.380
--- ChangeLog 14 May 2006 18:32:33 -0000 1.379
+++ ChangeLog 15 May 2006 12:46:56 -0000 1.380
@@ -1,5 +1,10 @@
2006-05-15 Junichi Uekawa <dancer at debian.org>
+ * pbuilder-satisfydepends: add support for new dpkg-dev construct
+ for linux-any etc. patch by Peter Eisentraut.
+
+ * THANKS: update thanks text for a change.
+
* pbuilderrc.5: undocument the restriction that --buildresult
option needs to be specified for pdebuild, and BUILDRESULT cannot
be used.
1.2 +2 -2 pbuilder/COPYING
CVSWEB Options: -------------------
CVSWeb: Annotate this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/COPYING?annotate=1.2&cvsroot=
CVSWeb: View this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/COPYING?rev=1.2&content-type=text/x-cvsweb-markup&cvsroot=
CVSWeb: Diff to previous version: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/COPYING.diff?r1=1.2&r2=1.1&cvsroot=
-----------------------------------
Index: COPYING
===================================================================
RCS file: /cvsroot/pbuilder/pbuilder/COPYING,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- COPYING 27 Aug 2001 13:22:01 -0000 1.1
+++ COPYING 15 May 2006 12:46:56 -0000 1.2
@@ -2,7 +2,7 @@
Version 2, June 1991
Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
@@ -305,7 +305,7 @@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Also add information on how to contact you by electronic and paper mail.
More information about the Pbuilder-maint
mailing list