With the i18n debconf fix for #492752 omitted (the reference to #492752 is retained in the changelog), this is the debdiff from 1.4.1 to 1.4.3
1.4.2 has already been uploaded within Emdebian, not Debian. Once 1.4.3
is in Debian, 1.4.4 will be uploaded to Emdebian and will contain the
other changes and bug fixes that cannot be included in Debian at this
time due to the freeze. After the release, the next upload to Debian
will be 1.5.0.
I expect to contact release directly and upload 1.4.3 in a week.
Wookey, v.1.4.3 is already in SVN as a branch:
host/trunk/emdebian-tools/branches/1.4.3/trunk/
I usually use:
$ svn-buildpackage -us -uc -rfakeroot --svn-lintian -D
Feel free ask for a freeze exception and upload if you have time before
I return from DebConf.
(Neil McGovern has had a quick look at this diff so hopefully it will be
OK as a freeze exception.)
----------------------
diff -Nru emdebian-tools-1.4.1/buildd/history.php
emdebian-tools-1.4.3/buildd/history.php
--- emdebian-tools-1.4.1/buildd/history.php 2008-08-10 19:38:54.000000000
-0300
+++ emdebian-tools-1.4.3/buildd/history.php 2008-08-11 16:10:06.000000000
-0300
@@ -110,6 +110,8 @@
{
# needs support for ARCH in the query string too.
$pkg = htmlspecialchars ($_GET['pkg']);
+ $pkg = preg_replace ('/\.+\/+/', "", $pkg);
+ $pkg = preg_replace ('/\//', "", $pkg);
$files = array ();
print "<h2>Package: $pkg</h2>";
print "<a href=\"index.php?log=#$pkg\">Back</a><br/>\n";
@@ -185,7 +187,7 @@
|| (! preg_match("/Successful build/", $contents)))
{
print "<td class=\"warn\">";
- print "<a href=\"?log=$safefile&pkg=$safepkg\">maybe
failed</a>";
+ print "<a
href=\"index.php?log=$safefile&pkg=$safepkg\">maybe failed</a>";
print "</td>\n";
$status = -1;
$numfail++;
diff -Nru emdebian-tools-1.4.1/debian/changelog
emdebian-tools-1.4.3/debian/changelog
--- emdebian-tools-1.4.1/debian/changelog 2008-08-10 19:38:53.000000000
-0300
+++ emdebian-tools-1.4.3/debian/changelog 2008-08-11 16:29:16.000000000
-0300
@@ -1,3 +1,24 @@
+emdebian-tools (1.4.3) unstable; urgency=low
+
+ * [INTL:sv] po-debconf file for emdebian-tools (Closes: #492752)
+ 'svn merge -r 4580:4581'
+ * Remove mountall because it shuts down process 1 - without runlevels,
+ this means shut down the system. r4675+r4672 (superceded by r4711).
+ * two suite scripts force installation of conflicting packages
+ (Closes: #494622) - implement replacement for perl update-rc.d
+ script in shell: r4711. Ensure /etc/rc.d/ exists for update-rc.d
+ support: r4699. Implement shell replacement for update-rc.d: r4677
+ * Implement fix for #491917 in history.php as well as the original
+ buildd.php
+
+ -- Neil Williams <[EMAIL PROTECTED]> Mon, 11 Aug 2008 14:41:57 -0300
+
+emdebian-tools (1.4.2) unstable; urgency=low
+
+ * Skip Emdebian changes in 1.4.2
+
+ -- Neil Williams <[EMAIL PROTECTED]> Mon, 11 Aug 2008 14:38:44 -0300
+
emdebian-tools (1.4.1) unstable; urgency=low
* PHP local file inclusion (Closes: #491917)
diff -Nru emdebian-tools-1.4.1/debian/copyright
emdebian-tools-1.4.3/debian/copyright
--- emdebian-tools-1.4.1/debian/copyright 2008-08-10 19:38:53.000000000
-0300
+++ emdebian-tools-1.4.3/debian/copyright 2008-08-11 14:47:24.000000000
-0300
@@ -7,7 +7,8 @@
Files: *
Licence: GPL-3+
-Copyright: Copyright 2006-2007 Neil Williams <[EMAIL PROTECTED]>
+Copyright: Copyright 2006-2008 Neil Williams <[EMAIL PROTECTED]>
+ Copyright 2008 Hands.com Ltd <[EMAIL PROTECTED]>
Copyright 2006-2007 Wookey <[EMAIL PROTECTED]>
Copyright 1998-2006 Craig Small <[EMAIL PROTECTED]>
Copyright 1999-2003 Julian Gilbey <[EMAIL PROTECTED]>
diff -Nru emdebian-tools-1.4.1/debian/emdebian-tools.install
emdebian-tools-1.4.3/debian/emdebian-tools.install
--- emdebian-tools-1.4.1/debian/emdebian-tools.install 2008-08-10
19:38:53.000000000 -0300
+++ emdebian-tools-1.4.3/debian/emdebian-tools.install 2008-08-11
14:47:24.000000000 -0300
@@ -29,6 +29,7 @@
doc/man/empdebuild.1 ./usr/share/man/man1/
emdebhelper.mk ./usr/share/emdebian-tools/
pbuilder/empdebuild ./usr/sbin/
+pbuilder/update-rc.d ./usr/share/emdebian-tools/
pbuilder/emdebian.buildd ./usr/lib/emdebian-tools/
pbuilder/unstable ./usr/lib/emdebian-tools/
pbuilder/testing ./usr/lib/emdebian-tools/
diff -Nru emdebian-tools-1.4.1/debian/po/sv.po
emdebian-tools-1.4.3/debian/po/sv.po
diff -Nru emdebian-tools-1.4.1/pbuilder/emdebian.busybox
emdebian-tools-1.4.3/pbuilder/emdebian.busybox
--- emdebian-tools-1.4.1/pbuilder/emdebian.busybox 2008-08-10
19:39:00.000000000 -0300
+++ emdebian-tools-1.4.3/pbuilder/emdebian.busybox 2008-08-11
16:25:32.000000000 -0300
@@ -25,7 +25,7 @@
base="apt gpgv debianutils makedev base-passwd sed mktemp
gnupg udev base-files debian-archive-keyring udhcpc udhcpd
- sysv-rc util-linux module-init-tools initscripts"
+ util-linux module-init-tools initscripts"
}
first_stage_install () {
@@ -39,7 +39,7 @@
basic_etc_fstab
basic_group_setup
basic_passwd_setup
- extra_etc_rcd
+ shell_update_rcd
set_approx_time
set_cdebconf_default
set_busybox_path
@@ -54,14 +54,6 @@
busybox_inittab
busybox_rcS
setup_devices
- symlink_rcS mountkernfs "02"
- symlink_rcS udev "10"
- symlink_rcS udev-mtab "11"
- symlink_rcS module-init-tools "15"
- symlink_rcS urandom "20"
- symlink_rcS mountall.sh "25"
- symlink_rcS dbus "30"
- symlink_rcS network "40"
info INSTCORE " -> First stage install complete in $BUILDPLACE"
}
diff -Nru emdebian-tools-1.4.1/pbuilder/emdebian.crossd
emdebian-tools-1.4.3/pbuilder/emdebian.crossd
--- emdebian-tools-1.4.1/pbuilder/emdebian.crossd 2008-08-10
19:39:00.000000000 -0300
+++ emdebian-tools-1.4.3/pbuilder/emdebian.crossd 2008-08-11
16:25:12.000000000 -0300
@@ -26,7 +26,7 @@
base="apt gpgv libncurses5 libreadline5 readline-common mktemp
debianutils makedev whiptail gnupg udev base-files
- debian-archive-keyring dhcp3-client sysv-rc
+ debian-archive-keyring dhcp3-client
util-linux module-init-tools initscripts"
}
@@ -41,7 +41,7 @@
basic_etc_fstab
basic_group_setup
basic_passwd_setup
- extra_etc_rcd
+ shell_update_rcd
set_approx_time
set_cdebconf_default
provide_empty_install_info
@@ -55,13 +55,6 @@
busybox_inittab
busybox_rcS
setup_devices
- symlink_rcS mountkernfs "02"
- symlink_rcS udev "10"
- symlink_rcS udev-mtab "11"
- symlink_rcS module-init-tools "15"
- symlink_rcS urandom "20"
- symlink_rcK mountall.sh "25"
- symlink_rcS network "40"
info INSTCORE " -> First stage install complete in $BUILDPLACE"
}
diff -Nru emdebian-tools-1.4.1/pbuilder/emdebian.gpe
emdebian-tools-1.4.3/pbuilder/emdebian.gpe
--- emdebian-tools-1.4.1/pbuilder/emdebian.gpe 2008-08-10 19:39:00.000000000
-0300
+++ emdebian-tools-1.4.3/pbuilder/emdebian.gpe 2008-08-11 16:24:43.000000000
-0300
@@ -48,7 +48,7 @@
basic_group_setup
basic_passwd_setup
basic_shadow_setup
- extra_etc_rcd
+ shell_update_rcd
set_approx_time
set_cdebconf_default
provide_empty_install_info
@@ -61,15 +61,8 @@
disable_apt_recommends
busybox_inittab
busybox_rcS
+ sample_xorg_conf
setup_devices
- symlink_rcS mountkernfs.sh "02"
- symlink_rcS udev "10"
- symlink_rcS udev-mtab "11"
- symlink_rcS module-init-tools "15"
- symlink_rcS urandom "20"
- symlink_rcK mountall.sh "25"
- symlink_rcS dbus "30"
- symlink_rcS network "40"
info INSTCORE " -> First stage install complete in $BUILDPLACE"
}
diff -Nru emdebian-tools-1.4.1/pbuilder/emdebian.gtk
emdebian-tools-1.4.3/pbuilder/emdebian.gtk
--- emdebian-tools-1.4.1/pbuilder/emdebian.gtk 2008-08-10 19:39:00.000000000
-0300
+++ emdebian-tools-1.4.3/pbuilder/emdebian.gtk 2008-08-11 16:24:17.000000000
-0300
@@ -40,7 +40,7 @@
basic_etc_fstab
basic_group_setup
basic_passwd_setup
- extra_etc_rcd
+ shell_update_rcd
set_approx_time
set_cdebconf_default
provide_empty_install_info
@@ -54,14 +54,6 @@
busybox_inittab
busybox_rcS
setup_devices
- symlink_rcS mountkernfs "02"
- symlink_rcS udev "10"
- symlink_rcS udev-mtab "11"
- symlink_rcS module-init-tools "15"
- symlink_rcS urandom "20"
- symlink_rcK mountall.sh "25"
- symlink_rcS dbus "30"
- symlink_rcS network "40"
info INSTCORE " -> First stage install complete in $BUILDPLACE"
}
diff -Nru emdebian-tools-1.4.1/pbuilder/empbuilderlib
emdebian-tools-1.4.3/pbuilder/empbuilderlib
--- emdebian-tools-1.4.1/pbuilder/empbuilderlib 2008-08-10 19:39:00.000000000
-0300
+++ emdebian-tools-1.4.3/pbuilder/empbuilderlib 2008-08-11 16:23:15.000000000
-0300
@@ -579,3 +579,11 @@
function set_cdebconf_default () {
echo "export DEBCONF_USE_CDEBCONF=true" >> $BUILDPLACE/etc/profile
}
+
+function shell_update_rcd () {
+ if [ ! -e "$BUILDPLACE/usr/sbin/update-rc.d" ]; then
+ info INSTCORE "Adding a /usr/sbin/update-rc.d shell script"
+ cp /usr/share/emdebian-tools/update-rc.d $BUILDPLACE/usr/sbin/
+ chmod 0755 $BUILDPLACE/usr/sbin/update-rc.d
+ fi
+}
diff -Nru emdebian-tools-1.4.1/pbuilder/update-rc.d
emdebian-tools-1.4.3/pbuilder/update-rc.d
--- emdebian-tools-1.4.1/pbuilder/update-rc.d 1969-12-31 21:00:00.000000000
-0300
+++ emdebian-tools-1.4.3/pbuilder/update-rc.d 2008-08-11 14:47:26.000000000
-0300
@@ -0,0 +1,65 @@
+#!/bin/sh
+#
+# Copyright 2008 Hands.com Ltd <[EMAIL PROTECTED]>
+# Copyright 2008 Neil Williams <[EMAIL PROTECTED]>
+#
+# 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
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+
+initd="/etc/init.d"
+etcd="/etc/rc.d"
+bn=$1;shift
+if [ "$bn" = '-f' ]; then
+ bn=$1
+ shift
+fi
+
+defaults () {
+ makelinks "S${1:-20}"
+ makelinks "K${2:-${1:-20}}"
+}
+
+makelinks () {
+ echo " Adding symlink for $initd/$bn ...";
+ echo "${etcd}/${1}${bn} -> ../init.d/$bn"
+ ln -s "../init.d/$bn" "${etcd}/${TYPE}${bn}"
+}
+
+if [ -z "$bn" -o -z "$1" ]; then
+ echo "Insufficient arguments"
+ exit 1
+fi
+
+if [ ! -f "$initd/$bn" ]; then
+ echo "update-rc.d: $initd/$bn: file does not exist\n"
+ exit 1
+fi
+
+if [ "$1" = 'remove' ]; then
+ shift
+ echo "rm -f /etc/rc.d/*${bn}"
+ exit;
+elif [ "$1" = 'defaults' ]; then
+ makelinks "S${2:-20}"
+ makelinks "K${3:-${2:-20}}"
+ exit 0;
+else
+ if [ "$1" = 'start' ]
+ then
+ # work here
+ shift
+ makelinks "S${1}"
+ while [ "$1" != "." ]
+ do
+ shift
+ done
+ shift
+ if [ "$1" = 'stop' ]; then
+ shift
+ makelinks "K${1}"
+ fi
+ fi
+ exit 0;
+fi
--
Neil Williams
=============
http://www.data-freedom.org/
http://www.nosoftwarepatents.com/
http://www.linux.codehelp.co.uk/
signature.asc
Description: This is a digitally signed message part
