tags 419472 + patch tags 509994 + patch tags 522336 + patch tags 530042 + patch tags 533921 + patch tags 540343 + patch thanks
Hi,
The following is the diff for my aegis 4.24-5.1 NMU.
diff -u aegis-4.24/debian/aegis.install aegis-4.24/debian/aegis.install
--- aegis-4.24/debian/aegis.install
+++ aegis-4.24/debian/aegis.install
@@ -118,6 +118,7 @@
usr/share/man/man1/aerpass.1
usr/share/man/man1/aerpu.1
usr/share/man/man1/aerrv.1
+usr/share/man/man1/aesvt.1
usr/share/man/man1/aesub.1
usr/share/man/man1/aesubunit.1
usr/share/man/man1/aet.1
diff -u aegis-4.24/debian/rules aegis-4.24/debian/rules
--- aegis-4.24/debian/rules
+++ aegis-4.24/debian/rules
@@ -16,20 +16,22 @@
clean::
#fixme
debconf-updatepo
- rm -f lib/en/LC_MESSAGES/*.mo
- rm -f lib/nl/LC_MESSAGES/*.mo
rm -f lib/de/LC_MESSAGES/*.mo
- rm -f lib/ru/LC_MESSAGES/*.mo
- rm -f lib/fr/LC_MESSAGES/*.mo
+ rm -f lib/en/LC_MESSAGES/*.mo
rm -f lib/es/LC_MESSAGES/*.mo
+ rm -f lib/fr/LC_MESSAGES/*.mo
+ rm -f lib/nl/LC_MESSAGES/*.mo
+ rm -f lib/pt_BR/LC_MESSAGES/*.mo
rm -f lib/ro/LC_MESSAGES/*.mo
+ rm -f lib/ru/LC_MESSAGES/*.mo
+ rm -f lib/vi/LC_MESSAGES/*.mo
rm -f debian/ae_diff2htm.1
# fix the makefile misses
rm -f common/libdir.cc
rm -f etc/compat.2.3
-
rm -f debian/stamp-test
+ rm -f script/aegis.cgi script/aegis.cgi.i
common-build-arch:: debian/stamp-test
debian/stamp-test: debian/stamp-makefile-build
@@ -58 +59,0 @@
-
diff -u aegis-4.24/debian/postinst aegis-4.24/debian/postinst
--- aegis-4.24/debian/postinst
+++ aegis-4.24/debian/postinst
@@ -5,15 +5,14 @@
# set permissions properly
# These files need to be 4755 root.root for aegis to work properly
-AEGIS_EXEC="/usr/bin/aegis /usr/bin/aeimport"
+AEGIS_EXEC="/usr/bin/aegis /usr/bin/aeimport /usr/bin/aelock"
# These files/dirs need to be 2755 sys.sys for aegis to work properly
AEGIS_SYS="/var/lib/aegis/"
for item in $AEGIS_EXEC; do
- chown root:root $item
- chmod 4755 $item
+ dpkg-statoverride --list "$item" || dpkg-statoverride --update --add root
root 4755 $item
done
@@ -25,8 +24,7 @@
FGID=`ls -ld $item | awk '{print $4}'`
test -g /var/lib/aegis/ && test $FUID = sys && test $FGID = sys
if [ ! $? = 0 ]; then
- chown sys:sys $item
- chmod 2755 $item
+ dpkg-statoverride --list $item || dpkg-statoverride --update --add
sys sys 2755 $item
fi
done
diff -u aegis-4.24/debian/control aegis-4.24/debian/control
--- aegis-4.24/debian/control
+++ aegis-4.24/debian/control
@@ -2,15 +2,15 @@
Section: devel
Priority: optional
Maintainer: Christian Meder <ch...@absolutegiganten.org>
-Build-Depends: debhelper (>= 5), bison, zlib1g-dev, groff, gettext, uuid-dev,
libcurl3-dev, perl, libmagic-dev, gawk, cdbs (>= 0.4.23-1.1), rcs, ed,
patchutils (>= 0.2.25), libxml2-dev, libbz2-dev, bzip2, po-debconf
-Standards-Version: 3.8.0
+Build-Depends: debhelper (>= 5), bison, zlib1g-dev, groff, gettext, uuid-dev,
libcurl4-gnutls-dev, perl, libmagic-dev, gawk, cdbs (>= 0.4.23-1.1), rcs, ed,
patchutils (>= 0.2.25), libxml2-dev, libbz2-dev, bzip2, po-debconf, cook,
fhist, subversion, cvs, cssc
+Standards-Version: 3.8.3
Homepage: http://aegis.sourceforge.net
Package: aegis
Architecture: any
Depends: ${shlibs:Depends}, debconf | debconf-2.0
Suggests: aegis-doc (>> 4), aegis-tk (>> 4), aegis-web(>> 4)
-Recommends: fhist | rcs | cssc, cook | make | cake
+Recommends: fhist | rcs | cssc, cook | make
Replaces: aegis3
Conflicts: aegis3
Description: transaction-based software configuration management
@@ -62,7 +62,7 @@
Package: aegis-web
Architecture: any
-Depends: ${shlibs:Depends}, aegis, apache | httpd
+Depends: ${shlibs:Depends}, aegis, apache2 | httpd-cgi
Replaces: aegis3-web, aegis (<< 4.10)
Conflicts: aegis3-web
Description: aegis web based user interface
diff -u aegis-4.24/debian/aegis-tk.install aegis-4.24/debian/aegis-tk.install
--- aegis-4.24/debian/aegis-tk.install
+++ aegis-4.24/debian/aegis-tk.install
@@ -7,4 +7,5 @@
usr/share/man/man1/aebuffy.1
usr/share/man/man1/aecomp.1
+usr/share/man/man1/aexver.1
usr/share/aegis/wish
diff -u aegis-4.24/debian/changelog aegis-4.24/debian/changelog
--- aegis-4.24/debian/changelog
+++ aegis-4.24/debian/changelog
@@ -1,3 +1,27 @@
+aegis (4.24-5.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * FTBFS: test failure fixed (Closes: #533921)
+ * FTBFS under pbuilder even building as non-root fixed (Closes: #419472)
+ * bashism in /bin/sh script fixed (Closes: #530042)
+ * [INTL:es] Spanish debconf template translation for aegis (Closes:
+ #509994)
+ * debian/control
+ + BuildDepends on libcurl4-gnutls-dev to avoid a GPL violation
+ (Closes: #522336)
+ + dependency (apache) does not exists (Closes: #540343)
+ + removed cake from dependencies as it's not available.
+ + added fhist, cook, cvs, subversion, cssc to BuildDepends in order to have
+ more test run.
+ * debian/postinst: aelock is now installed suid root.
+ * debian/aegis.install: install aesvt man page.
+ * debian/aegis-web.install: install aexver man page.
+ * added lintian-overrides for man pages warning.
+ * fix sccs test test/01/t0127a.sh.
+ * added patch to remove thigs left over by make clean.
+
+ -- Walter Franzini <walter.franz...@gmail.com> Sat, 26 Sep 2009 14:30:43
+0200
+
aegis (4.24-5) unstable; urgency=low
* Fix pending l10n issues, thanks to Christian Perrier.
@@ -418 +441,0 @@
-
diff -u aegis-4.24/debian/po/es.po aegis-4.24/debian/po/es.po
--- aegis-4.24/debian/po/es.po
+++ aegis-4.24/debian/po/es.po
@@ -2,117 +2,83 @@
-# Copyright (C) 2005 Software in the Public Interest
+# Copyright (C) 2005, 2008 Software in the Public Interest
# This file is distributed under the same license as the aegis package.
#
# Changes:
-# - Initial translation
-# César Gómez Martín <cesar.go...@gmail.com>
+# - Initial translation
+# César Gómez Martín <cesar.go...@gmail.com>, 2005
#
+# - Updates
+# Francisco Javier Cuadrado <fcocuadr...@gmail.com>, 2008
+#
+#
+# Traductores, si no conoce el formato PO, merece la pena leer la
+# documentación de gettext, especialmente las secciones dedicadas a este
+# formato, por ejemplo ejecutando:
+# info -n '(gettext)PO Files'
+# info -n '(gettext)Header Entry'
#
-# Traductores, si no conoce el formato PO, merece la pena leer la
-# documentación de gettext, especialmente las secciones dedicadas a este
-# formato, por ejemplo ejecutando:
-# info -n '(gettext)PO Files'
-# info -n '(gettext)Header Entry'
# Equipo de traducción al español, por favor, lean antes de traducir
# los siguientes documentos:
#
-# - El proyecto de traducción de Debian al español
-# http://www.debian.org/intl/spanish/
-# especialmente las notas de traducción en
-# http://www.debian.org/intl/spanish/notas
-#
-# - La guía de traducción de po's de debconf:
-# /usr/share/doc/po-debconf/README-trans
-# o http://www.debian.org/intl/l10n/po-debconf/README-trans
+# - El proyecto de traducción de Debian al español
+# http://www.debian.org/intl/spanish/
+# especialmente las notas de traducción en
+# http://www.debian.org/intl/spanish/notas
+#
+# - La guía de traducción de po's de debconf:
+# /usr/share/doc/po-debconf/README-trans
+# o http://www.debian.org/intl/l10n/po-debconf/README-trans
#
msgid ""
msgstr ""
-"Project-Id-Version: aegis\n"
+"Project-Id-Version: aegis 4.24-5\n"
"Report-Msgid-Bugs-To: ae...@packages.debian.org\n"
"POT-Creation-Date: 2008-06-14 22:02+0200\n"
-"PO-Revision-Date: 2005-10-03 18:28+0100\n"
-"Last-Translator: César Gómez Martín <cesar.go...@gmail.com>\n"
+"PO-Revision-Date: 2008-12-18 19:59+0100\n"
+"Last-Translator: Francisco Javier Cuadrado <fcocuadr...@gmail.com>\n"
"Language-Team: Debian l10n spanish <debian-l10n-span...@lists.debian.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-Language: Spanish\n"
-"X-Poedit-Country: SPAIN\n"
-"X-Poedit-SourceCharset: utf-8\n"
#. Type: note
#. Description
#: ../aegis.templates:1001
-#, fuzzy
-#| msgid "/var/lib/aegis is not on a local drive."
msgid "/var/lib/aegis not on a local drive"
-msgstr "/var/lib/aegis no está en una unidad de disco local."
+msgstr "«/var/lib/aegis» no está en una unidad de disco local"
#. Type: note
#. Description
#. Type: note
#. Description
-#: ../aegis.templates:1001 ../aegis.templates:2001
-msgid ""
-"Aegis requires that /var/lib/aegis be owned by sys.sys and be set-gid, and "
-"group writable."
-msgstr ""
-"Para que Aegis funcione correctamente es necesario que el directorio /var/"
-"lib/aegis pertenezca al usuario «sys» y grupo «sys», tenga el bit «setgid» y "
-"pueda ser escrito por los miembros del grupo."
+#: ../aegis.templates:1001
+#: ../aegis.templates:2001
+msgid "Aegis requires that /var/lib/aegis be owned by sys.sys and be set-gid,
and group writable."
+msgstr "Aegis necesita que el propietario del directorio «/var/lib/aegis» sea
«sys.sys» y tenga activado el bit «set-gid», y el grupo tenga permisos de
escritura."
#. Type: note
#. Description
#: ../aegis.templates:1001
-#, fuzzy
-#| msgid ""
-#| "Your /var/lib/aegis is on a remote partition, most likely an NFS server. "
-#| "This could cause the postinst to fail, since we may not have permission "
-#| "to change the owner/permissions of the directory on the remote server."
-msgid ""
-"Your /var/lib/aegis is on a remote partition, most likely an NFS server. "
-"This could cause the postinst to fail, since the script may not have "
-"permission to change the owner/permissions of the directory on the remote "
-"server."
-msgstr ""
-"Su directorio /var/lib/aegis está en una partición remota, lo más probable "
-"es que esté en un servidor NFS. Esto puede causar fallos en la "
-"postinstalación, ya que podemos no tener permisos para cambiar el "
-"propietario o los permisos referentes al directorio del servidor remoto."
+msgid "Your /var/lib/aegis is on a remote partition, most likely an NFS
server. This could cause the postinst to fail, since the script may not have
permission to change the owner/permissions of the directory on the remote
server."
+msgstr "Su directorio «/var/lib/aegis» está en una partición remota,
posiblemente en un servidor NFS. Esto puede causar que la postinstalación
falle, ya que el script puede que no tenga permisos para cambiar el propietario
y/o los permisos del directorio en el servidor remoto."
#. Type: note
#. Description
#. Type: note
#. Description
-#: ../aegis.templates:1001 ../aegis.templates:2001
-msgid ""
-"If this happens, change the permissions on the NFS server, or ask the server "
-"administrator to do it for you."
-msgstr ""
-"Cambie los permisos del servidor NFS si esto ocurre, o pídale al "
-"administrador del servidor que los cambie por usted."
+#: ../aegis.templates:1001
+#: ../aegis.templates:2001
+msgid "If this happens, change the permissions on the NFS server, or ask the
server administrator to do it for you."
+msgstr "Si esto ocurre, cambie los permisos del servidor NFS, o pídale al
administrador del servidor que los cambie por usted."
#. Type: note
#. Description
#: ../aegis.templates:2001
-#, fuzzy
-#| msgid "/var/lib is not on a local drive."
msgid "/var/lib not on a local drive"
-msgstr "/var/lib no está en una unidad de disco local."
+msgstr "«/var/lib» no está en una unidad de disco local"
#. Type: note
#. Description
#: ../aegis.templates:2001
-#, fuzzy
-#| msgid ""
-#| "Your /var/lib is on a remote partition, most likely an NFS server. This "
-#| "could cause the postinst to fail, since we may not have permission to "
-#| "change the owner/permissions of the directory on the remote server."
-msgid ""
-"Your /var/lib is on a remote partition, most likely an NFS server. This "
-"could cause the postinst to fail, since the script may not have permission "
-"to change the owner/permissions of the directory on the remote server."
-msgstr ""
-"Su directorio /var/lib está en una partición remota, lo más probable es que "
-"esté en un servidor NFS. Esto puede causar fallos en la postinstalación, ya "
-"que podemos no tener permisos para cambiar el propietario o los permisos "
-"referentes al directorio del servidor remoto."
+msgid "Your /var/lib is on a remote partition, most likely an NFS server. This
could cause the postinst to fail, since the script may not have permission to
change the owner/permissions of the directory on the remote server."
+msgstr "Su directorio «/var/lib» está en una partición remota, posiblemente en
un servidor NFS. Esto puede causar que la postinstalación falle, ya que el
script puede que no tenga permisos para cambiar el propietario y/o los permisos
del directorio en el servidor remoto."
+
only in patch2:
unchanged:
--- aegis-4.24.orig/debian/aegis.lintian-overrides
+++ aegis-4.24/debian/aegis.lintian-overrides
@@ -0,0 +1,3 @@
+aegis binary: manpage-has-bad-whatis-entry
+aegis binary: manpage-has-errors-from-man
+aegis binary: manpage-section-mismatch usr/share/man/man1/aelic.1.gz
only in patch2:
unchanged:
--- aegis-4.24.orig/debian/aegis-web.lintian-overrides
+++ aegis-4.24/debian/aegis-web.lintian-overrides
@@ -0,0 +1 @@
+aegis-web: manpage-has-errors-from-man
only in patch2:
unchanged:
--- aegis-4.24.orig/debian/aegis-tk.lintian-overrides
+++ aegis-4.24/debian/aegis-tk.lintian-overrides
@@ -0,0 +1 @@
+aegis-tk: manpage-has-errors-from-man
only in patch2:
unchanged:
--- aegis-4.24.orig/debian/patches/12_fix_533921.patch
+++ aegis-4.24/debian/patches/12_fix_533921.patch
@@ -0,0 +1,16 @@
+Index: test/02/t0228a-matt.sh
+--- test/02/t0228a-matt.sh
++++ test/02/t0228a-matt.sh
+@@ -135,7 +135,11 @@
+ $bin/test_base64 -nh -uu -i rss.gif.uue icon/rss.gif
+ if test $? -ne 0 ; then fail; fi
+
+-echo "Content-Type: image/gif" > rss.expected.gif
++#
++# We need to invoke file here because the behaviour of libmagic change
++# with versions and we need to replicate it exactly to have the test pass.
++#
++echo "Content-Type:" `file -ib icon/rss.gif` > rss.expected.gif
+ echo "Content-Length: 360" >> rss.expected.gif
+ echo >> rss.expected.gif
+ cat icon/rss.gif >> rss.expected.gif
only in patch2:
unchanged:
--- aegis-4.24.orig/debian/patches/12_makefile-clean.patch
+++ aegis-4.24/debian/patches/12_makefile-clean.patch
@@ -0,0 +1,36 @@
+--- aegis-4.24/Makefile.in 2009-09-25 23:29:38.000000000 +0200
++++ /tmp/Makefile.in 2009-09-26 14:26:17.312649153 +0200
+@@ -37044,6 +37044,24 @@
+ rm -f libaegis/xmltextread.$(OBJEXT)
+ rm -f libaegis/xmltextread/by_node.$(OBJEXT)
+ rm -f libaegis/zero.$(OBJEXT)
++ rm -f script/ae-cvs-ci
++ rm -f script/ae-sccs-put
++ rm -f script/ae-symlinks
++ rm -f script/ae_diff2htm
++ rm -f script/aebisect
++ rm -f script/aebuffy
++ rm -f script/aecomp
++ rm -f script/aeedit
++ rm -f script/aeget.instal
++ rm -f script/aeintegratq
++ rm -f script/aexver
++ rm -f script/test_funcs
++ rm -f script/tkaeca
++ rm -f script/tkaegis
++ rm -f script/tkaenc
++ rm -f script/tkaepa
++ rm -f script/tkaer
++ rm -f script/xaegis
+ rm -f test/00/t0000a-pmil.ES
+ rm -f test/00/t0001a.ES
+ rm -f test/00/t0002a-jerr.ES
+@@ -37504,7 +37522,7 @@
+ @touch $@
+
+ distclean: clean
+- rm -f config.status config.log config.cache
++ rm -f config.status config.status.lineno config.log config.cache
+ rm -f Makefile common/config.h etc/Howto.conf
+ rm -f lib/cshrc lib/profile etc/libdir.so
+
only in patch2:
unchanged:
--- aegis-4.24.orig/debian/patches/12_fix_530042.patch
+++ aegis-4.24/debian/patches/12_fix_530042.patch
@@ -0,0 +1,12 @@
+Index: script/ae_diff2htm.in
+--- script/ae_diff2htm.in
++++ script/ae_diff2htm.in
+@@ -43,7 +43,7 @@
+ #
+ # The command line should have two file names on it, diff them and output
HTML.
+ #
+-if [ "$have_diff2html" == "yes" ]
++if test "$have_diff2html" = "yes"
+ then
+ diff2html "$@"
+ else
only in patch2:
unchanged:
--- aegis-4.24.orig/debian/patches/12_fix-t127.patch
+++ aegis-4.24/debian/patches/12_fix-t127.patch
@@ -0,0 +1,206 @@
+MIME-Version: 1.0
+Content-Type: application/aegis-patch
+Subject: aegis.4.24 - t0127a.sh fixed/improved
+Content-Name: aegis.4.24.C543.patch
+Content-Disposition: attachment; filename=aegis.4.24.C543.patch
+X-Aegis-Project-Name: aegis.4.24
+X-Aegis-Change-Number: 543
+
+#
+# The t0127a.sh test script as been improved:
+# * a typo (syntax error) in an sccs file has been fixed;
+# * added the changes in the history.
+#
+# Signed-off-by: Walter Franzini <walter.franz...@gmail.org>
+#
+# Aegis-Change-Set-Begin
+# QlpoMzFBWSZTWUyIWDsAAMBfgAAQUHf//0UgDo6/79/6QAH92l05qhoRGjSn6JP0k8RmpNBs
+# p6n6oADQeoGkTFHqeE1PSGgAAAAADQiMQFMmmjTIGgADQBpoAEppIp+VHtT1Ro8pk9RppkAN
+# AaAYTO2NlJsQ2wEzHSQThWzGn08NDaDS7JB9p059ZpAUb6gZ7Iuy1AmY1ATFLOsoQ5yon1Lz
+# tHY9rBagAjvB/AcJzxGTfY1fKglnJNjo6acrJ2Jq6sMllG2Z2b4rWA2tEsbAg4SWtvfa4xzH
+# beaEzPdXGEzZCuKG02gkwC9YAs3g4Y6IoK4qcQ3GySRjSQEkRJRilBpQqcEICqXoVONgwLWX
+# ADOKtZlTByDl3nO2u4Xlem7Y5nZ9aUDVxVoSwGduQieRszhoRI2Ck3PebMsZ2YhggtGOdD1s
+# mST5GC6WgxW3nByaOpeN3naJYGZGlW/beYolfmaBmtksFrjBaIMLr4zMDCuDw8r66Q1ZElhM
+# 56oSHdI2OxNpjLHmqtgauJ0Wlg201PLoVhzitWqmIybvIi+zLTaVwg2GbZ5zOF7Va4t9QapN
+# RBDbgi0GvZ3K3/gqefKcSgbyiiR7OQLM1yAKzKt3TTsJKDaGk4xNJ6jUOsojE7hlPOS5YEdC
+# iM8KqyYxx7pblzUpEBYdkQrbjsv4KsogVDBQhGQpl5w5ogyIpqDAZgDicGpmBw8xTCJk0GpQ
+# CSWuxLK0TA/xdyRThQkEyIWDsA==
+# Aegis-Change-Set-End
+#
+Index: test/01/t0127a.sh
+--- test/01/t0127a.sh
++++ test/01/t0127a.sh
+@@ -2,6 +2,7 @@
+ #
+ # aegis - project change supervisor
+ # Copyright (C) 2001-2008 Peter Miller
++# Copyright (C) 2008 Walter Franzini
+ #
+ # This program is free software; you can redistribute it and/or modify
+ # it under the terms of the GNU General Public License as published by
+@@ -34,8 +35,8 @@
+ :
+ else
+ echo ''
+- echo ' The "sccs" program is not in your command search PATH.'
+- echo ' This test is therefore -assumed- to pass.'
++ echo ' The "sccs" program is not in your command search PATH.'
++ echo ' This test is therefore -assumed- to pass.'
+ echo ''
+ exit 0
+ fi
+@@ -150,8 +151,8 @@
+ mkdir src src/sub
+ if test $? -ne 0 ; then no_result; fi
+
+-activity="create sccs file 156"
+-$bin/test_base64 -qp -i - src/s.file1 << 'fubar'
++activity="create sccs file 154"
++$bin/test_base64 -qp -nh -i - src/s.file1 << 'fubar'
+ =01h10874
+ =01s 00001/00000/00001
+ =01d D 1.2 99/03/12 06:17:16 bogus2 2 1
+@@ -168,15 +169,15 @@
+ =01T
+ =01I 1
+ =01I 2
+-=01lah
++blah
+ =01E 2
+ This is file 1.
+ =01E 1
+ fubar
+ if test $? -ne 0 ; then no_result; fi
+
+-activity="create sccs file 181"
+-$bin/test_base64 -qp -i - src/sub/s.file2 << 'fubar'
++activity="create sccs file 179"
++$bin/test_base64 -qp -nh -i - src/sub/s.file2 << 'fubar'
+ =01h11284
+ =01s 00001/00000/00001
+ =01d D 1.2 99/03/12 07:00:00 bogus1 2 1
+@@ -203,14 +204,14 @@
+ #
+ # now that all the RCS files exist, read it all in and fake the changes
+ #
+-activity="import 209"
++activity="import 207"
+ $bin/aeimport --format=sccs src -p example -dir $workproj -lib $worklib -v >
LOG 2>&1
+ if test $? -ne 0 ; then cat LOG; fail; fi
+
+ #
+ # Make sure the various state files are correct.
+ #
+-activity="check the state file 216"
++activity="check the state file 214"
+ cat > ok << 'fubar'
+ next_test_number = 1;
+ fubar
+@@ -218,7 +219,7 @@
+
+ check_it ok $workproj/info/state
+
+-activity="check cstate 224"
++activity="check cstate 222"
+ cat > ok << 'fubar'
+ brief_description = "The \"example\" program, branch 1.0.";
+ description = "The \"example\" program, branch 1.0.";
+@@ -317,7 +318,7 @@
+
+ check_it ok $workproj/info/change/0/001.branch/0/000
+
+-activity="check fstate 322"
++activity="check fstate 333"
+ cat > ok << 'fubar'
+ src =
+ [
+@@ -408,7 +409,7 @@
+
+ check_it ok $workproj/info/change/0/001.branch/0/000.fs
+
+-activity="check cstate 413"
++activity="check cstate 424"
+ cat > ok << 'fubar'
+ brief_description = "aegis.conf file";
+ description = "Initial project `aegis.conf' file.";
+@@ -466,7 +467,7 @@
+
+ check_it ok $workproj/info/change/0/001.branch/0/000.branch/0/010
+
+-activity="check fstate 471"
++activity="check fstate 482"
+ cat > ok << 'fubar'
+ src =
+ [
+@@ -486,7 +487,7 @@
+
+ check_it ok $workproj/info/change/0/001.branch/0/000.branch/0/010.fs
+
+-activity="check cstate 491"
++activity="check cstate 502"
+ cat > ok << 'fubar'
+ brief_description = "first";
+ description = "first";
+@@ -544,7 +545,7 @@
+
+ check_it ok $workproj/info/change/0/001.branch/0/000.branch/0/011
+
+-activity="check fstate 549"
++activity="check fstate 560"
+ cat > ok << 'fubar'
+ src =
+ [
+@@ -564,7 +565,7 @@
+
+ check_it ok $workproj/info/change/0/001.branch/0/000.branch/0/011.fs
+
+-activity="check cstate 569"
++activity="check cstate 580"
+ cat > ok << 'fubar'
+ brief_description = "second";
+ description = "second";
+@@ -622,7 +623,7 @@
+
+ check_it ok $workproj/info/change/0/001.branch/0/000.branch/0/012
+
+-activity="check fstate 627"
++activity="check fstate 638"
+ cat > ok << 'fubar'
+ src =
+ [
+@@ -652,7 +653,7 @@
+
+ check_it ok $workproj/info/change/0/001.branch/0/000.branch/0/012.fs
+
+-activity="check cstate 657"
++activity="check cstate 668"
+ cat > ok << 'fubar'
+ brief_description = "third";
+ description = "third";
+@@ -710,7 +711,7 @@
+
+ check_it ok $workproj/info/change/0/001.branch/0/000.branch/0/013
+
+-activity="check fstate 715"
++activity="check fstate 726"
+ cat > ok << 'fubar'
+ src =
+ [
+@@ -730,7 +731,7 @@
+
+ check_it ok $workproj/info/change/0/001.branch/0/000.branch/0/013.fs
+
+-activity="check file 735"
++activity="check file 746"
+ cat > ok << 'fubar'
+ blah
+ This is file 1.
+@@ -740,7 +741,7 @@
+ diff ok $workproj/branch.1/branch.0/baseline/file1
+ if test $? -ne 0 ; then fail; fi
+
+-activity="check file 745"
++activity="check file 756"
+ cat > ok << 'fubar'
+ blah blah
+ This is file 2.
only in patch2:
unchanged:
--- aegis-4.24.orig/debian/patches/12_fix_419472.patch
+++ aegis-4.24/debian/patches/12_fix_419472.patch
@@ -0,0 +1,56 @@
+MIME-Version: 1.0
+Content-Type: application/aegis-patch
+Subject: aegis.4.24 - Fixed testsuite vs. Debian pbuilder
+Content-Name: aegis.4.24.C601.patch
+Content-Disposition: attachment; filename=aegis.4.24.C601.patch
+X-Aegis-Project-Name: aegis.4.24
+X-Aegis-Change-Number: 601
+
+#
+# This change-set modify the etc/test.sh script in order to make the
+# test-suite to be run under the proper user by means of Debian
+# pbuilder.
+#
+# Signed-off-by: Walter Franzini <walter.franz...@gmail.com>
+#
+# Aegis-Change-Set-Begin
+# QlpoMzFBWSZTWfc/hkcAAJtfgAAQUAf//0UgDo6/79/6QAHdzuDtA1NTI1T2U9NJpmkxTZqe
+# iagaNADyBqaJo1PT1Taj0ag0aADQAAARNMhqaIA0A09QYQA0AASmpqZTQ2iamyQyGgPU0aAN
+# A02u8US5jeyGOkeDRYNuGzYvURBBueEDNt+ejJ8PuQwRnxZMepoVmuR0RAJg1ZShCc0ipdAU
+# Ur8oiuBPAK5+7A1g6wMsttwkGNSPRYPOqSOnq2gqDSqJrxEVjGh3jUdZkwplqOxKymYnSQKO
+# AbVO6XokJJKey1rREQpQgD8y6HCC+eZ4moQMQXgQXhW08xEng5dqqX7tClDPtGgQZwzbkGbZ
+# nuvg+79jrHJgVH/idNk7RnLWtcgxl5Of3mPMF5lQifSXZAUtLmKUvMUTcbxeWkYyT5ce7dcp
+# aRJRtm9AnWOFrl5SGloRQOJA4IJiMZF8I7DHsoe2rKuk+GxESpILww6Y2DhdAj/xMrFW82qR
+# ULVgrQWrEDe6FMGdQRp1mzUF9S4lck1xBnRy12Oy6kSaLYomP+KKKtXWnksqpQsaLQzg6HSA
+# HRCPK+Cg8VpNDUOAEGsY8p530xPQ1ylomnqwqopIZ9ENGstxW0syUaqweTcc4A5ky1kzCe8r
+# 0pwlMzuWaYFdVTZmvsERHlfOl5OFr0f9lAS5ErikbgLuSKcKEh7n8Mjg
+# Aegis-Change-Set-End
+#
+Index: etc/test.sh
+--- etc/test.sh
++++ etc/test.sh
+@@ -2,7 +2,7 @@
+ #
+ # aegis - project change supervisor
+ # Copyright (C) 1995, 1997, 2006-2008 Peter Miller
+-# Copyright (C) 2006 Walter Franzini
++# Copyright (C) 2006, 2009 Walter Franzini
+ #
+ # This program is free software; you can redistribute it and/or modify
+ # it under the terms of the GNU General Public License as published by
+@@ -22,9 +22,12 @@
+ progname=$0
+ shell=/bin/sh
+
+- # Get user name in a portable way
+-whoami=${USER:-${LOGNAME:-`id | cut -d'(' -f2 | cut -d')' -f1`}}
+- # Must set path so that test_funcs may be loaded correctly
++# Get user name in a portable way.
++# We use the id command to avoid strangeness in the way Debian's pbuilder
++# sets environment variables (see Debian Bug#393624 for more info).
++whoami=`id | cut -d'(' -f2 | cut -d')' -f1`
++USER=$whoami
++# Must set path so that test_funcs may be loaded correctly
+ newbin=`pwd`/bin
+ PATH=$newbin:$PATH
+ export PATH
--
Walter Franzini
http://aegis.stepbuild.org/
pgpRUftsZiOHO.pgp
Description: PGP signature
