[Pkg-wmaker-commits] [wmmemload] 10/103: version 0.1.6-7

Doug Torrance dtorrance-guest at moszumanska.debian.org
Mon Aug 24 03:11:38 UTC 2015 

This is an automated email from the git hooks/post-receive script.

dtorrance-guest pushed a commit to branch master
in repository wmmemload.

commit 77c765fb2bb03390fa6d1f60e6eff214e00adb32
Author: Philipp Benner <philipp at debian.org>
Date:   Sun Nov 13 01:05:17 2011 +0000

    version 0.1.6-7
---
 debian/README.source                                   |  2 ++
 debian/changelog                                       |  7 +++++++
 debian/control                                         | 10 ++++------
 debian/copyright                                       |  2 +-
 debian/patches/00list                                  |  3 ---
 ...ure-kfreebsd.dpatch => 01-configure-kfreebsd.patch} | 10 ++++------
 .../{02-stamp-h-in.dpatch => 02-stamp-h-in.patch}      | 10 ++++------
 debian/patches/{03-manual.dpatch => 03-manual.patch}   | 11 ++++-------
 debian/patches/04-kernel30.patch                       | 18 ++++++++++++++++++
 debian/patches/series                                  |  4 ++++
 debian/rules                                           |  7 ++++---
 11 files changed, 52 insertions(+), 32 deletions(-)

diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..69ed767
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,2 @@
+
+ -- Philipp Benner <philipp at debian.org>, Sat, 12 Nov 2011 10:36:15 +0000
diff --git a/debian/changelog b/debian/changelog
index 1f46462..40b03e4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+wmmemload (0.1.6-7) unstable; urgency=low
+
+  * Using quilt instead of dpatch.
+  * Added patch for kernel 3.0.
+
+ -- Philipp Benner <philipp at debian.org>  Sat, 12 Nov 2011 10:52:48 +0000
+
 wmmemload (0.1.6-6) unstable; urgency=low
 
   * Fixing errors in manual page.
diff --git a/debian/control b/debian/control
index 7a14376..8e6de4d 100644
--- a/debian/control
+++ b/debian/control
@@ -1,17 +1,15 @@
 Source: wmmemload
 Section: x11
 Priority: optional
-Maintainer: Philipp Benner <pbenner at uni-osnabrueck.de>
-XS-DM-Upload-Allowed: yes
-Build-Depends: debhelper (>> 5.0.0), dpatch, autotools-dev, libx11-dev, libxext-dev, libxpm-dev, libxt-dev
-Standards-Version: 3.7.3
+Maintainer: Philipp Benner <philipp at debian.org>
+Build-Depends: debhelper (>> 5.0.0), quilt, autotools-dev, libx11-dev, libxext-dev, libxpm-dev, libxt-dev
+Standards-Version: 3.9.2
 Vcs-Browser: http://svn.debian.org/wsvn/collab-maint/deb-maint/wmmemload/
 Vcs-Svn: svn://svn.debian.org/collab-maint/deb-maint/wmmemload/
-Homepage: http://markstaggs.net/wmmemload/
 
 Package: wmmemload
 Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: WindowMaker dockapp to monitor memory and swap usage
  wmmemload displays the current memory and swap usage as a percentage
  value. It is based on wmcpuload and wmmemmon, and as such looks very
diff --git a/debian/copyright b/debian/copyright
index b8c21bf..d621f36 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -26,7 +26,7 @@ License: GPL-2+
 Files: debian/*
 Copyright:
  © 2002-2007 Søren Boll Overgaard <boll at fork.dk>
- © 2007 Philipp Benner <pbenner at uni-osnabrueck.de>
+ © 2007 Philipp Benner <philipp at debian.org>
 License: GPL-2+
  This package was debianized by Søren Boll Overgaard on Mon, 8 Apr 2002
  and is now maintained by Philipp Benner.
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index b42285f..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,3 +0,0 @@
-01-configure-kfreebsd
-02-stamp-h-in
-03-manual
diff --git a/debian/patches/01-configure-kfreebsd.dpatch b/debian/patches/01-configure-kfreebsd.patch
similarity index 76%
rename from debian/patches/01-configure-kfreebsd.dpatch
rename to debian/patches/01-configure-kfreebsd.patch
index d45889f..d630c86 100755
--- a/debian/patches/01-configure-kfreebsd.dpatch
+++ b/debian/patches/01-configure-kfreebsd.patch
@@ -1,9 +1,7 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01-configure-kfreebsd.dpatch by Philipp Benner <mail at philipp-benner.de>
-##
-## DP: Fix FTBFS on GNU/kFreeBSD by matching "linux*|k*bsd*|gnu*" instead of only "linux*".
-
- at DPATCH@
+Author: Philipp Benner <philipp at debian.org>
+Description: Fix FTBFS on GNU/kFreeBSD by matching "linux*|k*bsd*|gnu*" instead of only "linux*"
+Forwarded: no
+License: GPL
 diff -urNad wmmemload-0.1.6~/configure wmmemload-0.1.6/configure
 --- wmmemload-0.1.6~/configure	2007-07-22 21:38:38.000000000 +0200
 +++ wmmemload-0.1.6/configure	2007-07-22 21:45:11.000000000 +0200
diff --git a/debian/patches/02-stamp-h-in.dpatch b/debian/patches/02-stamp-h-in.patch
similarity index 54%
rename from debian/patches/02-stamp-h-in.dpatch
rename to debian/patches/02-stamp-h-in.patch
index c411123..60dad4f 100755
--- a/debian/patches/02-stamp-h-in.dpatch
+++ b/debian/patches/02-stamp-h-in.patch
@@ -1,9 +1,7 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02-stamp-h-in.dpatch by Philipp Benner <mail at philipp-benner.de>
-##
-## DP: Create stamp-h.in required to inhibit autoheader execution.
-
- at DPATCH@
+Author: Philipp Benner <philipp at debian.org>
+Description: Create stamp-h.in required to inhibit autoheader execution
+Forwarded: no
+License: GPL
 diff -urNad wmmemload-0.1.6~/stamp-h.in wmmemload-0.1.6/stamp-h.in
 --- wmmemload-0.1.6~/stamp-h.in	1970-01-01 01:00:00.000000000 +0100
 +++ wmmemload-0.1.6/stamp-h.in	2007-07-25 11:19:18.000000000 +0200
diff --git a/debian/patches/03-manual.dpatch b/debian/patches/03-manual.patch
similarity index 83%
rename from debian/patches/03-manual.dpatch
rename to debian/patches/03-manual.patch
index 54e2a30..181e0d5 100755
--- a/debian/patches/03-manual.dpatch
+++ b/debian/patches/03-manual.patch
@@ -1,10 +1,7 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01-configure-kfreebsd.dpatch by Philipp Benner <pbenner at uni-osnabrueck.de>
-##
-## DP: Fix errors in the manpage.
-
- at DPATCH@
-
+Author: Philipp Benner <philipp at debian.org>
+Description: Fix errors in the manpage
+Forwarded: no
+License: GPL
 diff -urNad wmmemload-0.1.6~/doc/wmmemload.1 wmmemload-0.1.6/doc/wmmemload.1
 --- wmmemload-0.1.6~/doc/wmmemload.1	2008-05-26 22:35:37 +0700
 +++ wmmemload-0.1.6/doc/wmmemload.1	2008-05-26 22:35:28 +0700
diff --git a/debian/patches/04-kernel30.patch b/debian/patches/04-kernel30.patch
new file mode 100644
index 0000000..26029e2
--- /dev/null
+++ b/debian/patches/04-kernel30.patch
@@ -0,0 +1,18 @@
+Author: Guillermo Indalecio Fernandez <guillermobox at gmail.com>
+Description: Fix version check for kernel 3.0
+Forwarded: no
+License: GPL
+diff -aruN wmmemload-0.1.6~/src/mem_linux.c wmmemload-0.1.6/src/mem_linux.c
+--- wmmemload-0.1.6~/src/mem_linux.c	       2003-11-03 22:06:39.000000000 +0000
++++ wmmemload-0.1.6/src/mem_linux.c	       2011-11-12 11:05:13.000000000 +0000
+@@ -49,8 +49,9 @@
+ 
+    /* new format ? (kernel >= 2.5.1pre?) */
+    /* see linux/fs/proc/proc_misc.c */
+-   if (version >= 2 && patchlevel >= 5 && sublevel >= 1 || \
+-       version >= 2 && patchlevel >= 6 && sublevel >= 0)
++   if (version == 2 && patchlevel >= 5 && sublevel >= 1 || \
++       version == 2 && patchlevel >= 6 && sublevel >= 0 || \
++       version >2 )
+       isnewformat = 1;
+ }
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..f8ff62e
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,4 @@
+01-configure-kfreebsd.patch
+02-stamp-h-in.patch
+03-manual.patch
+04-kernel30.patch
diff --git a/debian/rules b/debian/rules
index d14ce99..8066906 100755
--- a/debian/rules
+++ b/debian/rules
@@ -29,8 +29,7 @@ else
   CFLAGS += -O2
 endif
 
-.NOTPARALLEL:
-include /usr/share/dpatch/dpatch.make
+include /usr/share/quilt/quilt.make
 
 config: config-stamp
 config-stamp:
@@ -75,7 +74,9 @@ configure-stamp:
 	touch $@
 
 
-build: patch config configure-stamp build-stamp
+build: build-arch build-indep
+build-arch: patch config configure-stamp build-stamp
+build-indep: patch config configure-stamp build-stamp
 build-stamp:
 	dh_testdir
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmmemload.git

More information about the Pkg-wmaker-commits mailing list