diff -Nru lxtask-0.1.4/debian/changelog lxtask-0.1.4/debian/changelog --- lxtask-0.1.4/debian/changelog 2011-07-23 15:11:07.000000000 +0000 +++ lxtask-0.1.4/debian/changelog 2011-07-29 12:45:42.000000000 +0000 @@ -1,37 +1,32 @@ -lxtask (0.1.4-0ubuntu1) oneiric; urgency=low +lxtask (0.1.4-1) unstable; urgency=low - * New upstream release. - * debian/patches: - - 01_kfreebsd.patch: Remove, merged upstream. - - 80_translations.patch: Remove, merged upstream. - - 81_fix_pl_translation.patch: Remove, merged upstream. - - 90_window_icon.patch: Remove, merged upstream. - - 91_fix_process_names.patch: Remove, merged upstream. - - -- Julien Lavergne Sat, 23 Jul 2011 17:09:47 +0200 - -lxtask (0.1.3-2ubuntu3) natty; urgency=low - - * debian/patch/91_fix_process_names.patch: - - From upstream, fix process name which had only 15 characters. - - -- Julien Lavergne Sun, 27 Mar 2011 14:41:11 +0200 - -lxtask (0.1.3-2ubuntu2) natty; urgency=low - - * debian/patches/81_fix_pl_translation.patch: - - From upstream, fix pl translation which hides CPU usage (LP: #624129) - * debian/patches/90_window_icon.patch: - - From upstream, set an icon for the window. - - -- Julien Lavergne Fri, 18 Mar 2011 00:11:59 +0100 - -lxtask (0.1.3-2ubuntu1) natty; urgency=low - - * debian/patches - - 80_translations.patch: Update translations from upstream git (2011-02-22) + * Merging upstream version 0.1.4: + – default to use gtk2 + – add gtk3 build option + – fix process name only have 15 chars + – same icon that the one in the desktop file + – fix memory leak in task refresh + – treat mem_buffered as mem_cached to make memory usage more accurate + – Fix garbled text (mw should be this) (Bug 2986070) + – fixed compiler warnings: removed un-used variables, + - fixed implicit declaration of functions g_sprintf, textdomain, + bind_textdomain_codeset and bindtextdomain. + * Use debhelper 8 + * Removing useless whitespaces at EOL and EOF. + * Sorting build-depends. + * Wapping build-depends. + * Bumped Standard-Version to 3.9.2. + * Updating Vcs-Browser and Vcs-Git tags. + * Sorting depends. + * Removing debian/dirs: let upstream makefile do the work. + * Removing debian/docs: empty NEWS, no useful README and TODO. + * Compacting rules file. + * Compacting watch file. + * Quilt refresh 01_kfreebsd.patch. + * Added debian/source/options file. + * Disabling dh_auto_test: failed in po/. - -- Julien Lavergne Mon, 28 Feb 2011 00:04:31 +0100 + -- Andrew Lee (李健秋) Fri, 29 Jul 2011 20:45:36 +0800 lxtask (0.1.3-2) unstable; urgency=low @@ -65,8 +60,8 @@ * Switch to dpkg-source 3.0 (quilt) format [ Nikolas Poniros ] - * Updated copyright - * Add intltool to build depends + * Updated copyright + * Add intltool to build depends [ Andrew Lee (李健秋) ] * Initial release (Closes:#495784) diff -Nru lxtask-0.1.4/debian/compat lxtask-0.1.4/debian/compat --- lxtask-0.1.4/debian/compat 2010-06-11 13:08:45.000000000 +0000 +++ lxtask-0.1.4/debian/compat 2011-07-24 14:47:09.000000000 +0000 @@ -1 +1 @@ -7 +8 diff -Nru lxtask-0.1.4/debian/control lxtask-0.1.4/debian/control --- lxtask-0.1.4/debian/control 2011-02-27 19:10:49.000000000 +0000 +++ lxtask-0.1.4/debian/control 2011-07-24 14:47:09.000000000 +0000 @@ -1,23 +1,19 @@ Source: lxtask Section: x11 Priority: extra -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Debian LXDE Packaging Team +Maintainer: Debian LXDE Packaging Team Uploaders: Andrew Lee (李健秋) , Nikolas Poniros -Build-Depends: debhelper (>= 7.0.50~), - autotools-dev, - libgtk2.0-dev (>= 2.6), - libglib2.0-dev (>= 2.6), - intltool -Standards-Version: 3.9.1.0 +Build-Depends: + debhelper (>= 8), autotools-dev, intltool, libglib2.0-dev (>= 2.6), + libgtk2.0-dev (>= 2.6) +Standards-Version: 3.9.2 Homepage: http://lxde.org -Vcs-Git: git://git.debian.org/git/collab-maint/lxtask.git -Vcs-Browser: http://git.debian.org/?p=collab-maint/lxtask.git;a=summary +Vcs-Git: git://git.debian.org/git/pkg-lxde/lxtask.git +Vcs-Browser: http://git.debian.org/?p=pkg-lxde/lxtask.git Package: lxtask Architecture: any -Depends: ${shlibs:Depends}, - ${misc:Depends} +Depends: ${misc:Depends}, ${shlibs:Depends} Description: process manager for Lightweight X11 Desktop Environment A GUI application for monitoring and controlling running processes. diff -Nru lxtask-0.1.4/debian/copyright lxtask-0.1.4/debian/copyright --- lxtask-0.1.4/debian/copyright 2010-06-11 13:08:45.000000000 +0000 +++ lxtask-0.1.4/debian/copyright 2011-07-24 14:47:09.000000000 +0000 @@ -3,11 +3,11 @@ It was downloaded from http://sourceforge.net/projects/lxde/ -Upstream Author: +Upstream Author: Hong Jen Yee (PCMan) -Copyright: +Copyright: Copyright © 2006 Johannes Zellner Copyright © 翼varo Lopes @@ -19,12 +19,12 @@ 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 package; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA @@ -44,11 +44,11 @@ License: GPL v2 Files: src/functions.c - + Copyright © 2006 Johannes Zellner Copyright © 2008 Hong Jen Yee (PCMan) Copyright © 2008 LXDE Team - + License: GPL v2 Files: src/interface.c diff -Nru lxtask-0.1.4/debian/dirs lxtask-0.1.4/debian/dirs --- lxtask-0.1.4/debian/dirs 2010-05-25 17:04:45.000000000 +0000 +++ lxtask-0.1.4/debian/dirs 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -usr/bin diff -Nru lxtask-0.1.4/debian/docs lxtask-0.1.4/debian/docs --- lxtask-0.1.4/debian/docs 2010-05-25 17:04:45.000000000 +0000 +++ lxtask-0.1.4/debian/docs 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -NEWS -README -TODO diff -Nru lxtask-0.1.4/debian/patches/01_kfreebsd.patch lxtask-0.1.4/debian/patches/01_kfreebsd.patch --- lxtask-0.1.4/debian/patches/01_kfreebsd.patch 1970-01-01 00:00:00.000000000 +0000 +++ lxtask-0.1.4/debian/patches/01_kfreebsd.patch 2011-07-24 14:47:09.000000000 +0000 @@ -0,0 +1,48 @@ +Origin: Cyril Brulebois +Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=585969 +Reviewed-By: Andrew Lee +Last-Update: 2010-07-31 + +--- a/src/types.h ++++ b/src/types.h +@@ -79,6 +79,6 @@ + const gchar *custom_signal_0; + const gchar *custom_signal_1; + +-extern int PAGE_SIZE; ++extern int page_size; + + #endif +--- a/src/xfce-taskmanager-linux.c ++++ b/src/xfce-taskmanager-linux.c +@@ -47,8 +47,8 @@ + sscanf(line,"%d %d",&task->size,&task->rss); + close(fd); + if(!task->size) return; +- task->size*=PAGE_SIZE; +- task->rss*=PAGE_SIZE; ++ task->size*=page_size; ++ task->rss*=page_size; + + sprintf(line,"/proc/%d/stat",pid); + fd=open(line,O_RDONLY); +--- a/src/main.c ++++ b/src/main.c +@@ -56,7 +56,7 @@ + guint refresh_interval; + guint rID; + +-int PAGE_SIZE; ++int page_size; + + int main (int argc, char *argv[]) + { +@@ -72,7 +72,7 @@ + #endif + gtk_init (&argc, &argv); + +- PAGE_SIZE=sysconf(_SC_PAGESIZE)>>10; ++ page_size=sysconf(_SC_PAGESIZE)>>10; + own_uid = getuid(); + + config_file = g_build_filename(g_get_user_config_dir(), "lxtask.conf", NULL); diff -Nru lxtask-0.1.4/debian/patches/series lxtask-0.1.4/debian/patches/series --- lxtask-0.1.4/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ lxtask-0.1.4/debian/patches/series 2011-07-24 14:47:09.000000000 +0000 @@ -0,0 +1 @@ +01_kfreebsd.patch diff -Nru lxtask-0.1.4/debian/rules lxtask-0.1.4/debian/rules --- lxtask-0.1.4/debian/rules 2010-07-30 02:13:27.000000000 +0000 +++ lxtask-0.1.4/debian/rules 2011-07-29 12:44:33.000000000 +0000 @@ -1,21 +1,9 @@ #!/usr/bin/make -f -# -*- makefile -*- -# Sample debian/rules that uses debhelper. -# This file was originally written by Joey Hess and Craig Small. -# As a special exception, when this file is copied by dh-make into a -# dh-make output file, you may use that output file without restriction. -# This special exception was added by Craig Small in version 0.37 of dh-make. - # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 - -# These are used for cross-compiling and for saving the configure script -# from having to guess our platform (since we know it already) -DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) -DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) - %: dh $@ + override_dh_auto_test: - : + # Disable: check failed in po/, diff -Nru lxtask-0.1.4/debian/source/options lxtask-0.1.4/debian/source/options --- lxtask-0.1.4/debian/source/options 1970-01-01 00:00:00.000000000 +0000 +++ lxtask-0.1.4/debian/source/options 2011-07-24 14:47:09.000000000 +0000 @@ -0,0 +1,2 @@ +compression = "bzip2" +compression-level = 9 diff -Nru lxtask-0.1.4/debian/watch lxtask-0.1.4/debian/watch --- lxtask-0.1.4/debian/watch 2010-05-25 17:04:45.000000000 +0000 +++ lxtask-0.1.4/debian/watch 2011-07-24 14:47:09.000000000 +0000 @@ -1,12 +1,2 @@ -# Example watch control file for uscan -# Rename this file to "watch" and then you can run the "uscan" command -# to check for upstream updates and more. -# See uscan(1) for format - -# Compulsory line, this is a version 3 file version=3 - -# Uncomment to find new files on sourceforge, for debscripts >= 2.9 http://sf.net/lxde/lxtask-(.*)\.tar\.gz - -