Control: tags -1 +patch +pending X-Debbugs-CC: [email protected] [email protected]
Dear maintainer, I've prepared an NMU for wmforkplop (versioned as 0.9.3-2.2) and uploaded it to DELAYED/7. Please feel free to tell me if I should delay it longer. Regards, Boyuan Yang diff -Nru wmforkplop-0.9.3/debian/changelog wmforkplop-0.9.3/debian/changelog --- wmforkplop-0.9.3/debian/changelog 2020-06-01 21:12:32.000000000 -0400 +++ wmforkplop-0.9.3/debian/changelog 2020-06-01 20:27:48.000000000 -0400 @@ -1,3 +1,23 @@ +wmforkplop (0.9.3-2.2) unstable; urgency=high + + * Non-maintainer upload. + * debian/control: + + Update Vcs-* fields to use git packaging repo under Salsa + Debian group. + + Bump Standards-Version to 4.5.0. + + Replace removed ttf-dejavu font dependency with new name + fonts-dejavu. (Closes: #861191) + + Migrate from cdbs to debhelper compat v13. + This helps to run dh-autoreconf for new architectures. + (Closes: #765271) + * debian/patches: Add patch to stop font search under /usr/X11R6 + and /usr/share/fonts/ttf. The --help output is also updated + accordingly. + * debian/compat: Removed, useless. + * debian/source/format: Use "3.0 (quilt)" format. + + -- Boyuan Yang <[email protected]> Mon, 01 Jun 2020 20:27:48 -0400 + wmforkplop (0.9.3-2.1) unstable; urgency=medium * Non-maintainer upload. diff -Nru wmforkplop-0.9.3/debian/compat wmforkplop-0.9.3/debian/compat --- wmforkplop-0.9.3/debian/compat 2020-06-01 21:12:32.000000000 -0400 +++ wmforkplop-0.9.3/debian/compat 1969-12-31 19:00:00.000000000 -0500 @@ -1 +0,0 @@ -5 diff -Nru wmforkplop-0.9.3/debian/control wmforkplop-0.9.3/debian/control --- wmforkplop-0.9.3/debian/control 2020-06-01 21:12:32.000000000 -0400 +++ wmforkplop-0.9.3/debian/control 2020-06-01 20:27:48.000000000 -0400 @@ -3,16 +3,22 @@ Priority: optional Maintainer: Varun Hiremath <[email protected]> Uploaders: Torsten Werner <[email protected]> -Build-Depends: debhelper (>= 5), cdbs, libgtop2-dev, - libimlib2-dev, libx11-dev, libxext-dev, libxt-dev, quilt -Standards-Version: 3.7.3 +Build-Depends: + debhelper-compat (= 13), + libgtop2-dev, + libimlib2-dev, + libx11-dev, + libxext-dev, + libxt-dev, + libgtk2.0-dev, +Standards-Version: 4.5.0 Homepage: http://hules.free.fr/wmforkplop -Vcs-Svn: https://bollin.googlecode.com/svn/wmforkplop/ -Vcs-Browser: http://bollin.googlecode.com/svn/wmforkplop/ +Vcs-Git: https://salsa.debian.org/debian/wmforkplop.git +Vcs-Browser: https://salsa.debian.org/debian/wmforkplop Package: wmforkplop Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, ttf-dejavu +Depends: ${shlibs:Depends}, ${misc:Depends}, fonts-dejavu Description: monitors forking activity and displays top CPU consuming processes Wmforkplop monitors the forking activity of the kernel and displays a list of the most CPU consuming processes. diff -Nru wmforkplop-0.9.3/debian/patches/0004-dockapp_imlib2.c-No-more-usr-X11R6-and-fonts-ttf.patch wmforkplop-0.9.3/debian/patches/0004-dockapp_imlib2.c-No-more-usr-X11R6-and-fonts-ttf.patch --- wmforkplop-0.9.3/debian/patches/0004-dockapp_imlib2.c-No-more-usr-X11R6-and-fonts-ttf.patch 1969-12-31 19:00:00.000000000 -0500 +++ wmforkplop-0.9.3/debian/patches/0004-dockapp_imlib2.c-No-more-usr-X11R6-and-fonts-ttf.patch 2020-06-01 20:27:48.000000000 -0400 @@ -0,0 +1,39 @@ +From: Boyuan Yang <[email protected]> +Date: Mon, 1 Jun 2020 20:21:27 -0400 +Subject: dockapp_imlib2.c: No more usr/X11R6 and fonts/ttf + +--- + dockapp_imlib2.c | 5 ----- + wmforkplop.c | 3 +-- + 2 files changed, 1 insertion(+), 7 deletions(-) + +diff --git a/dockapp_imlib2.c b/dockapp_imlib2.c +index 84dc6c1..edee76a 100644 +--- a/dockapp_imlib2.c ++++ b/dockapp_imlib2.c +@@ -247,11 +247,6 @@ static void dockimlib2_setup_imlib(DockImlib2 *dock) { + snprintf(fp, 512, "%s/.fonts", getenv("HOME")); + add_fontpath(fp,1); + add_fontpath("/usr/share/fonts",1); +- //add_fontpath("/usr/share/fonts/ttf",1); +- add_fontpath("/usr/X11R6/lib/X11/fonts/truetype",1); +- add_fontpath("/usr/X11R6/lib/X11/fonts/TrueType",1); +- add_fontpath("/usr/X11R6/lib/X11/fonts/ttf",1); +- add_fontpath("/usr/X11R6/lib/X11/fonts/TTF",1); + /*imlib_add_path_to_font_path(fp); + imlib_add_path_to_font_path("/usr/share/fonts/truetype"); + imlib_add_path_to_font_path("/usr/share/fonts/truetype/freefont"); +diff --git a/wmforkplop.c b/wmforkplop.c +index 51b67ad..cd21326 100644 +--- a/wmforkplop.c ++++ b/wmforkplop.c +@@ -963,8 +963,7 @@ void parse_options(int argc, char **argv) { + " -v, --verbose increase verbosity\n" + " -V, --version print version\n" + " --fontpath path add a new directory to the font search directory list\n" +- " default: --fontpath=/usr/share/fonts/truetype (and subdirectories)\n" +- " --fontpath=/usr/share/fonts/ttf (and subdirectories)\n" ++ " default: --fontpath=/usr/share/fonts/ (and subdirectories)\n" + " --fontpath=$HOME/.fonts (and subdirectories)\n" + " --font fontname/size\n" + " Set the 'small font' name/size in pixel\n" diff -Nru wmforkplop-0.9.3/debian/patches/0005-configure.ac-Modernize.patch wmforkplop-0.9.3/debian/patches/0005-configure.ac-Modernize.patch --- wmforkplop-0.9.3/debian/patches/0005-configure.ac-Modernize.patch 1969-12-31 19:00:00.000000000 -0500 +++ wmforkplop-0.9.3/debian/patches/0005-configure.ac-Modernize.patch 2020-06-01 20:27:48.000000000 -0400 @@ -0,0 +1,163 @@ +From: Boyuan Yang <[email protected]> +Date: Mon, 1 Jun 2020 20:40:02 -0400 +Subject: configure.ac: Modernize + +--- + Makefile.am | 2 ++ + configure.ac | 90 +++++++++++++++++++++++++-------------------------------- + m4/.placeholder | 0 + 3 files changed, 42 insertions(+), 50 deletions(-) + create mode 100644 m4/.placeholder + +diff --git a/Makefile.am b/Makefile.am +index aa62d4d..50736e7 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -1,3 +1,5 @@ ++ACLOCAL_AMFLAGS = -I m4 ++ + bin_PROGRAMS=wmforkplop + noinst_PROGRAMS=@GKFORKPLOP@ + EXTRA_PROGRAMS=gkforkplop.so +diff --git a/configure.ac b/configure.ac +index dac5b0f..44c060d 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1,11 +1,13 @@ +-AC_INIT(wmforkplop.c) +-AM_INIT_AUTOMAKE(wmforkplop, 0.9.3) +-AM_CONFIG_HEADER(config.h) ++AC_INIT([wmforkplop], [0.9.3], [http://hules.free.fr/wmforkplop/]) ++AM_INIT_AUTOMAKE ++LT_INIT ++AC_CONFIG_MACRO_DIRS([m4]) ++AC_CONFIG_HEADERS([config.h]) + + AC_SUBST(VERSION) + + ISODATE=`date +%Y-%m-%d` +-AC_SUBST(ISODATE) ++AC_SUBST([ISODATE]) + + AC_CANONICAL_HOST + +@@ -20,53 +22,53 @@ AC_HEADER_STDC + AC_DEFINE(_GNU_SOURCE,[],[uses GNU extensions]) + + +-if test x$GCC = xyes; then +- CFLAGS="-O3 -fomit-frame-pointer -ffast-math -Wall -W"; +-fi ++AS_IF( ++ [test "x${GCC}" = "xyes"], ++ [CFLAGS="-O3 -fomit-frame-pointer -ffast-math -Wall -W"] ++) + + dnl check for X + AC_PATH_X + AC_PATH_XTRA +-if test x$no_x = xyes; then +- echo "You need to supply the path to the X headers and libraries with --x-includes=dir and --x-libraries=dir"; +- exit 1; +-fi; ++AS_IF( ++ [test "x${no_x}" = "xyes"], ++ [AC_MSG_ERROR([You need to supply the path to the X headers and libraries with --x-includes=dir and --x-libraries=dir])] ++) + + LIBS="${X_PRE_LIBS} ${X_LIBS} -lX11 -lXext ${LIBS} ${X_EXTRA_LIBS}" + CFLAGS="$CFLAGS $X_CFLAGS" + + dnl Checks for library functions. +-AC_CHECK_HEADERS(linux/hdreg.h) ++AC_CHECK_HEADERS([linux/hdreg.h]) + + AC_CHECK_PROG([IMLIB2_CONFIG_IN_PATH],[imlib2-config],[yes],[no]) +-if test "x$IMLIB2_CONFIG_IN_PATH" = "xno"; then +- AC_ERROR([imlib2-config not found in PATH.. You need to install Imlib2 (and its developpement package)]) +-fi ++AS_IF( ++ [test "x$IMLIB2_CONFIG_IN_PATH" = "xno"], ++ [AC_ERROR([imlib2-config not found in PATH.. You need to install Imlib2 (and its development package)])] ++) ++ + IMLIB2_CFLAGS=$(imlib2-config --cflags) + IMLIB2_LIBS=$(imlib2-config --libs) +-AC_SUBST(IMLIB2_CFLAGS) +-AC_SUBST(IMLIB2_LIBS) ++AC_SUBST([IMLIB2_CFLAGS]) ++AC_SUBST([IMLIB2_LIBS]) + + YELLOW="\\033\\1331;33m" + RESET="\\033\\1330m" + +-PKG_CHECK_MODULES(PACKAGE, [libgtop-2.0 >= 2.7.90], LIBGTOPBUG="no", LIBGTOPBUG="yes") +-PKG_CHECK_MODULES(PACKAGE, [libgtop-2.0 >= 2.0.0]) +-LIBGTOP_CFLAGS=$PACKAGE_CFLAGS; +-LIBGTOP_LIBS=$PACKAGE_LIBS; +-dnl LIBGTOP_LIBS=`pkg-config --libs libgtop-2.0` +-dnl LIBGTOP_CFLAGS=`pkg-config --cflags libgtop-2.0` +-AC_SUBST(LIBGTOP_LIBS) +-AC_SUBST(LIBGTOP_CFLAGS) +-if test "x$LIBGTOPBUG" = "xyes"; then +- AC_DEFINE(LIBGTOP_BUGGY,[],[defined if libgtop < 2.7.90 is used]) +- echo "Using a buggy version (<2.7.90) of libgtop" +-else +- echo "Using a good version of libgtop" +-fi ++PKG_CHECK_MODULES([LIBGTOP], [libgtop-2.0 >= 2.7.90], [LIBGTOPBUG="no"], [LIBGTOPBUG="yes"]) ++PKG_CHECK_MODULES([LIBGTOP], [libgtop-2.0 >= 2.0.0]) ++AC_SUBST([LIBGTOP_LIBS]) ++AC_SUBST([LIBGTOP_CFLAGS]) ++AS_IF( ++ [test "x$LIBGTOPBUG" = "xyes"], ++ [AC_DEFINE([LIBGTOP_BUGGY], [], [defined if libgtop < 2.7.90 is used]) ++ AC_MSG_WARN([Using a buggy version (<2.7.90) of libgtop])], ++ [AC_MSG_NOTICE([Using a good version of libgtop])] ++) ++ + dnl Checks for the gkrellm plugin + build_gkforkplop="yes" +-AC_ARG_ENABLE(gkrellm, ++AC_ARG_ENABLE([gkrellm], + [ --enable-gkrellm build the gkrellm plugin (requires gtk2 and gkrellm developpement files) (Default is yes) + --disable-gkrellm do not build the gkrellm plugin], + [ if test "x$enableval" = "xno" ; then +@@ -90,8 +92,8 @@ else + PKG_CHECK_MODULES(PACKAGE, [$pkg_modules]) + GTK2_CFLAGS=$PACKAGE_CFLAGS; + GTK2_LIBS=$PACKAGE_LIBS; +- AC_SUBST(GTK2_CFLAGS) +- AC_SUBST(GTK2_LIBS) ++ AC_SUBST([GTK2_CFLAGS]) ++ AC_SUBST([GTK2_LIBS]) + SAVECPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CFLAGS $GTK2_CFLAGS" + AC_CHECK_HEADERS([gkrellm2/gkrellm.h], [ok=1], [ok=0]) +@@ -103,19 +105,7 @@ else + fi + CPPFLAGS="$SAVECPPFLAGS" + fi +-AC_SUBST(GKFORKPLOP) +- +- +-AC_OUTPUT(Makefile) +- +-dnl echo "- - - - - - - - - - - - - - - -" +-dnl echo -e "${YELLOW}wmforkplop will be built${RESET}" +-dnl if test "x$build_gkforkplop" = "xno"; then +-dnl echo -e "${YELLOW}gkforkplop.so will NOT be built${RESET}" +-dnl else +-dnl echo -e "${YELLOW}gkforkplop.so will be built${RESET}" +-dnl echo "Check that the plugin is working properly before installing it with:" +-dnl echo " gkrellm -p ./gkforkplop.so" +-dnl echo "and then install the gkrellm plugin with:" +-dnl echo " mv ./gkforkplop.so ~/.gkrellm2/plugins" +-dnl fi ++AC_SUBST([GKFORKPLOP]) ++ ++ ++AC_OUTPUT([Makefile]) +diff --git a/m4/.placeholder b/m4/.placeholder +new file mode 100644 +index 0000000..e69de29 diff -Nru wmforkplop-0.9.3/debian/patches/dejavu.diff wmforkplop-0.9.3/debian/patches/dejavu.diff --- wmforkplop-0.9.3/debian/patches/dejavu.diff 2020-06-01 21:12:32.000000000 -0400 +++ wmforkplop-0.9.3/debian/patches/dejavu.diff 2020-06-01 20:27:48.000000000 -0400 @@ -1,8 +1,17 @@ -Index: wmforkplop-0.9.3/wmforkplop.c -=================================================================== ---- wmforkplop-0.9.3.orig/wmforkplop.c 2008-01-18 01:06:13.000000000 +0530 -+++ wmforkplop-0.9.3/wmforkplop.c 2008-01-18 01:06:44.000000000 +0530 -@@ -972,7 +972,7 @@ +From: Varun Hiremath <[email protected]> +Date: Mon, 1 Jun 2020 20:14:27 -0400 +Subject: dejavu + +Last-Update: 2008-01-18 +--- + wmforkplop.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/wmforkplop.c b/wmforkplop.c +index 89830cf..51b67ad 100644 +--- a/wmforkplop.c ++++ b/wmforkplop.c +@@ -972,7 +972,7 @@ void parse_options(int argc, char **argv) { " The font name are case-sensitive, and must correspound to the name\n" " of a .ttf file which can be found in one of the fontpaths\n" " By default, wmforkplop tries to load the following fonts:\n" @@ -11,7 +20,7 @@ " However, I *strongly* suggest that you use Vera/6.\n" " -c n, --colormap=n\n" " select colormap number n (0 <= n <= 5)\n" -@@ -1062,7 +1062,7 @@ +@@ -1062,7 +1062,7 @@ char *xstrdup(const char *s) { } void init_fonts(App *app) { diff -Nru wmforkplop-0.9.3/debian/patches/help.diff wmforkplop-0.9.3/debian/patches/help.diff --- wmforkplop-0.9.3/debian/patches/help.diff 2020-06-01 21:12:32.000000000 -0400 +++ wmforkplop-0.9.3/debian/patches/help.diff 2020-06-01 20:27:48.000000000 -0400 @@ -1,8 +1,17 @@ -Index: wmforkplop-0.9.3/wmforkplop.c -=================================================================== ---- wmforkplop-0.9.3.orig/wmforkplop.c 2008-01-18 11:05:04.000000000 +0530 -+++ wmforkplop-0.9.3/wmforkplop.c 2008-01-18 11:05:19.000000000 +0530 -@@ -989,7 +989,7 @@ +From: Varun Hiremath <[email protected]> +Date: Mon, 1 Jun 2020 20:14:27 -0400 +Subject: help + +Last-Update: 2008-01-18 +--- + wmforkplop.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/wmforkplop.c b/wmforkplop.c +index 23447cd..89830cf 100644 +--- a/wmforkplop.c ++++ b/wmforkplop.c +@@ -989,7 +989,7 @@ void parse_options(int argc, char **argv) { " -u n, --proc-update-delay=n\n" " set the delay between two reads of /proc, the default is 150 (milliseconds).\n" " Setting a small value gives accurate results, but consumes more CPU as reading /proc is quite expensive.\n" diff -Nru wmforkplop-0.9.3/debian/patches/pkg-data.diff wmforkplop-0.9.3/debian/patches/pkg-data.diff --- wmforkplop-0.9.3/debian/patches/pkg-data.diff 2020-06-01 21:12:32.000000000 -0400 +++ wmforkplop-0.9.3/debian/patches/pkg-data.diff 2020-06-01 20:27:48.000000000 -0400 @@ -1,8 +1,18 @@ -Index: wmforkplop-0.9.3/Makefile.am -=================================================================== ---- wmforkplop-0.9.3.orig/Makefile.am 2014-03-02 02:29:05.411330157 -0500 -+++ wmforkplop-0.9.3/Makefile.am 2014-03-02 02:29:05.407330205 -0500 -@@ -2,7 +2,7 @@ +From: Varun Hiremath <[email protected]> +Date: Mon, 1 Jun 2020 20:14:27 -0400 +Subject: pkg-data + +Last-Update: 2014-03-02 +--- + Makefile.am | 4 ++-- + Makefile.in | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 091836f..aa62d4d 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -2,7 +2,7 @@ bin_PROGRAMS=wmforkplop noinst_PROGRAMS=@GKFORKPLOP@ EXTRA_PROGRAMS=gkforkplop.so @@ -11,18 +21,18 @@ DEFS = @DEFS@ -DPKGDATADIR="\"$(pkgdatadir)\"" -@@ -27,4 +27,4 @@ +@@ -27,4 +27,4 @@ gkforkplop_so_LDFLAGS=-shared -Wl $(IMLIB2_LIBS) $(LIBGTOP_LIBS) -lm all: @GKFORKPLOP@ -pkgdata_DATA = Vera.ttf Vera.txt README \ No newline at end of file +pkgdata_DATA = -Index: wmforkplop-0.9.3/Makefile.in -=================================================================== ---- wmforkplop-0.9.3.orig/Makefile.in 2006-12-01 06:32:18.000000000 -0500 -+++ wmforkplop-0.9.3/Makefile.in 2014-03-02 02:30:59.638107356 -0500 -@@ -198,7 +198,7 @@ +diff --git a/Makefile.in b/Makefile.in +index 7af5d51..a64aa7c 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -198,7 +198,7 @@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ @@ -31,7 +41,7 @@ wmforkplop_SOURCES = wmforkplop.c wmforkplop.h util.c util.h procstat.c procstat.h global.h dockapp_imlib2.c dockapp_imlib2.h wmforkplop_LDADD = -lm $(IMLIB2_LIBS) $(LIBGTOP_LIBS) wmforkplop_CFLAGS = $(IMLIB2_CFLAGS) $(LIBGTOP_CFLAGS) -@@ -206,7 +206,7 @@ +@@ -206,7 +206,7 @@ LIBTOOLSUX_GKFORKPLOP_SRC = wmforkplop.c util.c util.h procstat.c procstat.h glo gkforkplop_so_SOURCES = $(LIBTOOLSUX_GKFORKPLOP_SRC) gkforkplop_so_CFLAGS = -DGKRELLM -fPIC $(GTK2_CFLAGS) $(IMLIB2_CFLAGS) $(LIBGTOP_CFLAGS) gkforkplop_so_LDFLAGS = -shared -Wl $(IMLIB2_LIBS) $(LIBGTOP_LIBS) -lm diff -Nru wmforkplop-0.9.3/debian/patches/series wmforkplop-0.9.3/debian/patches/series --- wmforkplop-0.9.3/debian/patches/series 2020-06-01 21:12:32.000000000 -0400 +++ wmforkplop-0.9.3/debian/patches/series 2020-06-01 20:27:48.000000000 -0400 @@ -1,3 +1,5 @@ help.diff dejavu.diff pkg-data.diff +0004-dockapp_imlib2.c-No-more-usr-X11R6-and-fonts-ttf.patch +0005-configure.ac-Modernize.patch diff -Nru wmforkplop-0.9.3/debian/rules wmforkplop-0.9.3/debian/rules --- wmforkplop-0.9.3/debian/rules 2020-06-01 21:12:32.000000000 -0400 +++ wmforkplop-0.9.3/debian/rules 2020-06-01 20:13:37.000000000 -0400 @@ -1,14 +1,4 @@ #!/usr/bin/make -f -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/autotools.mk -include /usr/share/cdbs/1/rules/patchsys-quilt.mk - -makebuilddir/wmforkplop:: - @if [ -f Vera.ttf ]; then \ - echo 'The files Vera.* must be removed from the *.orig.tar.gz.'; \ - exit 1; \ - fi - -binary-predeb/wmforkplop:: - rmdir $(DEB_DESTDIR)/usr/share/wmforkplop +%: + dh $@ diff -Nru wmforkplop-0.9.3/debian/source/format wmforkplop-0.9.3/debian/source/format --- wmforkplop-0.9.3/debian/source/format 1969-12-31 19:00:00.000000000 -0500 +++ wmforkplop-0.9.3/debian/source/format 2020-06-01 20:27:47.000000000 -0400 @@ -0,0 +1 @@ +3.0 (quilt)
