1.1 --- a/packages/ubuntu-feisty/userinstall/debian/rules Sun Aug 26 21:34:32 2007 +0200
1.2 +++ b/packages/ubuntu-feisty/userinstall/debian/rules Sun Aug 26 21:40:25 2007 +0200
1.3 @@ -26,9 +26,9 @@
1.4
1.5 install-scripts:
1.6 mkdir -p $(CURDIR)/debian/userinstall/usr/bin
1.7 - mkdir -p $(CURDIR)/debian/userinstall/etc/defaults
1.8 + mkdir -p $(CURDIR)/debian/userinstall/etc/default
1.9 install user-* $(CURDIR)/debian/userinstall/usr/bin
1.10 - install userinstall-defaults $(CURDIR)/debian/userinstall/etc/defaults/userinstall
1.11 + install userinstall-defaults $(CURDIR)/debian/userinstall/etc/default/userinstall
1.12
1.13 # Build architecture-independent files here.
1.14
2.1 --- a/user-apt-get Sun Aug 26 21:34:32 2007 +0200
2.2 +++ b/user-apt-get Sun Aug 26 21:40:25 2007 +0200
2.3 @@ -4,8 +4,8 @@
2.4 # Configuration:
2.5 if [ -e userinstall-defaults ]; then
2.6 source userinstall-defaults
2.7 -elif [ -e /etc/defaults/userinstall ]; then
2.8 - source /etc/defaults/userinstall
2.9 +elif [ -e /etc/default/userinstall ]; then
2.10 + source /etc/default/userinstall
2.11 else
2.12 echo "No defaults found for userinstall."
2.13 exit 1
3.1 --- a/user-dpkg-i Sun Aug 26 21:34:32 2007 +0200
3.2 +++ b/user-dpkg-i Sun Aug 26 21:40:25 2007 +0200
3.3 @@ -4,8 +4,8 @@
3.4 # Configuration:
3.5 if [ -e userinstall-defaults ]; then
3.6 source userinstall-defaults
3.7 -elif [ -e /etc/defaults/userinstall ]; then
3.8 - source /etc/defaults/userinstall
3.9 +elif [ -e /etc/default/userinstall ]; then
3.10 + source /etc/default/userinstall
3.11 else
3.12 echo "No defaults found for userinstall."
3.13 exit 1
4.1 --- a/user-path Sun Aug 26 21:34:32 2007 +0200
4.2 +++ b/user-path Sun Aug 26 21:40:25 2007 +0200
4.3 @@ -4,8 +4,8 @@
4.4 # Configuration:
4.5 if [ -e userinstall-defaults ]; then
4.6 source userinstall-defaults
4.7 -elif [ -e /etc/defaults/userinstall ]; then
4.8 - source /etc/defaults/userinstall
4.9 +elif [ -e /etc/default/userinstall ]; then
4.10 + source /etc/default/userinstall
4.11 else
4.12 echo "No defaults found for userinstall."
4.13 exit 1
5.1 --- a/user-setup Sun Aug 26 21:34:32 2007 +0200
5.2 +++ b/user-setup Sun Aug 26 21:40:25 2007 +0200
5.3 @@ -4,8 +4,8 @@
5.4 # Configuration:
5.5 if [ -e userinstall-defaults ]; then
5.6 source userinstall-defaults
5.7 -elif [ -e /etc/defaults/userinstall ]; then
5.8 - source /etc/defaults/userinstall
5.9 +elif [ -e /etc/default/userinstall ]; then
5.10 + source /etc/default/userinstall
5.11 else
5.12 echo "No defaults found for userinstall."
5.13 exit 1