Adding debian version 0.1.3-2. debian-squeeze debian/0.1.3-2
authorDaniel Baumann <daniel@debian.org>
Sat, 14 Apr 2012 19:33:39 +0000 (19:33 +0000)
committerDaniel Baumann <daniel@debian.org>
Sat, 14 Apr 2012 19:33:39 +0000 (19:33 +0000)
debian/changelog
debian/control
debian/patches/01_kfreebsd.patch [new file with mode: 0644]
debian/patches/series [new file with mode: 0644]
debian/rules

index 790db2a..1d2cd9a 100644 (file)
@@ -1,3 +1,16 @@
+lxtask (0.1.3-2) unstable; urgency=low
+
+  [ Cyril Brulebois ]
+  * Replace PAGE_SIZE with page_size everywhere, since the former might
+    be defined through system-wide headers (e.g. on GNU/kFreeBSD).
+    (Closes:585969)
+
+  [ Andrew Lee (李健秋) ]
+  * Build-depends on debhelper >= 7.0.50~
+  * Bumped Standard-version to 3.9.1
+
+ -- Andrew Lee (李健秋) <ajqlee@debian.org>  Sat, 31 Jul 2010 17:15:40 -0400
+
 lxtask (0.1.3-1) unstable; urgency=low
 
   [ Julien Lavergne ]
index 4b89dee..e949d4e 100644 (file)
@@ -3,12 +3,12 @@ Section: x11
 Priority: extra
 Maintainer: Debian LXDE Packaging Team <pkg-lxde-maintainers@lists.alioth.debian.org>
 Uploaders: Andrew Lee (李健秋) <ajqlee@debian.org>, Nikolas Poniros <edhunter@sidux.com>
-Build-Depends: debhelper (>= 7), 
+Build-Depends: debhelper (>= 7.0.50~), 
                autotools-dev,
                libgtk2.0-dev (>= 2.6),
                libglib2.0-dev (>= 2.6),
-                          intltool
-Standards-Version: 3.8.4.0
+               intltool
+Standards-Version: 3.9.1.0
 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
diff --git a/debian/patches/01_kfreebsd.patch b/debian/patches/01_kfreebsd.patch
new file mode 100644 (file)
index 0000000..c0b7b30
--- /dev/null
@@ -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
+
+--- lxtask-0.1.3.orig/src/types.h
++++ lxtask-0.1.3/src/types.h
+@@ -78,6 +78,6 @@ extern guint win_height;
+ const gchar *custom_signal_0;
+ const gchar *custom_signal_1;
+-extern int PAGE_SIZE;
++extern int page_size;
+ #endif
+--- lxtask-0.1.3.orig/src/xfce-taskmanager-linux.c
++++ lxtask-0.1.3/src/xfce-taskmanager-linux.c
+@@ -46,8 +46,8 @@ void get_task_details(gint pid,struct ta
+         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);
+--- lxtask-0.1.3.orig/src/main.c
++++ lxtask-0.1.3/src/main.c
+@@ -51,7 +51,7 @@ guint win_height;
+ guint refresh_interval;
+ guint rID;
+-int PAGE_SIZE;
++int page_size;
+ int main (int argc, char *argv[])
+ {
+@@ -65,7 +65,7 @@ int main (int argc, char *argv[])
+     gtk_set_locale ();
+     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 --git a/debian/patches/series b/debian/patches/series
new file mode 100644 (file)
index 0000000..fab369a
--- /dev/null
@@ -0,0 +1 @@
+01_kfreebsd.patch
index ef05d74..9a7686d 100755 (executable)
@@ -17,3 +17,5 @@ DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
 %:
        dh $@
+override_dh_auto_test:
+        :