[Pkg-wmaker-commits] [wmhdplop] 02/40: Imported Debian patch 0.9.9-2.1

Doug Torrance dtorrance-guest at moszumanska.debian.org
Mon Aug 17 11:10:09 UTC 2015


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

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

commit d64d33e7aad1974b7561441a3711f7ade7f3f87f
Author: gregor herrmann <gregoa at debian.org>
Date:   Sat Apr 21 12:22:09 2012 +0200

    Imported Debian patch 0.9.9-2.1
---
 debian/changelog                              | 67 +++++++++++++++++++++++++
 debian/compat                                 |  1 +
 debian/control                                | 25 ++++++++++
 debian/copyright                              | 34 +++++++++++++
 debian/dirs                                   |  1 +
 debian/docs                                   |  2 +
 debian/gkrellm-hdplop.dirs                    |  1 +
 debian/manpages                               |  1 +
 debian/menu                                   |  2 +
 debian/patches/fix-ftbfs-gcc-4.7-667415.patch | 27 ++++++++++
 debian/patches/series                         |  1 +
 debian/rules                                  | 71 +++++++++++++++++++++++++++
 debian/source/format                          |  1 +
 debian/watch                                  |  2 +
 debian/wmhdplop.1                             | 22 +++++++++
 15 files changed, 258 insertions(+)

diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000..c090fb0
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,67 @@
+wmhdplop (0.9.9-2.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Handle config.{guess,sub} with autotools-dev helpers; otherwise the build
+    fails very early with "dpkg-source: error: aborting due to unexpected
+    upstream changes" if autotools-dev is installed.
+  * Fix "ftbfs with GCC-4.7": add patch from Paul Tagliamonte.
+    (Closes: #667415)
+
+ -- gregor herrmann <gregoa at debian.org>  Sat, 21 Apr 2012 12:22:09 +0200
+
+wmhdplop (0.9.9-2) unstable; urgency=low
+
+  * Update my email address.
+  * Move homepage field. (Closes: #615271, #615378)
+  * Bump debhelper version to 8.
+  * Bump standards version to 3.9.2.
+  * debian/control: Drop article from short description.
+  * debian/watch: Added.
+  * debian/copyright: Reformat and fix FSF address.
+
+ -- Gürkan Sengün <gurkan at phys.ethz.ch>  Wed, 07 Dec 2011 12:02:15 +0100
+
+wmhdplop (0.9.9-1) unstable; urgency=low
+
+  * New upstream version.
+  * Bump standards version.
+  * Fixed debian/copyright.
+  * Cleaned up debian/rules.
+  * Ack previos NMUs, thanks to Marc Brockschmidt.
+
+ -- Gürkan Sengün <gurkan at linuks.mine.nu>  Thu, 02 Aug 2007 10:17:22 +0200
+
+wmhdplop (0.9.7-1.2) unstable; urgency=low
+
+  * Non-maintainer upload
+  * Only build-depend on gkrellm. (Closes: #349104)
+
+ -- Marc 'HE' Brockschmidt <he at debian.org>  Sat, 21 Jan 2006 21:18:18 +0100
+
+wmhdplop (0.9.7-1.1) unstable; urgency=low
+
+  * Non-maintainer upload
+  * Splitted xlibs-dev build-dep (Closes: #347097)
+
+ -- Marc 'HE' Brockschmidt <he at debian.org>  Sat, 21 Jan 2006 00:22:27 +0100
+
+wmhdplop (0.9.7-1) unstable; urgency=low
+
+  * New upstream release.
+  * Updated standards version to 3.6.2.
+  * Removed comments from debian/rules.
+
+ -- Gürkan Sengün <gurkan at linuks.mine.nu>  Wed, 21 Sep 2005 22:28:27 +0200
+
+wmhdplop (0.9.5-1) unstable; urgency=low
+
+  * New upstream release. (closes: #257760)
+  * Added a font package to debian/control.
+
+ -- Gürkan Sengün <gurkan at linuks.mine.nu>  Thu,  8 Jul 2004 20:46:42 +0200
+
+wmhdplop (0.9.4-1) unstable; urgency=low
+
+  * Initial Release.
+
+ -- Gürkan Sengün <gurkan at linuks.mine.nu>  Fri, 25 Jun 2004 18:46:18 +0200
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..45a4fb7
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+8
diff --git a/debian/control b/debian/control
new file mode 100644
index 0000000..e5432f7
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,25 @@
+Source: wmhdplop
+Section: x11
+Priority: optional
+Maintainer: Gürkan Sengün <gurkan at phys.ethz.ch>
+Build-Depends: debhelper (>= 8), libgtk2.0-dev, libimlib2-dev, gkrellm, libx11-dev, libxext-dev, libxt-dev, autotools-dev (>= 20100122.1)
+Homepage: http://hules.free.fr/wmhdplop
+Standards-Version: 3.9.2
+
+Package: wmhdplop
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Recommends: hddtemp, ttf-freefont
+Description: hard drive activity monitor dockapp
+ It monitors your hard drives by sending visual stimuli to your cortex
+ each time your /dev/hdx writes or reads anything. Try to launch
+ openoffice and enjoy the wmhdplop show.
+
+Package: gkrellm-hdplop
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Recommends: hddtemp, ttf-freefont
+Description: hard drive activity monitor GKrellM plugin
+ It monitors your hard drives by sending visual stimuli to your cortex
+ each time your /dev/hdx writes or reads anything. Try to launch
+ openoffice and enjoy the wmhdplop show.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 0000000..acaef74
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,34 @@
+This package was debianized by:
+
+    Gürkan Sengün <gurkan at phys.ethz.ch> on Fri, 25 Jun 2004 18:46:18 +0200.
+
+It was downloaded from:
+
+    http://hules.free.fr/wmhdplop
+
+Upstream Authors:
+
+    Julien Pommier <hules at free.fr> (wmhdplop),
+    Frederic Jolly <jolly.frederic at fnac.net> (gkhdplop)
+
+License:
+
+    Copyright 2003-2007 Julien Pommier
+    Copyright 2004-2007 Frederic Jolly
+
+    This program is free software; you can redistribute it and/or modify
+    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 program 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 program; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+
+On Debian GNU systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.
diff --git a/debian/dirs b/debian/dirs
new file mode 100644
index 0000000..e772481
--- /dev/null
+++ b/debian/dirs
@@ -0,0 +1 @@
+usr/bin
diff --git a/debian/docs b/debian/docs
new file mode 100644
index 0000000..50bd824
--- /dev/null
+++ b/debian/docs
@@ -0,0 +1,2 @@
+NEWS
+README
diff --git a/debian/gkrellm-hdplop.dirs b/debian/gkrellm-hdplop.dirs
new file mode 100644
index 0000000..a34f173
--- /dev/null
+++ b/debian/gkrellm-hdplop.dirs
@@ -0,0 +1 @@
+usr/lib/gkrellm2/plugins
diff --git a/debian/manpages b/debian/manpages
new file mode 100644
index 0000000..64612f3
--- /dev/null
+++ b/debian/manpages
@@ -0,0 +1 @@
+debian/wmhdplop.1
diff --git a/debian/menu b/debian/menu
new file mode 100644
index 0000000..35db2ca
--- /dev/null
+++ b/debian/menu
@@ -0,0 +1,2 @@
+?package(wmhdplop):needs="X11" section="Applications/System/Monitoring"\
+  title="wmhdplop" command="/usr/bin/wmhdplop"
diff --git a/debian/patches/fix-ftbfs-gcc-4.7-667415.patch b/debian/patches/fix-ftbfs-gcc-4.7-667415.patch
new file mode 100644
index 0000000..3721306
--- /dev/null
+++ b/debian/patches/fix-ftbfs-gcc-4.7-667415.patch
@@ -0,0 +1,27 @@
+Description: Fix GCC 4.7 FTBFS
+ -Wl needs to have values passed to it so that it can pass those on to the
+ linker.
+Author: Paul Tagliamonte <paultag at ubuntu.com>
+Bug-Debian: http://bugs.debian.org/667415
+Origin: vendor
+
+--- wmhdplop-0.9.9.orig/Makefile.am
++++ wmhdplop-0.9.9/Makefile.am
+@@ -18,6 +18,6 @@ LIBTOOLSUX_GKHDPLOP_SRC=wmhdplop.c util.
+ 
+ gkhdplop_so_SOURCES=$(LIBTOOLSUX_GKHDPLOP_SRC)
+ gkhdplop_so_CFLAGS=-DGKRELLM -fPIC $(GTK2_CFLAGS) $(IMLIB2_CFLAGS)
+-gkhdplop_so_LDFLAGS=-shared -Wl $(IMLIB2_LIBS) -lm
++gkhdplop_so_LDFLAGS=-shared $(IMLIB2_LIBS) -lm
+ 
+ all: @GKHDPLOP@
+--- wmhdplop-0.9.9.orig/Makefile.in
++++ wmhdplop-0.9.9/Makefile.in
+@@ -202,7 +202,7 @@ wmhdplop_CFLAGS = $(IMLIB2_CFLAGS)
+ LIBTOOLSUX_GKHDPLOP_SRC = wmhdplop.c util.c util.h procstat.c procstat.h devnames.c devnames.h global.h dockapp_imlib2.c dockapp_imlib2.h gkrellm_hdplop.c
+ gkhdplop_so_SOURCES = $(LIBTOOLSUX_GKHDPLOP_SRC)
+ gkhdplop_so_CFLAGS = -DGKRELLM -fPIC $(GTK2_CFLAGS) $(IMLIB2_CFLAGS)
+-gkhdplop_so_LDFLAGS = -shared -Wl $(IMLIB2_LIBS) -lm
++gkhdplop_so_LDFLAGS = -shared $(IMLIB2_LIBS) -lm
+ all: config.h
+ 	$(MAKE) $(AM_MAKEFLAGS) all-am
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..41c093d
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+fix-ftbfs-gcc-4.7-667415.patch
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 0000000..ba8aab6
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,71 @@
+#!/usr/bin/make -f
+# 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)
+
+CFLAGS = -Wall -g
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+	CFLAGS += -O0
+else
+	CFLAGS += -O2
+endif
+
+config.status: configure
+	dh_testdir
+	dh_autotools-dev_updateconfig
+	CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --enable-gkrellm
+
+build: build-arch build-indep
+build-arch: build-stamp
+build-indep: build-stamp
+
+build-stamp:  config.status
+	dh_testdir
+	$(MAKE)
+	touch build-stamp
+
+clean:
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp
+	[ ! -f Makefile ] || $(MAKE) distclean
+	dh_autotools-dev_restoreconfig
+	dh_clean
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_prep
+	dh_installdirs
+	$(MAKE) install DESTDIR=$(CURDIR)/debian/wmhdplop
+	cp gkhdplop.so $(CURDIR)/debian/gkrellm-hdplop/usr/lib/gkrellm2/plugins
+
+# Build architecture-independent files here.
+binary-indep: build install
+# We have nothing to do by default.
+
+# Build architecture-dependent files here.
+binary-arch: build install
+	dh_testdir
+	dh_testroot
+	dh_installchangelogs ChangeLog
+	dh_installdocs
+	dh_installmenu
+	dh_installman
+	dh_link
+	dh_strip
+	dh_compress
+	dh_fixperms
+	dh_installdeb
+	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..da368fd
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,2 @@
+version=3
+http://hules.free.fr/wmhdplop/ wmhdplop-([\d\.]+)\.tar\.gz
\ No newline at end of file
diff --git a/debian/wmhdplop.1 b/debian/wmhdplop.1
new file mode 100644
index 0000000..a30d9a0
--- /dev/null
+++ b/debian/wmhdplop.1
@@ -0,0 +1,22 @@
+.TH WMHDPLOP 1 "June 25, 2004"
+.SH NAME
+wmhdplop \- hard drive monitor dockapp
+.SH SYNOPSIS
+.B wmhdplop
+.RI [ options ]
+.SH DESCRIPTION
+This manual page documents briefly the
+.B wmhdplop
+command.
+This manual page was written for the Debian distribution
+because the original program does not have a manual page.
+.PP
+\fBwmhdplop\fP is a program that monitors hard drive activity and
+displays it graphically in a dockapp.
+.SH OPTIONS
+These programs follow the usual GNU command line syntax, with long
+options starting with two dashes (`-').
+Please run wmhdplop \-h to get a summary of options.
+.SH AUTHOR
+This manual page was written by G\[:u]rkan Seng\[:u]n <gurkan at linuks.mine.nu>,
+for the Debian project (but may be used by others).

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



More information about the Pkg-wmaker-commits mailing list