diffstat for lsb-4.1+Debian3 lsb-4.1.parsix.1

 debian/changelog |    7 +++++++
 lsb_release.py   |   32 ++++----------------------------
 2 files changed, 11 insertions(+), 28 deletions(-)

diff -Nru lsb-4.1+Debian3/debian/changelog lsb-4.1.parsix.1/debian/changelog
--- lsb-4.1+Debian3/debian/changelog	2012-05-07 17:23:18.000000000 +0000
+++ lsb-4.1.parsix.1/debian/changelog	2012-05-16 15:56:32.000000000 +0000
@@ -1,3 +1,10 @@
+lsb (4.1.parsix.1) unstable; urgency=low
+
+  * Sync'd with Debian 4.1+Debian3
+  * Updated release info for Gloria
+
+ -- Alan Baghumian <alan@technotux.org>  Wed, 16 May 2012 08:47:14 -0700
+
 lsb (4.1+Debian3) unstable; urgency=low
 
   [ Didier Raboud ]
diff -Nru lsb-4.1+Debian3/lsb_release.py lsb-4.1.parsix.1/lsb_release.py
--- lsb-4.1+Debian3/lsb_release.py	2012-05-07 17:18:24.000000000 +0000
+++ lsb-4.1.parsix.1/lsb_release.py	2012-05-16 15:56:32.000000000 +0000
@@ -226,39 +226,21 @@
     return releases[0][1]
 
 def guess_debian_release():
-    distinfo = {'ID' : 'Debian'}
+    distinfo = {'ID' : 'Parsix'}
 
     kern = os.uname()[0]
     if kern in ('Linux', 'Hurd', 'NetBSD'):
         distinfo['OS'] = 'GNU/'+kern
     elif kern == 'FreeBSD':
         distinfo['OS'] = 'GNU/k'+kern
-    elif kern in ('GNU/Linux', 'GNU/kFreeBSD'):
-        distinfo['OS'] = kern
     else:
         distinfo['OS'] = 'GNU'
 
     distinfo['DESCRIPTION'] = '%(ID)s %(OS)s' % distinfo
 
-    if os.path.exists('/etc/debian_version'):
-        try:
-            with open('/etc/debian_version') as debian_version:
-                release = debian_version.read().strip()
-        except IOError, msg:
-            print >> sys.stderr, 'Unable to open /etc/debian_version:', str(msg)
-            release = 'unknown'
-            
-        if not release[0:1].isalpha():
-            # /etc/debian_version should be numeric
-            codename = lookup_codename(release, 'n/a')
-            distinfo.update({ 'RELEASE' : release, 'CODENAME' : codename })
-        elif release.endswith('/sid'):
-            if release.rstrip('/sid').lower().isalpha() != 'testing':
-                global TESTING_CODENAME
-                TESTING_CODENAME = release.rstrip('/sid')
-            distinfo['RELEASE'] = 'testing/unstable'
-        else:
-            distinfo['RELEASE'] = release
+    # Override
+    distinfo['RELEASE'] = '4.0';
+    distinfo['CODENAME'] = 'gloria'    
 
     # Only use apt information if we did not get the proper information
     # from /etc/debian_version or if we don't have a codename
@@ -271,12 +253,6 @@
     rinfo = guess_release_from_apt()
     if rinfo and not distinfo.get('CODENAME'):
         release = rinfo.get('version')
-
-        # Special case Debian-Ports as their Release file has 'version': '1.0'
-        if release == '1.0' and rinfo.get('origin') == 'Debian Ports' and rinfo.get('label') == 'ftp.debian-ports.org':
-            release = None
-            rinfo.update({'suite': 'unstable'})
-
         if release:
             codename = lookup_codename(release, 'n/a')
         else: