[SCM] live-config branch, debian-next, updated. debian/3.0_a22-1-1-g49486e2

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit 49486e2bdea724ab36e0815458726822e6671064
Author: Daniel Baumann <daniel at debian.org>
Date:   Tue Jun 21 09:13:38 2011 +0200

    Making references to debian more distribution neutral.

diff --git a/Makefile b/Makefile
index e79c363..a70562d 100644
--- a/Makefile
+++ b/Makefile
@@ -32,7 +32,7 @@ test:
 		echo "W: checkbashisms - command not found"; \
 		echo "I: checkbashisms can be optained from: "; \
 		echo "I:   http://git.debian.org/?p=devscripts/devscripts.git"; \
-		echo "I: On Debian systems, checkbashisms can be installed with:"; \
+		echo "I: On Debian based systems, checkbashisms can be installed with:"; \
 		echo "I:   apt-get install devscripts"; \
 	fi
 
@@ -78,9 +78,9 @@ uninstall:
 
 	# Uninstalling docs
 	rm -rf $(DESTDIR)/usr/share/doc/live-config
-	rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share/doc
-	rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share
-	rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr
+	rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share/doc || true
+	rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share || true
+	rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr || true
 
 	# Uninstalling manpages
 	for MANPAGE in manpages/en/*; \
diff --git a/bin/live-config-update b/bin/live-config-update
index de32661..035b883 100755
--- a/bin/live-config-update
+++ b/bin/live-config-update
@@ -15,7 +15,7 @@ then
 	echo "E: lsb_release - command not found"
 	echo "I: lsb_release can be optained from:"
 	echo "I:   http://www.linux-foundation.org/en/LSB"
-	echo "I: On Debian systems, lsb_release can be installed with:"
+	echo "I: On Debian based systems, lsb_release can be installed with:"
 	echo "I:   apt-get install lsb-release"
 	exit 1
 fi
diff --git a/manpages/Makefile b/manpages/Makefile
index 68b5e31..3b8b063 100644
--- a/manpages/Makefile
+++ b/manpages/Makefile
@@ -25,7 +25,7 @@ build: po4a.cfg
 		echo "E: po4a - command not found"; \
 		echo "I: po4a can be optained from:"; \
 		echo "I:   http://po4a.alioth.debian.org/"; \
-		echo "I: On Debian systems, po4a can be installed with:"; \
+		echo "I: On Debian based systems, po4a can be installed with:"; \
 		echo "I:   apt-get install po4a"; \
 		exit 1; \
 	fi
diff --git a/scripts/config.sh b/scripts/config.sh
index fdcc24d..6633aeb 100755
--- a/scripts/config.sh
+++ b/scripts/config.sh
@@ -16,7 +16,7 @@
 ## You should have received a copy of the GNU General Public License
 ## along with this program. If not, see <http://www.gnu.org/licenses/>.
 ##
-## On Debian systems, the complete text of the GNU General Public License
+## The complete text of the GNU General Public License
 ## can be found in /usr/share/common-licenses/GPL-3 file.
 
 

-- 
live-config