[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
r799 - in /crosshurd/trunk: debian/changelog dpkg-hurd functions makehur
From: |
sthibault |
Subject: |
r799 - in /crosshurd/trunk: debian/changelog dpkg-hurd functions makehurddir.sh native-install/native-install packages/gnu |
Date: |
Mon, 11 Aug 2014 20:57:16 -0000 |
Author: sthibault
Date: Mon Aug 11 20:57:16 2014
New Revision: 799
URL: http://svn.debian.org/wsvn/pkg-hurd/crosshurd/?sc=1&rev=799
Log:
* Switch from libparted0debian1 to libparted2 (Closes: Bug#757014).
* Use dpkg-deb instead of manually extracting packages and information
(Closes: Bug#757013).
Modified:
crosshurd/trunk/debian/changelog
crosshurd/trunk/dpkg-hurd
crosshurd/trunk/functions
crosshurd/trunk/makehurddir.sh
crosshurd/trunk/native-install/native-install
crosshurd/trunk/packages/gnu
Modified: crosshurd/trunk/debian/changelog
URL:
http://svn.debian.org/wsvn/pkg-hurd/crosshurd/crosshurd/trunk/debian/changelog?rev=799&op=diff
==============================================================================
--- crosshurd/trunk/debian/changelog (original)
+++ crosshurd/trunk/debian/changelog Mon Aug 11 20:57:16 2014
@@ -1,3 +1,12 @@
+crosshurd (1.7.47) UNRELEASED; urgency=medium
+
+ [ Guillem Jover ]
+ * Switch from libparted0debian1 to libparted2 (Closes: Bug#757014).
+ * Use dpkg-deb instead of manually extracting packages and information
+ (Closes: Bug#757013).
+
+ -- Samuel Thibault <address@hidden> Mon, 11 Aug 2014 22:55:09 +0200
+
crosshurd (1.7.46) unstable; urgency=medium
* Really extract gnumach kernel package (Closes: Bug#750980).
Modified: crosshurd/trunk/dpkg-hurd
URL:
http://svn.debian.org/wsvn/pkg-hurd/crosshurd/crosshurd/trunk/dpkg-hurd?rev=799&op=diff
==============================================================================
--- crosshurd/trunk/dpkg-hurd (original)
+++ crosshurd/trunk/dpkg-hurd Mon Aug 11 20:57:16 2014
@@ -77,7 +77,7 @@
action="${1}"
file="${2}"
- name=`dpkg --info ${file} | grep '^ Package:' - | sed -e "s/ Package:
//"`
+ name=`dpkg-deb --field ${file} Package`
[ -f ${file} ] || err "file \`${file}' does not exist"
@@ -100,7 +100,7 @@
done
# Now repack the file.
- dpkg --build temp_build/${name}
+ dpkg-deb --build temp_build/${name}
# Move old prerm and postrm scripts out of the way.
for f in prerm postrm
Modified: crosshurd/trunk/functions
URL:
http://svn.debian.org/wsvn/pkg-hurd/crosshurd/crosshurd/trunk/functions?rev=799&op=diff
==============================================================================
--- crosshurd/trunk/functions (original)
+++ crosshurd/trunk/functions Mon Aug 11 20:57:16 2014
@@ -43,12 +43,7 @@
p="$(($p + 1))"
progress "$p" "$#" "Extracting packages"
info "Extracting $pkg..."
- if ar -t ./$pkg | grep -q data.tar.gz
- then
- ar -p ./$pkg data.tar.gz | zcat | tar -xf -
- else
- ar -p ./$pkg data.tar.xz | xzcat | tar -xf -
- fi
+ dpkg-deb --extract ./$pkg .
done
sync
); }
@@ -74,11 +69,7 @@
x_feign_install () {
local pkg="$1"
local deb="$(debfor $pkg)"
- local ver="$(
- ar -p "$TARGET/$deb" control.tar.gz | zcat |
- tar -O -xf - control ./control 2>/dev/null |
- sed -ne 's/^Version: *//Ip' | head -n 1
- )"
+ local ver="$(dpkg-deb --field "$TARGET/$deb" Version)"
mkdir -p "$TARGET/var/lib/dpkg/info"
Modified: crosshurd/trunk/makehurddir.sh
URL:
http://svn.debian.org/wsvn/pkg-hurd/crosshurd/crosshurd/trunk/makehurddir.sh?rev=799&op=diff
==============================================================================
--- crosshurd/trunk/makehurddir.sh (original)
+++ crosshurd/trunk/makehurddir.sh Mon Aug 11 20:57:16 2014
@@ -33,7 +33,7 @@
fi
extract `(cd $TARGET/var/cache/apt/archives && \
- for i in *.deb; do dpkg --info $i | grep ^\ Priority:.required \
+ for i in *.deb; do dpkg-deb --field $i Priority | grep ^required \
&& echo $i; done) | cut -d _ -f 1`
if [ -e $TARGET/var/cache/apt/archives/gnumach-image-1.4-486_* ] ; then
@@ -48,8 +48,8 @@
extract libbz2-1.0
fi
-if [ -e $TARGET/var/cache/apt/archives/libparted0debian1_* ] ; then
- extract libparted0debian1
+if [ -e $TARGET/var/cache/apt/archives/libparted2_* ] ; then
+ extract libparted2
fi
x_feign_install dpkg
Modified: crosshurd/trunk/native-install/native-install
URL:
http://svn.debian.org/wsvn/pkg-hurd/crosshurd/crosshurd/trunk/native-install/native-install?rev=799&op=diff
==============================================================================
--- crosshurd/trunk/native-install/native-install (original)
+++ crosshurd/trunk/native-install/native-install Mon Aug 11 20:57:16 2014
@@ -149,7 +149,7 @@
# install required packages
for i in /var/cache/apt/archives/*.deb ; do
- dpkg --info $i | grep ^\ Priority:.required > /dev/null \
+ dpkg-deb --field $i Priority | grep ^required > /dev/null \
&& dpkg --force-depends --skip-same-version --unpack $i
done
dpkg --force-depends --skip-same-version --unpack
/var/cache/apt/archives/insserv_*.deb
Modified: crosshurd/trunk/packages/gnu
URL:
http://svn.debian.org/wsvn/pkg-hurd/crosshurd/crosshurd/trunk/packages/gnu?rev=799&op=diff
==============================================================================
--- crosshurd/trunk/packages/gnu (original)
+++ crosshurd/trunk/packages/gnu Mon Aug 11 20:57:16 2014
@@ -1,6 +1,6 @@
gnumach-image-1-486
hurd
-libparted0debian1
+libparted2
libuuid1
libc0.3
inetutils-tools
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- r799 - in /crosshurd/trunk: debian/changelog dpkg-hurd functions makehurddir.sh native-install/native-install packages/gnu,
sthibault <=