[Pkg-uml-commit] r47 - trunk/src/uml-utilities/debian
Mattia Dongili
malattia at costa.debian.org
Sat Apr 8 19:59:03 UTC 2006
Author: malattia
Date: 2006-04-08 19:59:02 +0000 (Sat, 08 Apr 2006)
New Revision: 47
Added:
trunk/src/uml-utilities/debian/compat
trunk/src/uml-utilities/debian/postrm
Modified:
trunk/src/uml-utilities/debian/changelog
trunk/src/uml-utilities/debian/control
trunk/src/uml-utilities/debian/postinst
trunk/src/uml-utilities/debian/rules
trunk/src/uml-utilities/debian/uml-utilities.default
trunk/src/uml-utilities/debian/uml-utilities.init
Log:
(extracted from changelog)
* moved Stefano Melchior to Uploaders and using pkg-uml-pkgs at l.a.d.o as
Maintainer.
* added myself and Andreas Schuldei as Uploaders.
* uml_router vanished together with the core file in uptream source
package. (Closes: #280392)
* remove dpkg-statoverride entry on remove/purge of the package.
(Closes: #270680)
* provide an option to prevent uml_switch from starting. (Closes: #231265)
* some debian/rules cleanup and a non-POSIX shell code fix.
* converted changelog to UTF8.
Modified: trunk/src/uml-utilities/debian/changelog
===================================================================
--- trunk/src/uml-utilities/debian/changelog 2006-04-08 19:55:00 UTC (rev 46)
+++ trunk/src/uml-utilities/debian/changelog 2006-04-08 19:59:02 UTC (rev 47)
@@ -1,3 +1,19 @@
+uml-utilities (20060323-1) unstable; urgency=low
+
+ [Mattia Dongili]:
+ * moved Stefano Melchior to Uploaders and using pkg-uml-pkgs at l.a.d.o as
+ Maintainer.
+ * added myself and Andreas Schuldei as Uploaders.
+ * uml_router vanished together with the core file in uptream source
+ package. (Closes: #280392)
+ * remove dpkg-statoverride entry on remove/purge of the package.
+ (Closes: #270680)
+ * provide an option to prevent uml_switch from starting. (Closes: #231265)
+ * some debian/rules cleanup and a non-POSIX shell code fix.
+ * converted changelog to UTF8.
+
+ -- Mattia Dongili <malattia at debian.org> Sat, 08 Apr 2006 18:58:22 +0200
+
uml-utilities (20060110-1) unstable; urgency=low
* Fixed libreadline5-dev build dependency (closes: #326287)
@@ -8,7 +24,7 @@
uml-utilities (20040406-1) unstable; urgency=low
* New upstream release
- * Patch from Carlos Perelló Marín to fix uml_proxy_arp with multiple
+ * Patch from Carlos Perelló MarÃn to fix uml_proxy_arp with multiple
addresses (Closes: #243834)
-- Matt Zimmerman <mdz at debian.org> Wed, 14 Apr 2004 17:59:45 -0700
Added: trunk/src/uml-utilities/debian/compat
===================================================================
--- trunk/src/uml-utilities/debian/compat 2006-04-08 19:55:00 UTC (rev 46)
+++ trunk/src/uml-utilities/debian/compat 2006-04-08 19:59:02 UTC (rev 47)
@@ -0,0 +1 @@
+4
Modified: trunk/src/uml-utilities/debian/control
===================================================================
--- trunk/src/uml-utilities/debian/control 2006-04-08 19:55:00 UTC (rev 46)
+++ trunk/src/uml-utilities/debian/control 2006-04-08 19:59:02 UTC (rev 47)
@@ -1,7 +1,8 @@
Source: uml-utilities
Section: otherosfs
Priority: extra
-Maintainer: Stefano Melchior <stefano.melchior at openlabs.it>
+Maintainer: User Mode Linux Developers <pkg-uml-pkgs at lists.alioth.debian.org>
+Uploaders: Stefano Melchior <stefano.melchior at openlabs.it>, Andreas Schuldei <andreas at schuldei.org>, Mattia Dongili <malattia at debian.org>
Build-Depends: debhelper (>> 4.0.0), libreadline5-dev | libreadline-dev, docbook-to-man
Standards-Version: 3.6.2
Modified: trunk/src/uml-utilities/debian/postinst
===================================================================
--- trunk/src/uml-utilities/debian/postinst 2006-04-08 19:55:00 UTC (rev 46)
+++ trunk/src/uml-utilities/debian/postinst 2006-04-08 19:59:02 UTC (rev 47)
@@ -41,7 +41,7 @@
chown uml-net:uml-net /var/run/uml-utilities
fi
- if [ ! -e /dev/.devfsd -a ! -e /dev/net/tun ]; then
+ if [ ! -e /dev/.devfsd ] && [ ! -e /dev/net/tun ]; then
(cd /dev && MAKEDEV tun)
fi
Added: trunk/src/uml-utilities/debian/postrm
===================================================================
--- trunk/src/uml-utilities/debian/postrm 2006-04-08 19:55:00 UTC (rev 46)
+++ trunk/src/uml-utilities/debian/postrm 2006-04-08 19:59:02 UTC (rev 47)
@@ -0,0 +1,44 @@
+#! /bin/sh
+# postrm script for uml-utilities
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+# * <postrm> `remove'
+# * <postrm> `purge'
+# * <old-postrm> `upgrade' <new-version>
+# * <new-postrm> `failed-upgrade' <old-version>
+# * <new-postrm> `abort-install'
+# * <new-postrm> `abort-install' <old-version>
+# * <new-postrm> `abort-upgrade' <old-version>
+# * <disappearer's-postrm> `disappear' <r>overwrit>r> <new-version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+ purge|remove|abort-install)
+ if dpkg-statoverride --list /usr/lib/uml/uml_net >/dev/null; then
+ dpkg-statoverride --remove /usr/lib/uml/uml_net
+ fi
+ ;;
+
+ upgrade|failed-upgrade|abort-upgrade|disappear)
+ # do nothing
+ ;;
+
+ *)
+ echo "postrm called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
Modified: trunk/src/uml-utilities/debian/rules
===================================================================
--- trunk/src/uml-utilities/debian/rules 2006-04-08 19:55:00 UTC (rev 46)
+++ trunk/src/uml-utilities/debian/rules 2006-04-08 19:59:02 UTC (rev 47)
@@ -6,7 +6,6 @@
#export DH_VERBOSE=1
# This is the debhelper compatability version to use.
-export DH_COMPAT=3
export DEB_BUILD_ARCH?=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
tmp:=$(CURDIR)/debian/uml-utilities
@@ -25,7 +24,7 @@
endif
$(MAKE)
- for man in */*.sgml; do \
+ for man in debian/*.sgml; do \
docbook-to-man $$man > `dirname $$man`/`basename $$man .sgml`.1; \
done
@@ -37,7 +36,7 @@
rm -f build-stamp configure-stamp
-$(MAKE) clean
- rm -f */*.1
+ rm -f debian/*.1
dh_clean
@@ -63,17 +62,6 @@
# Build architecture-independent files here.
binary-indep: build install
-# dh_testdir -i
-# dh_testroot -i
-# dh_installdocs -i
-# dh_installchangelogs -i
-# dh_compress -i
-# dh_fixperms -i
-# dh_installdeb -i
-# dh_perl -i
-# dh_gencontrol -i
-# dh_md5sums -i
-# dh_builddeb -i
# Build architecture-dependent files here.
binary-arch: build install
@@ -84,12 +72,8 @@
dh_installexamples -a
# dh_installmenu -a
# dh_installlogrotate -a
-# dh_installemacsen -a
-# dh_installpam -a
-# dh_installmime -a
dh_installinit -a
-# dh_installcron -a
- dh_installman -a */*.1
+ dh_installman -a debian/*.1
dh_installinfo -a
# dh_undocumented
dh_installchangelogs -a
@@ -97,9 +81,7 @@
dh_strip -a
dh_compress -a
dh_fixperms -a
-# dh_makeshlibs -a
dh_installdeb -a
-# dh_perl -a
dh_shlibdeps -a
dh_gencontrol -a
dh_md5sums -a
Modified: trunk/src/uml-utilities/debian/uml-utilities.default
===================================================================
--- trunk/src/uml-utilities/debian/uml-utilities.default 2006-04-08 19:55:00 UTC (rev 46)
+++ trunk/src/uml-utilities/debian/uml-utilities.default 2006-04-08 19:59:02 UTC (rev 47)
@@ -1,4 +1,9 @@
# Options to pass to uml_switch.
+
+# set to "false" if you want to prevent uml_switch from
+# starting with SysV scripts in /etc/init.d
+# UML_SWITCH_START="false"
+
# For preconfigured tap setup, see
# /usr/share/doc/uml-utilities/examples/interfaces.example
#UML_SWITCH_OPTIONS="-tap tap0"
Modified: trunk/src/uml-utilities/debian/uml-utilities.init
===================================================================
--- trunk/src/uml-utilities/debian/uml-utilities.init 2006-04-08 19:55:00 UTC (rev 46)
+++ trunk/src/uml-utilities/debian/uml-utilities.init 2006-04-08 19:59:02 UTC (rev 47)
@@ -27,7 +27,13 @@
case "$1" in
start)
- echo -n "Starting $DESC: $NAME"
+ echo -n "Starting $DESC: "
+ if [ "x$UML_SWITCH_START" = "xfalse" ] ; then
+ echo " Disabled."
+ exit 0
+ else
+ echo -n " $NAME"
+ fi
start-stop-daemon --start --quiet --pidfile $PIDFILE \
--make-pidfile --background --chuid $UML_SWITCH_USER \
--exec $DAEMON -- $OPTIONS
More information about the Pkg-uml-commit
mailing list