Changeset 1209

Timestamp:

01/14/12 19:58:03 (4 months ago)

Author:

tschmitt

Message:

• Paketquellen aktualisiert.
• linuxmuster-setup: Prüfung auf Debianversion deaktiviert.

Location:

main/linuxmuster-base/branches/testing

Files:

• debian/changelog (modified) (1 diff)
• sbin/linuxmuster-setup (modified) (2 diffs)
• var/config-static/etc/apt/sources.list (modified) (1 diff)
• var/config-static/etc/apt/sources.list.d/paedml50.list (deleted)
• var/config-static/etc/apt/sources.list.d/paedml51.list (deleted)
• var/config-static/etc/apt/sources.list.d/paedml60.list (added)

main/linuxmuster-base/branches/testing/debian/changelog

@@ -5 +5 @@
   * deactivated various ipcop stuff.
 
- -- Thomas Schmitt <schmitt@lmz-bw.de>  Sat, 14 Jan 2012 19:34:20 +0100
+ -- Thomas Schmitt <schmitt@lmz-bw.de>  Sat, 14 Jan 2012 19:36:01 +0100
 
 linuxmuster-base (5.1.0-3lenny0) lenny; urgency=low

main/linuxmuster-base/branches/testing/sbin/linuxmuster-setup

@@ -1 @@
-#!/bin/sh
+#!/bin/bash
 # setup for Linux-Musterloesung
 #
@@ -9 +9 @@
 
 # check debian version
-if ! grep -q 5\.0\.[1-9] /etc/debian_version; then
-        echo "This is not Debian 5.0.x Lenny. Please upgrade your system!"
-        exit 1
-fi
+#if ! grep -q 5\.0\.[1-9] /etc/debian_version; then
+#       echo "This is not Debian 5.0.x Lenny. Please upgrade your system!"
+#       exit 1
+#fi
 
 # read dist.conf

main/linuxmuster-base/branches/testing/var/config-static/etc/apt/sources.list

@@ -1 @@
-deb http://ftp.de.debian.org/debian/ lenny main contrib non-free
-deb-src http://ftp.de.debian.org/debian/ lenny main contrib non-free
+deb http://de.archive.ubuntu.com/ubuntu/ oneiric main restricted
+deb-src http://de.archive.ubuntu.com/ubuntu/ oneiric main restricted
 
-deb http://security.debian.org/ lenny/updates main contrib non-free
-deb-src http://security.debian.org/ lenny/updates main contrib non-free
+## Major bug fix updates produced after the final release of the
+## distribution.
+deb http://de.archive.ubuntu.com/ubuntu/ oneiric-updates main restricted
+deb-src http://de.archive.ubuntu.com/ubuntu/ oneiric-updates main restricted
 
-deb http://volatile.debian.org/debian-volatile lenny/volatile main
-deb-src http://volatile.debian.org/debian-volatile lenny/volatile main
+## N.B. software from this repository is ENTIRELY UNSUPPORTED by the Ubuntu
+## team. Also, please note that software in universe WILL NOT receive any
+## review or updates from the Ubuntu security team.
+deb http://de.archive.ubuntu.com/ubuntu/ oneiric universe
+deb-src http://de.archive.ubuntu.com/ubuntu/ oneiric universe
+deb http://de.archive.ubuntu.com/ubuntu/ oneiric-updates universe
+deb-src http://de.archive.ubuntu.com/ubuntu/ oneiric-updates universe
 
+## N.B. software from this repository is ENTIRELY UNSUPPORTED by the Ubuntu 
+## team, and may not be under a free licence. Please satisfy yourself as to 
+## your rights to use the software. Also, please note that software in 
+## multiverse WILL NOT receive any review or updates from the Ubuntu
+## security team.
+deb http://de.archive.ubuntu.com/ubuntu/ oneiric multiverse
+deb-src http://de.archive.ubuntu.com/ubuntu/ oneiric multiverse
+deb http://de.archive.ubuntu.com/ubuntu/ oneiric-updates multiverse
+deb-src http://de.archive.ubuntu.com/ubuntu/ oneiric-updates multiverse
+
+## Uncomment the following two lines to add software from the 'backports'
+## repository.
+## N.B. software from this repository may not have been tested as
+## extensively as that contained in the main release, although it includes
+## newer versions of some applications which may provide useful features.
+## Also, please note that software in backports WILL NOT receive any review
+## or updates from the Ubuntu security team.
+deb http://de.archive.ubuntu.com/ubuntu/ oneiric-backports main restricted universe multiverse
+deb-src http://de.archive.ubuntu.com/ubuntu/ oneiric-backports main restricted universe multiverse
+
+## Uncomment the following two lines to add software from Canonical's
+## 'partner' repository.
+## This software is not part of Ubuntu, but is offered by Canonical and the
+## respective vendors as a service to Ubuntu users.
+deb http://archive.canonical.com/ubuntu oneiric partner
+deb-src http://archive.canonical.com/ubuntu oneiric partner
+
+deb http://security.ubuntu.com/ubuntu oneiric-security main restricted
+deb-src http://security.ubuntu.com/ubuntu oneiric-security main restricted
+deb http://security.ubuntu.com/ubuntu oneiric-security universe
+deb-src http://security.ubuntu.com/ubuntu oneiric-security universe
+deb http://security.ubuntu.com/ubuntu oneiric-security multiverse
+deb-src http://security.ubuntu.com/ubuntu oneiric-security multiverse
+
+## This software is not part of Ubuntu, but is offered by third-party
+## developers who want to ship their latest software.
+deb http://extras.ubuntu.com/ubuntu oneiric main
+deb-src http://extras.ubuntu.com/ubuntu oneiric main
+