diff -Nru kio-sysinfo-0.1/README kio-sysinfo-0.1/README
--- kio-sysinfo-0.1/README	2009-02-16 11:43:25.000000000 +0000
+++ kio-sysinfo-0.1/README	2013-10-16 09:37:02.000000000 +0000
@@ -13,6 +13,7 @@
 - suse
 - mandriva
 - debian
+- ubuntu
 
 Dirk Mueller <dmueller@suse.de>
 Lukas Tinkl <ltinkl@redhat.com>
diff -Nru kio-sysinfo-0.1/debian/README.Debian kio-sysinfo-0.1/debian/README.Debian
--- kio-sysinfo-0.1/debian/README.Debian	2012-10-01 20:37:43.000000000 +0000
+++ kio-sysinfo-0.1/debian/README.Debian	1970-01-01 00:00:00.000000000 +0000
@@ -1,6 +0,0 @@
-kio-sysinfo for Debian
-----------------------
-
-<possible notes regarding this package - if none, delete this file>
-
- -- Rohan Garg <rohangarg@kubuntu.org>  Mon, 01 Oct 2012 21:37:34 +0100
diff -Nru kio-sysinfo-0.1/debian/README.source kio-sysinfo-0.1/debian/README.source
--- kio-sysinfo-0.1/debian/README.source	2012-10-01 20:37:43.000000000 +0000
+++ kio-sysinfo-0.1/debian/README.source	1970-01-01 00:00:00.000000000 +0000
@@ -1,9 +0,0 @@
-kio-sysinfo for Debian
-----------------------
-
-<this file describes information about the source package, see Debian policy
-manual section 4.14. You WILL either need to modify or delete this file>
-
-
-
-
diff -Nru kio-sysinfo-0.1/debian/bzr-builder.manifest kio-sysinfo-0.1/debian/bzr-builder.manifest
--- kio-sysinfo-0.1/debian/bzr-builder.manifest	1970-01-01 00:00:00.000000000 +0000
+++ kio-sysinfo-0.1/debian/bzr-builder.manifest	2013-10-16 09:37:03.000000000 +0000
@@ -0,0 +1,3 @@
+# bzr-builder format 0.4 deb-version 0.1-0ubuntu1+f89087e
+lp:~cyberspace/cyberspace/kio-sysinfo revid:git-v1:f89087e787fcf8ba48c152dbe8a03b884ce6451c
+nest packaging lp:~cyberspace/cyberspace/kio-sysinfo-ubuntu debian revid:rohangarg@kubuntu.org-20131016091926-5cleuviu7rhlrjlk
diff -Nru kio-sysinfo-0.1/debian/changelog kio-sysinfo-0.1/debian/changelog
--- kio-sysinfo-0.1/debian/changelog	2012-10-11 00:41:10.000000000 +0000
+++ kio-sysinfo-0.1/debian/changelog	2013-10-16 09:37:03.000000000 +0000
@@ -1,3 +1,9 @@
+kio-sysinfo (0.1-0ubuntu1+f89087e~ubuntu13.10.1) saucy; urgency=low
+
+  * Auto build.
+
+ -- Rohan Garg <rohan16garg@gmail.com>  Wed, 16 Oct 2013 09:37:03 +0000
+
 kio-sysinfo (0.1-0ubuntu1~ppa3) quantal; urgency=low
 
   * No change rebuild
diff -Nru kio-sysinfo-0.1/debian/control kio-sysinfo-0.1/debian/control
--- kio-sysinfo-0.1/debian/control	2012-10-11 00:24:57.000000000 +0000
+++ kio-sysinfo-0.1/debian/control	2013-10-16 09:37:03.000000000 +0000
@@ -4,10 +4,10 @@
 Build-Depends: debhelper (>= 8.0.0), cmake,
  kde-workspace-dev,
  shared-mime-info,
- libhd-dev
+ pkg-kde-tools
 Standards-Version: 3.9.3
 Section: libs
-Homepage: http://kde-apps.org/content/show.php?content=58704
+Homepage: https://github.com/blue-shell/kio-sysinfo
 
 Package: kio-sysinfo
 Section: libs
diff -Nru kio-sysinfo-0.1/debian/copyright kio-sysinfo-0.1/debian/copyright
--- kio-sysinfo-0.1/debian/copyright	2012-10-01 20:37:43.000000000 +0000
+++ kio-sysinfo-0.1/debian/copyright	1970-01-01 00:00:00.000000000 +0000
@@ -1,32 +0,0 @@
-Format: http://dep.debian.net/deps/dep5
-Upstream-Name: kio-sysinfo
-Source: <url://example.com>
-
-Files: *
-Copyright: <years> <put author's name and email here>
-           <years> <likewise for another author>
-License: GPL-2.0+
-
-Files: debian/*
-Copyright: 2012 Rohan Garg <rohangarg@kubuntu.org>
-License: GPL-2.0+
-
-License: GPL-2.0+
- This package is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
- .
- This package is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
- .
- 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 version 2 can be found in "/usr/share/common-licenses/GPL-2".
-
-# Please also look if there are files or directories which have a
-# different copyright/license attached and list them here.
diff -Nru kio-sysinfo-0.1/debian/kio-sysinfo-dev.dirs kio-sysinfo-0.1/debian/kio-sysinfo-dev.dirs
--- kio-sysinfo-0.1/debian/kio-sysinfo-dev.dirs	2012-10-01 20:37:43.000000000 +0000
+++ kio-sysinfo-0.1/debian/kio-sysinfo-dev.dirs	1970-01-01 00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-usr/lib
-usr/include
diff -Nru kio-sysinfo-0.1/debian/kio-sysinfo-dev.install kio-sysinfo-0.1/debian/kio-sysinfo-dev.install
--- kio-sysinfo-0.1/debian/kio-sysinfo-dev.install	2012-10-01 20:37:43.000000000 +0000
+++ kio-sysinfo-0.1/debian/kio-sysinfo-dev.install	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-usr/include/*
-usr/lib/lib*.a
-usr/lib/lib*.so
-usr/lib/pkgconfig/*
-usr/share/pkgconfig/*
diff -Nru kio-sysinfo-0.1/debian/kio-sysinfo.install kio-sysinfo-0.1/debian/kio-sysinfo.install
--- kio-sysinfo-0.1/debian/kio-sysinfo.install	2012-10-04 20:14:39.000000000 +0000
+++ kio-sysinfo-0.1/debian/kio-sysinfo.install	2013-10-16 09:37:03.000000000 +0000
@@ -1 +1 @@
-usr/*
+usr
diff -Nru kio-sysinfo-0.1/debian/kio-sysinfo1.dirs kio-sysinfo-0.1/debian/kio-sysinfo1.dirs
--- kio-sysinfo-0.1/debian/kio-sysinfo1.dirs	2012-10-01 20:37:43.000000000 +0000
+++ kio-sysinfo-0.1/debian/kio-sysinfo1.dirs	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-usr/lib
diff -Nru kio-sysinfo-0.1/debian/kio-sysinfo1.install kio-sysinfo-0.1/debian/kio-sysinfo1.install
--- kio-sysinfo-0.1/debian/kio-sysinfo1.install	2012-10-01 20:37:43.000000000 +0000
+++ kio-sysinfo-0.1/debian/kio-sysinfo1.install	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-usr/lib/lib*.so.*
diff -Nru kio-sysinfo-0.1/debian/rules kio-sysinfo-0.1/debian/rules
--- kio-sysinfo-0.1/debian/rules	2012-10-04 17:46:31.000000000 +0000
+++ kio-sysinfo-0.1/debian/rules	2013-10-16 09:37:03.000000000 +0000
@@ -3,4 +3,7 @@
 #export DH_VERBOSE=1
 
 %:
-	dh $@ --with-kde --parallel --dbg=kio-sysinfo-dbg
+	dh $@ --with kde --dbg-package=kio-sysinfo-dbg
+
+override_dh_auto_configure:
+	dh_auto_configure -- -DWITH_UBUNTU=1
diff -Nru kio-sysinfo-0.1/debian/source/format kio-sysinfo-0.1/debian/source/format
--- kio-sysinfo-0.1/debian/source/format	2013-10-16 10:24:14.902564807 +0000
+++ kio-sysinfo-0.1/debian/source/format	2013-10-16 10:24:15.052564790 +0000
@@ -1 +1 @@
-3.0 (quilt)
+3.0 (native)
diff -Nru kio-sysinfo-0.1/src/config-kiosysinfo.h.cmake kio-sysinfo-0.1/src/config-kiosysinfo.h.cmake
--- kio-sysinfo-0.1/src/config-kiosysinfo.h.cmake	2008-12-21 20:45:33.000000000 +0000
+++ kio-sysinfo-0.1/src/config-kiosysinfo.h.cmake	2013-10-16 09:37:02.000000000 +0000
@@ -7,3 +7,4 @@
 #cmakedefine WITH_FEDORA 1
 #cmakedefine WITH_MANDRIVA 1
 #cmakedefine WITH_DEBIAN 1
+#cmakedefine WITH_UBUNTU 1
\ No newline at end of file
diff -Nru kio-sysinfo-0.1/src/kfmclient_sysinfo.desktop kio-sysinfo-0.1/src/kfmclient_sysinfo.desktop
--- kio-sysinfo-0.1/src/kfmclient_sysinfo.desktop	2012-09-27 08:33:58.000000000 +0000
+++ kio-sysinfo-0.1/src/kfmclient_sysinfo.desktop	2013-10-16 09:37:02.000000000 +0000
@@ -17,13 +17,14 @@
 Name[es]=Información de sistema
 Name[et]=Süsteemi info
 Name[fi]=Järjestelmätiedot
-Name[fr]=Information système
+Name[fr]=Informations système
 Name[ga]=Faisnéis Córais
 Name[gl]=Información do sistema
 Name[hr]=Informacije o sustavu
 Name[hu]=Rendszer információk
 Name[ja]=システム情報
 Name[km]=ព័ត៌មាន​ប្រព័ន្ធ
+Name[lt]=Sistemos informacija
 Name[nb]=Systeminformasjon
 Name[nds]=Systeem-Informatschonen
 Name[nl]=Systeeminformatie
diff -Nru kio-sysinfo-0.1/src/ksysinfopart.desktop kio-sysinfo-0.1/src/ksysinfopart.desktop
--- kio-sysinfo-0.1/src/ksysinfopart.desktop	2012-08-07 16:37:03.000000000 +0000
+++ kio-sysinfo-0.1/src/ksysinfopart.desktop	2013-10-16 09:37:02.000000000 +0000
@@ -8,7 +8,7 @@
 Comment[es]=Visor Sysinfo
 Comment[et]=Süsteemi info näitaja
 Comment[fi]=Sysinfo-katselin
-Comment[fr]=Outil d'affiche pour Sysinfo
+Comment[fr]=Afficheur pour Sysinfo
 Comment[gl]=Visor de Sysinfo
 Comment[hr]=Preglednik informacija o sustavu
 Comment[hu]=Rendszer-információ megjelenítő
@@ -43,6 +43,7 @@
 Name[hu]=Rendszer-információ
 Name[ja]=Sysinfo
 Name[km]=Sysinfo
+Name[lt]=Sysinfo
 Name[nb]=Sysinfo
 Name[nds]=Sysinfo
 Name[nl]=Sysinfo
@@ -52,6 +53,7 @@
 Name[pt_BR]=Sysinfo
 Name[ro]=Sysinfo
 Name[ru]=Сведения о системе
+Name[sk]=Sysinfo
 Name[sv]=Systeminformation
 Name[tr]=Sysinfo
 Name[ug]=Sysinfo
diff -Nru kio-sysinfo-0.1/src/sysinfo.cpp kio-sysinfo-0.1/src/sysinfo.cpp
--- kio-sysinfo-0.1/src/sysinfo.cpp	2011-02-15 10:58:31.000000000 +0000
+++ kio-sysinfo-0.1/src/sysinfo.cpp	2013-10-16 09:37:02.000000000 +0000
@@ -100,7 +100,7 @@
 static QString readFromFile( const QString & filename, const QString & info = QString(),
                              const char * sep = 0, bool returnlast = false )
 {
-    //kDebug(1242) << "Reading " << info << " from " << filename;
+    kDebug() << "Reading " << info << " from " << filename;
 
     QFile file( filename );
 
@@ -180,20 +180,14 @@
     QString sysInfo = "<div id=\"column2\">"; // table with 2 cols
     QString dummy;
 
-    // disk info
-    infoMessage( i18n( "Looking for disk information..." ) );
-    m_devices.clear();
-    sysInfo += "<h2 id=\"hdds\">" + i18n( "Disk Information" ) + "</h2>";
-    sysInfo += diskInfo();
-
     osInfo();
     sysInfo += "<h2 id=\"sysinfo\">" +i18n( "OS Information" ) + "</h2>";
     sysInfo += "<table>";
-    sysInfo += "<tr><td>" + i18n( "OS:" ) + "</td><td>" + htmlQuote(m_info[OS_SYSNAME]) + " " +
+    sysInfo += "<tr><td>" + i18n( "OS:" ) +  "</td><td>" + htmlQuote(m_info[OS_SYSTEM]) + "</td></tr>";
+    sysInfo += "<tr><td>" + i18n( "System:" ) + "</td><td>" + htmlQuote(m_info[OS_SYSNAME]) + " " +
                htmlQuote(m_info[OS_RELEASE]) + " " + htmlQuote(m_info[OS_MACHINE]) + "</td></tr>";
-    sysInfo += "<tr><td>" + i18n( "Current user:" ) + "</td><td>" + htmlQuote(m_info[OS_USER]) + "@"
-               + htmlQuote(m_info[OS_HOSTNAME]) + "</td></tr>";
-    sysInfo += "<tr><td>" + i18n( "System:" ) +  "</td><td>" + htmlQuote(m_info[OS_SYSTEM]) + "</td></tr>";
+//     sysInfo += "<tr><td>" + i18n( "Current user:" ) + "</td><td>" + htmlQuote(m_info[OS_USER]) + "@"
+//                + htmlQuote(m_info[OS_HOSTNAME]) + "</td></tr>";
     sysInfo += "<tr><td>" + i18n( "KDE:" ) + "</td><td>" + KDE::versionString() + "</td></tr>";
     sysInfo += "</table>";
 
@@ -202,8 +196,8 @@
     {
         sysInfo += "<h2 id=\"display\">" + i18n( "Display Info" ) + "</h2>";
         sysInfo += "<table>";
-        sysInfo += "<tr><td>" + i18n( "Vendor:" ) + "</td><td>" + htmlQuote(m_info[GFX_VENDOR]) +  "</td></tr>";
-        sysInfo += "<tr><td>" + i18n( "Model:" ) + "</td><td>" + htmlQuote(m_info[GFX_MODEL]) + "</td></tr>";
+        sysInfo += "<tr><td>" + i18n( "Vendor:" ) + "</td><td>" + htmlQuote(m_info[GFX_MODEL]) +  "</td></tr>";
+//         sysInfo += "<tr><td>" + i18n( "Model:" ) + "</td><td>" + htmlQuote(m_info[GFX_MODEL]) + "</td></tr>";
         sysInfo += "<tr><td>" + i18n( "2D driver:" ) + "</td><td>" + htmlQuote(m_info[GFX_2D_DRIVER]) + "</td></tr>";
         if (!m_info[GFX_3D_DRIVER].isNull())
             sysInfo += "<tr><td>" + i18n( "3D driver:" ) + "</td><td>" + htmlQuote(m_info[GFX_3D_DRIVER]) + "</td></tr>";
@@ -211,44 +205,18 @@
     }
 
     // battery info
-    infoMessage( i18n( "Looking for battery and AC information..." ) );
-    if ( batteryInfo() )
-    {
-        sysInfo += "<h2 id=\"battery\">" + i18n( "Battery Information" ) + "</h2>";
-        sysInfo += "<table>";
-        sysInfo += "<tr><td>" + i18n( "Battery present:" ) + "</td><td>" + m_info[BATT_IS_PLUGGED] + "</td></tr>";
-        sysInfo += "<tr><td>" + i18nc( "battery state", "State:" ) + "</td><td>" + m_info[BATT_CHARGE_STATE] + "</td></tr>";
-        sysInfo += "<tr><td>" + i18n( "Charge percent:" ) + "</td><td>" + m_info[BATT_CHARGE_PERC] + "</td></tr>";
-        sysInfo += "<tr><td>" + i18n( "Rechargeable:" ) + "</td><td>" + m_info[BATT_IS_RECHARGEABLE] + "</td></tr>";
-        sysInfo += "<tr><td>" + i18n( "AC plugged:" ) + "</td><td>" + m_info[AC_IS_PLUGGED] + "</td></tr>";
-        sysInfo += "</table>";
-    }
-
-    sysInfo += "</div><div id=\"column1\">"; // second column
-
-    // OS info
-    infoMessage( i18n( "Getting OS information...." ) );
-
-    // common folders
-    sysInfo += "<h2 id=\"dirs\">" + i18n( "Common Folders" ) + "</h2>"; sysInfo += "<ul>";
-    if ( KStandardDirs::exists( KGlobalSettings::documentPath() + "/" ) )
-        sysInfo += QString( "<li><a href=\"file:%1\">" ).arg( htmlQuote(KGlobalSettings::documentPath()) )
-                   + i18n( "My Documents" ) + "</a></li>";
-    sysInfo += QString( "<li><a href=\"file:%1\">" ).arg( htmlQuote(QDir::homePath()) ) + i18n( "My Home Folder" ) + "</a></li>";
-    sysInfo += QString( "<li><a href=\"file:%1\">" ).arg( htmlQuote(QDir::rootPath()) ) + i18n( "Root Folder" ) + "</a></li>";
-    sysInfo += "<li><a href=\"remote:/\">" + i18n( "Network Folders" ) + "</a></li>";
-    sysInfo += "</ul>";
-
-    // net info
-    infoMessage( i18n( "Looking up network status..." ) );
-    QString state = netStatus();
-    if ( !state.isEmpty() ) // assume no network manager / networkstatus
-    {
-        sysInfo += "<h2 id=\"net\">" + i18n( "Network Status" ) + "</h2>";
-        sysInfo += "<ul>";
-        sysInfo += "<li>" + state + "</li>";
-        sysInfo += "</ul>";
-    }
+//     infoMessage( i18n( "Looking for battery and AC information..." ) );
+//     if ( batteryInfo() )
+//     {
+//         sysInfo += "<h2 id=\"battery\">" + i18n( "Battery Information" ) + "</h2>";
+//         sysInfo += "<table>";
+//         sysInfo += "<tr><td>" + i18n( "Battery present:" ) + "</td><td>" + m_info[BATT_IS_PLUGGED] + "</td></tr>";
+//         sysInfo += "<tr><td>" + i18nc( "battery state", "State:" ) + "</td><td>" + m_info[BATT_CHARGE_STATE] + "</td></tr>";
+//         sysInfo += "<tr><td>" + i18n( "Charge percent:" ) + "</td><td>" + m_info[BATT_CHARGE_PERC] + "</td></tr>";
+//         sysInfo += "<tr><td>" + i18n( "Rechargeable:" ) + "</td><td>" + m_info[BATT_IS_RECHARGEABLE] + "</td></tr>";
+//         sysInfo += "<tr><td>" + i18n( "AC plugged:" ) + "</td><td>" + m_info[AC_IS_PLUGGED] + "</td></tr>";
+//         sysInfo += "</table>";
+//     }
 
     // more CPU info
     if ( !m_info[CPU_MODEL].isNull() )
@@ -283,6 +251,39 @@
 
     sysInfo += "</div>";
 
+    sysInfo += "</div><div id=\"column1\">"; // second column
+
+    // OS info
+    infoMessage( i18n( "Getting OS information...." ) );
+
+//     // common folders
+//     sysInfo += "<h2 id=\"dirs\">" + i18n( "Common Folders" ) + "</h2>"; sysInfo += "<ul>";
+//     if ( KStandardDirs::exists( KGlobalSettings::documentPath() + "/" ) )
+//         sysInfo += QString( "<li><a href=\"file:%1\">" ).arg( htmlQuote(KGlobalSettings::documentPath()) )
+//                    + i18n( "My Documents" ) + "</a></li>";
+//     sysInfo += QString( "<li><a href=\"file:%1\">" ).arg( htmlQuote(QDir::homePath()) ) + i18n( "My Home Folder" ) + "</a></li>";
+//     sysInfo += QString( "<li><a href=\"file:%1\">" ).arg( htmlQuote(QDir::rootPath()) ) + i18n( "Root Folder" ) + "</a></li>";
+//     sysInfo += "<li><a href=\"remote:/\">" + i18n( "Network Folders" ) + "</a></li>";
+//     sysInfo += "</ul>";
+
+    // net info
+    infoMessage( i18n( "Looking up network status..." ) );
+    QString state = netStatus();
+    if ( !state.isEmpty() ) // assume no network manager / networkstatus
+    {
+        sysInfo += "<h2 id=\"net\">" + i18n( "Network Status" ) + "</h2>";
+        sysInfo += "<ul>";
+        sysInfo += "<li>" + state + "</li>";
+        sysInfo += "</ul>";
+    }
+
+    // disk info
+    infoMessage( i18n( "Looking for disk information..." ) );
+    m_devices.clear();
+    sysInfo += "<h2 id=\"hdds\">" + i18n( "Disk Information" ) + "</h2>";
+    sysInfo += diskInfo();
+
+
     // Send the data
     content = content.arg( sysInfo ); // put the sysinfo text into the main box
     data( content.toUtf8() );
@@ -735,7 +736,7 @@
     m_info[ OS_MACHINE ] = uts.machine;
     m_info[ OS_HOSTNAME ] = uts.nodename;
 
-    m_info[ OS_USER ] = KUser().loginName();
+//     m_info[ OS_USER ] = KUser().loginName();
 
 #ifdef WITH_FEDORA
     m_info[ OS_SYSTEM ] = readFromFile( "/etc/redhat-release" );
@@ -743,6 +744,8 @@
     m_info[ OS_SYSTEM ] = readFromFile( "/etc/SuSE-release" );
 #elif defined(WITH_DEBIAN)
     m_info[ OS_SYSTEM ] = readFromFile( "/etc/debian_version" );
+#elif defined(WITH_UBUNTU)
+    m_info[ OS_SYSTEM ] = readFromFile ( "/etc/lsb-release", "DISTRIB_ID", "=" ) + " " + readFromFile ( "/etc/lsb-release", "DISTRIB_RELEASE", "=" );
 #else
     m_info[ OS_SYSTEM ] = i18nc( "Unknown operating system version", "Unknown" );
 #endif