fix debian stuff

diff --git a/configure.ac b/configure.ac
index 5f5069d..070b5d9 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_INIT(Makefile.am)
-AM_INIT_AUTOMAKE(cpumem-applet, 0.1.0+0loadapplet0.46-1)
+AM_INIT_AUTOMAKE(cpumem-applet, 0.0.1+0loadapplet0.46-1)
 AM_CONFIG_HEADER(config.h)
 
 AC_CANONICAL_HOST

diff --git a/debian/control b/debian/control
index 7c8d727..23ffccb 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,25 +1,14 @@
-Source: load-applet
+Source: cpumem-applet
 Section: user/utilities
 Priority: optional
-Maintainer: Jakub Pavelek <jpavelek@welho.com>
-Build-Depends: debhelper (>= 4.1.0), libhildon1-dev (>=2.1.29), libosso-dev (>=2.0), osso-af-settings, libhildondesktop1-dev (>=2.1.0), libgstreamer0.10-dev
+Maintainer: Tuomo Tanskanen <tumi@tumi.fi>
+Build-Depends: debhelper (>= 4.1.0), libhildon1-dev (>=2.1.29), libosso-dev (>=2.0), osso-af-settings, libhildondesktop1-dev (>=2.1.0)
 Standards-Version: 3.8.0
 
-Package: load-applet-ximagewsrc
-Section: devel
-Architecture: any
-Depends: ${shlibs:Depends}
-Description: GStreamer XImage source, modified
- XImage source modified to scale and include simple watermark
-
-
-Package: load-applet
+Package: cpumem-applet
 Section: user/utilities
 Architecture: any
-Conflicts: maemo5-load-applet
-Replaces: maemo5-load-applet
-Provides: maemo5-load-applet
-Depends: ${shlibs:Depends}, libhildon1 (>=2.1.29), libosso1 (>=2.0), libhildondesktop1 (>=2.1.0), gstreamer-tools, load-applet-ximagewsrc
+Depends: ${shlibs:Depends}, libhildon1 (>=2.1.29), libosso1 (>=2.0), libhildondesktop1 (>=2.1.0)
 XB-Maemo-Icon-26: 
  iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAAAXNSR0IArs4c
  6QAAAAZiS0dEAP8A/wD/oL2nkwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0
@@ -98,7 +87,7 @@ XB-Maemo-Icon-26:
  6EKAXvqlw8REiNhqwkiTM6q8/asUNGmtnLR2vgF+/F9ey/7EyCxgvgAAAABJ
  RU5ErkJggg==
  ===
-Description: Show CPU and memory usage, take screenshots, record screencasts.
- This is a small Status-bar applet that monitors the CPU load and
- the memory consumption. It has menu for screenshot and 
- screencast taking.
+Description: Show CPU and memory usage in small status-area icon.
+ Stripped down version of Jakub Pavelek's load-applet.
+ Displays CPU and memory utilisation in small status-area icon.
+ 

diff --git a/debian/copyright b/debian/copyright
index 3ea8593..c306980 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,3 +1,31 @@
+Released under the terms of BSD License.
+
 Copyright: (c) 2005-2009 Jakub Pavelek <jpavelek@welho.com>
+Copyright: (c) 2009 Jakub Pavelek <tumi@tumi.fi>
 
-Released under the terms of BSD License.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+3. All advertising materials mentioning features or use of this software
+   must display the following acknowledgement:
+   This product includes software developed by the <organization>.
+4. Neither the name of the <organization> nor the
+   names of its contributors may be used to endorse or promote products
+   derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY <COPYRIGHT HOLDER> ''AS IS'' AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

diff --git a/debian/cpumem-applet.install b/debian/cpumem-applet.install
new file mode 100644 (file)
index 0000000..c0d57a5
--- /dev/null
+++ b/debian/cpumem-applet.install
@@ -0,0 +1,2 @@
+usr/lib/hildon-desktop/*.so
+usr/share/pixmaps/*

diff --git a/debian/load-applet-ximagewsrc.install b/debian/load-applet-ximagewsrc.install
deleted file mode 100644 (file)
index 76fe410..0000000
--- a/debian/load-applet-ximagewsrc.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/gstreamer-0.10/*.so

diff --git a/debian/load-applet.install b/debian/load-applet.install
deleted file mode 100644 (file)
index 289d1d9..0000000
--- a/debian/load-applet.install
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/lib/hildon-desktop/*.so
-usr/share/applications/hildon-status-menu/*
-usr/share/sounds/*
-usr/share/pixmaps/*

diff --git a/debian/rules b/debian/rules
index bfc831e..8e49a15 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -70,7 +70,7 @@ binary-arch: build install
        dh_installdocs
        dh_install -v --sourcedir=debian/tmp
        dh_link
-       dh_strip --dbg-package=load-applet
+       dh_strip --dbg-package=cpumem-applet
        dh_compress
        dh_fixperms
        dh_makeshlibs -V