Romain Beauxis <[EMAIL PROTECTED]> writes:
> Le Friday 16 May 2008 14:35:27 Goswin von Brederlow, vous avez écrit :
>> Still looking for a sponsor.
>>
>> This package fixes bugs present in the package in NEW and I would
>> really like to get it uploaded before the old one gets rejected due to
>> those bugs.
>
> Could you provide a diff with previous uploaded version ?
>
> Romain
svn.debian.org pkg-ia32-libs has them tagged:
diff -Nurd 8/debian/changelog 10/debian/changelog
--- 8/debian/changelog 2008-05-12 12:07:43.000000000 +0200
+++ 10/debian/changelog 2008-05-14 02:28:34.000000000 +0200
@@ -1,3 +1,22 @@
+ia32-libs-tools (10) unstable; urgency=low
+
+ * apt-update: switch wget to timestamping mode. -c never deletes the
+ old file.
+ * ia32-archive: Add depends on wget.
+
+ -- Goswin von Brederlow <[EMAIL PROTECTED]> Wed, 14 May 2008 02:03:17 +0200
+
+ia32-libs-tools (9) unstable; urgency=low
+
+ * apt-update: fix version striping to ~N scheme.
+ * apt-update: fix packages.list grep pattern
+ * apt-update: fix non-root use detection
+ * apt-update: Check binary version matches expected source version
+ * ia32-archive: default to building all known packages.
+ * rename.list: Add xaw3d*
+
+ -- Goswin von Brederlow <[EMAIL PROTECTED]> Mon, 12 May 2008 23:30:49 +0200
+
ia32-libs-tools (8) unstable; urgency=low
* Add ia32-apt-get package.
diff -Nurd 8/debian/control 10/debian/control
--- 8/debian/control 2008-05-12 12:07:43.000000000 +0200
+++ 10/debian/control 2008-05-14 02:28:34.000000000 +0200
@@ -18,7 +18,7 @@
Package: ia32-archive
Architecture: all
-Depends: adduser, dctrl-tools | grep-dctrl, reprepro, ia32-libs-tools
+Depends: adduser, dctrl-tools | grep-dctrl, reprepro, ia32-libs-tools, wget
Description: Create a local archive of converted i386 debs for amd64 and ia64
On amd64 and ia64 the kernel is capable of executing i386
binaries. For that to work with dynamically linked binaries the
diff -Nurd 8/debian/ia32-apt-get.dirs 10/debian/ia32-apt-get.dirs
--- 8/debian/ia32-apt-get.dirs 2008-05-12 12:07:43.000000000 +0200
+++ 10/debian/ia32-apt-get.dirs 2008-05-14 02:28:34.000000000 +0200
@@ -1,7 +1,6 @@
etc/apt/foreign/sources.list.d
etc/apt/native/sources.list.d
usr/bin
-usr/lib/ia32-apt-get
usr/share/lintian/overrides
var/cache/apt/foreign/archives/partial
var/cache/apt/native/archives/partial
diff -Nurd 8/debian/ia32-archive.TODO 10/debian/ia32-archive.TODO
--- 8/debian/ia32-archive.TODO 2008-05-12 12:07:43.000000000 +0200
+++ 10/debian/ia32-archive.TODO 2008-05-14 02:28:34.000000000 +0200
@@ -1 +1,2 @@
- Add dependencies for sources listed in /etc/ia32-archive/sources.filter
+- Use apt to download and verify Sources.gz files
diff -Nurd 8/ia32-archive/bin/.svn/text-base/apt-update.svn-base
10/ia32-archive/bin/.svn/text-base/apt-update.svn-base
--- 8/ia32-archive/bin/.svn/text-base/apt-update.svn-base 2008-05-12
12:07:43.000000000 +0200
+++ 10/ia32-archive/bin/.svn/text-base/apt-update.svn-base 2008-05-14
02:28:34.000000000 +0200
@@ -4,7 +4,7 @@
# 'src ver' pair, one per line.
# Make sure we run as ia32-archive user
-if ! [ "x$USER" = "xia32-archive" ]; then
+if [ "x$USER" = "xroot" ]; then
exec su - ia32-archive -c "$0 --was-root $@"
fi
@@ -30,7 +30,12 @@
# Fetch new index files from server
for SUITE in $SUITES; do
echo "Get: $URL $DIST/$SUITE Sources"
- wget -q -c -O "$TMPDIR/${DIST}_${SUITE}_Sources.gz"
"$URL/$REMOTE_DIR/dists/$DIST/$SUITE/source/Sources.gz"
+ (
+ cd "$TMPDIR"
+ cp -a "$TMPDIR/${DIST}_${SUITE}_Sources.gz" Sources.gz
+ wget -q -N "$URL/$REMOTE_DIR/dists/$DIST/$SUITE/source/Sources.gz"
+ mv Sources.gz "$TMPDIR/${DIST}_${SUITE}_Sources.gz"
+ )
done
sed -e 's/^/^/' -e 's/$/ /' "$SRC_FILTER" > "$TMPDIR/sources.filter"
@@ -49,7 +54,7 @@
fi
fi
PKG=${PKG##ia32-}
- PVER=${PVER%+*}
+ PVER=${PVER%~*}
echo "$PKG $PVER "
done | sort -u > "$TMPDIR/binary.list"
@@ -59,13 +64,18 @@
echo "Convert: $SRC $VER"
rm -rf "$TMPDIR/$SRC"
mkdir "$TMPDIR/$SRC"
- ( set -ex
+ ( set -e
cd "$TMPDIR/$SRC"
- grep "^ia32-$SRC\>" "$PKG_FILTER" \
+ grep "^ia32-$SRC[[:space:]]" "$PKG_FILTER" \
| while read IA32SRC PKGS; do
mkdir "$IA32SRC"
cd "$IA32SRC"
- /usr/lib/ia32-libs-tools/create $PKGS
+ /usr/lib/ia32-libs-tools/create $PKGS || exit 1
+ if ! [ -f ${SRC}_$VER.dsc ]; then
+ echo
+ echo "Error: Binary / source version mismatch, aborting."
+ exit 1
+ fi
if grep -q "Architecture: amd64" debian/control; then
dpkg-buildpackage -us -uc -sa
else
@@ -74,9 +84,16 @@
cd ..
done
reprepro -b "$HOMEDIR" include $DIST *.changes
- ) > "$LOGDIR/$SRC.log" 2>&1 \
- && rm -rf "$TMPDIR/$SRC" \
- || echo "Error converting $SRC $VER, see $LOGDIR/$SRC.log for details"
+ ) > "$LOGDIR/$SRC.log" 2>&1
+ if [ $? = 0 ]; then
+ rm -rf "$TMPDIR/$SRC"
+ else
+ if [ -f "$TMPDIR/$SRC/${SRC}_$VER.dsc" ]; then
+ echo "Error converting $SRC $VER, see $LOGDIR/$SRC.log for details"
+ else
+ echo "Error: Binary / source version mismatch, skipping."
+ fi
+ fi
done
exit 0
diff -Nurd 8/ia32-archive/bin/apt-update 10/ia32-archive/bin/apt-update
--- 8/ia32-archive/bin/apt-update 2008-05-12 12:07:43.000000000 +0200
+++ 10/ia32-archive/bin/apt-update 2008-05-14 02:28:34.000000000 +0200
@@ -4,7 +4,7 @@
# 'src ver' pair, one per line.
# Make sure we run as ia32-archive user
-if ! [ "x$USER" = "xia32-archive" ]; then
+if [ "x$USER" = "xroot" ]; then
exec su - ia32-archive -c "$0 --was-root $@"
fi
@@ -30,7 +30,12 @@
# Fetch new index files from server
for SUITE in $SUITES; do
echo "Get: $URL $DIST/$SUITE Sources"
- wget -q -c -O "$TMPDIR/${DIST}_${SUITE}_Sources.gz"
"$URL/$REMOTE_DIR/dists/$DIST/$SUITE/source/Sources.gz"
+ (
+ cd "$TMPDIR"
+ cp -a "$TMPDIR/${DIST}_${SUITE}_Sources.gz" Sources.gz
+ wget -q -N "$URL/$REMOTE_DIR/dists/$DIST/$SUITE/source/Sources.gz"
+ mv Sources.gz "$TMPDIR/${DIST}_${SUITE}_Sources.gz"
+ )
done
sed -e 's/^/^/' -e 's/$/ /' "$SRC_FILTER" > "$TMPDIR/sources.filter"
@@ -49,7 +54,7 @@
fi
fi
PKG=${PKG##ia32-}
- PVER=${PVER%+*}
+ PVER=${PVER%~*}
echo "$PKG $PVER "
done | sort -u > "$TMPDIR/binary.list"
@@ -59,13 +64,18 @@
echo "Convert: $SRC $VER"
rm -rf "$TMPDIR/$SRC"
mkdir "$TMPDIR/$SRC"
- ( set -ex
+ ( set -e
cd "$TMPDIR/$SRC"
- grep "^ia32-$SRC\>" "$PKG_FILTER" \
+ grep "^ia32-$SRC[[:space:]]" "$PKG_FILTER" \
| while read IA32SRC PKGS; do
mkdir "$IA32SRC"
cd "$IA32SRC"
- /usr/lib/ia32-libs-tools/create $PKGS
+ /usr/lib/ia32-libs-tools/create $PKGS || exit 1
+ if ! [ -f ${SRC}_$VER.dsc ]; then
+ echo
+ echo "Error: Binary / source version mismatch, aborting."
+ exit 1
+ fi
if grep -q "Architecture: amd64" debian/control; then
dpkg-buildpackage -us -uc -sa
else
@@ -74,9 +84,16 @@
cd ..
done
reprepro -b "$HOMEDIR" include $DIST *.changes
- ) > "$LOGDIR/$SRC.log" 2>&1 \
- && rm -rf "$TMPDIR/$SRC" \
- || echo "Error converting $SRC $VER, see $LOGDIR/$SRC.log for details"
+ ) > "$LOGDIR/$SRC.log" 2>&1
+ if [ $? = 0 ]; then
+ rm -rf "$TMPDIR/$SRC"
+ else
+ if [ -f "$TMPDIR/$SRC/${SRC}_$VER.dsc" ]; then
+ echo "Error converting $SRC $VER, see $LOGDIR/$SRC.log for details"
+ else
+ echo "Error: Binary / source version mismatch, skipping."
+ fi
+ fi
done
exit 0
diff -Nurd 8/ia32-archive/conf/sources.filter
10/ia32-archive/conf/sources.filter
--- 8/ia32-archive/conf/sources.filter 2008-05-12 12:07:43.000000000 +0200
+++ 10/ia32-archive/conf/sources.filter 2008-05-14 02:28:34.000000000 +0200
@@ -1,6 +1,141 @@
-glibc
-gcc-4.3
+acl
alsa-lib
+arts
+at-spi
+atk1.0
+attr
+audiofile
+cairo
+cdparanoia
+cupsys
+cyrus-sasl2
+db
+dbus
+directfb
+e2fsprogs
+esound
+expat
+fltk1.1
+fontconfig
+freeglut
+freetype
+fribidi
+fusionsound
+gail
+gcc-3.3
+gcc-4.3
+gconf
+giflib
+glib1.2
+glib2.0
+glibc
+gnutls13
+gnutls26
+gtk+1.2
+gtk+2.0
+gtk2-engines
+hal
+imlib
+isdnutils
+jack-audio-connection-kit
+keyutils
+krb5
+lcms
+lesstif2
+libaio
+libart-lgpl
+libasyncns
+libavc1394
+libbonobo
+libcaca
+libcap
+libcap2
+libdatrie
+libdrm
+libexif
+libfreebob
+libgcrypt11
+libglade2
+libgnomecanvas
+libgpg-error
+libgphoto2
+libice
+libidl
+libiec61883
+libieee1284
+libjpeg6b
+libnss-ldap
+libogg
+libpam-ldap
+libpng
+libraw1394
+libsdl1.2
+libselinux
+libsigc++-2.0
+libsm
+libtasn1-3
+libthai
+libtheora
+libtool
+libusb
+libwmf
+libx11
+libx86
+libxau
+libxaw
+libxcomposite
+libxcursor
+libxdamage
+libxdmcp
+libxext
+libxfixes
+libxi
+libxinerama
+libxml2
+libxmu
+libxp
+libxpm
+libxrandr
+libxrender
+libxslt
+libxss
+libxt
+libxtrap
+libxtst
+libxv
+libxvmc
+libxxf86dga
+libxxf86vm
+lirc
+lzo
+lzo2
+mesa
+mplayer
+nas
ncurses
+openal
+opencdk10
+openldap2.3
+openssl
+orbit2
+pam
+pango1.0
+pcre3
+pixman
+popt
+pulseaudio
+qt4-x11
+samba
+sane-backends
+sane-backends-extras
+slang2
+speex
+svgalib
+sysfsutils
+tiff
+tslib
+unixodbc
+wine
+xaw3d
+xft
zlib
-bzip2
diff -Nurd 8/ia32-libs-tools/packages.list 10/ia32-libs-tools/packages.list
--- 8/ia32-libs-tools/packages.list 2008-05-12 12:07:43.000000000 +0200
+++ 10/ia32-libs-tools/packages.list 2008-05-14 02:28:34.000000000 +0200
@@ -138,3 +138,5 @@
ia32-xaw3d xaw3dg
ia32-xft libxft2
ia32-zlib zlib1g
+ia32-wine wine wine-bin libwine-dbg libwine-dev libwine
libwine-alsa libwine-capi libwine-cms libwine-esd libwine-gl libwine-gphoto2
libwine-jack libwine-ldap libwine-nas libwine-oss libwine-print libwine-sane
libwine-twain wine-utils
+ia32-bzip2 bzip2 libbz2-1.0
diff -Nurd 8/ia32-libs-tools/rename.list 10/ia32-libs-tools/rename.list
--- 8/ia32-libs-tools/rename.list 2008-05-12 12:07:43.000000000 +0200
+++ 10/ia32-libs-tools/rename.list 2008-05-14 02:28:34.000000000 +0200
@@ -72,4 +72,5 @@
*-amd64* -
lib* +
xlib* +
+xaw3d* +
tetex-lib +
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
