[Pkg-wmaker-commits] [wmdiskmon] 04/25: Imported Debian patch 0.0.2-1

[Doug Torrance]

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

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

commit 57c43c0308846bd154e2cb29527d40681791cfac
Merge: 9881dd8 85b0adb
Author: Marc 'HE' Brockschmidt <he at debian.org>
Date:   Sun Aug 16 12:24:04 2009 +0200

    Imported Debian patch 0.0.2-1

 ChangeLog        |  6 ++++++
 configure        | 18 +++++++++---------
 configure.ac     |  4 ++--
 debian/changelog |  8 ++++++++
 debian/compat    |  2 +-
 debian/control   |  4 ++--
 debian/copyright |  2 +-
 debian/rules     | 21 +++++++++++++++++----
 doc/wmdiskmon.1  |  4 ++--
 src/main.c       |  8 ++++----
 10 files changed, 52 insertions(+), 25 deletions(-)

diff --cc debian/changelog
index 5feffe9,0000000..d65f989
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,0 +1,19 @@@
++wmdiskmon (0.0.2-1) unstable; urgency=low
++
++  * Update to new upstream release 0.0.2: Default behaviour changed: Now
++    displays mount points instead of devices.
++  * Updated for new debhelper/policy.
++
++ -- Marc 'HE' Brockschmidt <he at debian.org>  Sun, 16 Aug 2009 12:24:04 +0200
++
 +wmdiskmon (0.0.1-2) unstable; urgency=low
 +
 +  * debian/control: I'm a DD!
 +
 + -- Marc 'HE' Brockschmidt <he at debian.org>  Thu, 15 Jul 2004 19:33:13 +0200
 +
 +wmdiskmon (0.0.1-1) unstable; urgency=low
 +
 +  * Initial Release. (Closes: #233017)
 +
 + -- Marc Brockschmidt <marc at dch-faq.de>  Mon, 16 Feb 2004 12:09:27 +0100
diff --cc debian/compat
index b8626c4,0000000..7f8f011
mode 100644,000000..100644
--- a/debian/compat
+++ b/debian/compat
@@@ -1,1 -1,0 +1,1 @@@
- 4
++7
diff --cc debian/control
index 4146407,0000000..bb1e34f
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,13 -1,0 +1,13 @@@
 +Source: wmdiskmon
 +Section: x11
 +Priority: optional
 +Maintainer: Marc 'HE' Brockschmidt <he at debian.org>
- Build-Depends: libx11-dev | xlibs-dev (>> 4.1.0), libxext-dev | xlibs-dev (>> 4.1.0), libxpm-dev | xlibs-dev (>> 4.1.0), libxt-dev | xlibs-dev (>> 4.1.0), debhelper (>= 4)
- Standards-Version: 3.6.1
++Build-Depends: libx11-dev | xlibs-dev (>> 4.1.0), libxext-dev | xlibs-dev (>> 4.1.0), libxpm-dev | xlibs-dev (>> 4.1.0), libxt-dev | xlibs-dev (>> 4.1.0), debhelper (>= 7), autotools-dev
++Standards-Version: 3.8.3
 +
 +Package: wmdiskmon
 +Architecture: any
 +Depends: ${shlibs:Depends}
 +Description: dockapp to display disk usage
 + wmdiskmon is a dockapp to monitor disk usage. It can be used with X window
 + managers like WindowMaker, AfterStep, BlackBox and Enlightenment. 
diff --cc debian/copyright
index 10812e0,0000000..45a4c1e
mode 100644,000000..100644
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,15 -1,0 +1,15 @@@
 +This package was debianized by Marc Brockschmidt <marc at dch-faq.de> on
 +Mon, 16 Feb 2004 12:24:17 +0100.
 +
 +It was downloaded from http://tnemeth.free.fr/projets/dockapps.html
 +
 +Upstream Author: Thomas Nemeth <tnemeth at free.fr>
 +
- Copyright: (c) Thomas Nemeth 2004
++Copyright: (c) Thomas Nemeth 2004, 2005
 +
 +wmdiskmon is released under the terms of the GNU GPL version 2.
 +
 +On Debian GNU/Linux systems, the complete text of the GNU
 +General Public License version 2 can be found in 
 +/usr/share/common-licenses/GPL-2.
 +
diff --cc debian/rules
index 71abb96,0000000..dade58e
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,63 -1,0 +1,76 @@@
 +#!/usr/bin/make -f
 +
 +TMP=$(CURDIR)/debian/wmdiskmon
 +
 +CFLAGS = -Wall -g
 +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
 +        CFLAGS += -O0
 +else
 +        CFLAGS += -O2
 +endif
 +
 +configure: configure-stamp
 +configure-stamp:
 +	dh_testdir
++	if [ -r /usr/share/misc/config.sub ]; then\
++		mv $(CURDIR)/config.sub $(CURDIR)/config.sub.backup;\
++		cp /usr/share/misc/config.sub $(CURDIR)/config.sub;\
++	fi
++	if [ -r /usr/share/misc/config.guess ]; then\
++		mv $(CURDIR)/config.guess $(CURDIR)/config.guess.backup;\
++		cp /usr/share/misc/config.guess $(CURDIR)/config.guess;\
++	fi
 +	CFLAGS="$(CFLAGS)" ./configure --prefix=/usr --mandir=/usr/share/man
 +	touch configure-stamp
 +
 +build: configure build-stamp
 +build-stamp:
 +	dh_testdir
 +	$(MAKE)
 +	touch build-stamp
 +
 +clean:
 +	dh_testdir
 +	dh_testroot
- 	-$(MAKE) maintainer-clean
++	[ ! -f Makefile ] || $(MAKE) maintainer-clean
++	if [ -r $(CURDIR)/config.sub.backup ]; then\
++		mv $(CURDIR)/config.sub.backup $(CURDIR)/config.sub;\
++	fi
++	if [ -r $(CURDIR)/config.guess.backup ]; then\
++		mv $(CURDIR)/config.guess.backup $(CURDIR)/config.guess;\
++	fi
++
 +	dh_clean build-stamp install-stamp configure-stamp
 +
 +install: install-stamp
 +install-stamp: build-stamp
 +	dh_testdir
 +	dh_testroot
- 	dh_clean -k
++	dh_prep
 +	$(MAKE) install DESTDIR=$(TMP)
 +	touch install-stamp
 +
 +# 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_installdocs
 +	dh_installexamples
 +	dh_installmenu
 +	dh_installmanpages
 +	dh_installchangelogs ChangeLog
- ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
 +	dh_strip
- endif
 +	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

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