[Pkg-wmaker-commits] [wmbatppc] 04/35: Imported Debian patch 2.5-1

Doug Torrance dtorrance-guest at moszumanska.debian.org
Sat Aug 22 02:23:47 UTC 2015


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

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

commit e6e4983e1012142a8235c3d5bfdf799ad216af55
Merge: b723475 e6041a8
Author: Julien BLACHE <jblache at debian.org>
Date:   Wed Oct 13 19:55:47 2004 +0200

    Imported Debian patch 2.5-1

 Makefile         |   17 +-
 README           |    5 +
 debian/changelog |   55 ++
 debian/compat    |    1 +
 debian/control   |   21 +-
 debian/copyright |    7 +-
 debian/menu      |    2 +-
 debian/rules     |   20 +-
 wmbatppc.1       |   67 ++-
 wmbatppc.c       | 1524 +++++++++++++++++++++++++++++++++++++-----------------
 wmbatppc.h       |  232 +++++----
 11 files changed, 1341 insertions(+), 610 deletions(-)

diff --cc debian/changelog
index 6f3cd45,0000000..8f4cac5
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,17 -1,0 +1,72 @@@
++wmbatppc (2.5-1) unstable; urgency=low
++
++  * New upstream release.
++    + Fixes compilation without XOSD.
++    + Adds a switch to disable XOSD at runtime.
++  * debian/control:
++    + Replaced xlibs-dev B-D by B-D on the individual X libs packages.
++
++ -- Julien BLACHE <jblache at debian.org>  Wed, 13 Oct 2004 19:55:47 +0200
++
++wmbatppc (2.4-2) unstable; urgency=low
++
++  * wmbatppc.c
++    + Fixed compilation without XOSD (closes: #244725).
++  * debian/menu
++    + Fixed the various errors.
++
++ -- Julien BLACHE <jblache at debian.org>  Thu, 20 May 2004 20:30:13 +0200
++
++wmbatppc (2.4-1) unstable; urgency=low
++
++  * New upstream release.
++    + Fixed a crash when xosd cannot set a suitable font (wrt locale and UTF8).
++
++ -- Julien BLACHE <jblache at debian.org>  Sun, 22 Feb 2004 13:49:27 +0100
++
++wmbatppc (2.3-1) unstable; urgency=low
++
++  * New upstream release.
++    + Fixed /proc/pmu/ parsing.
++  * Bumped Standards-Version to 3.6.0 (no changes).
++
++ -- Julien BLACHE <jblache at debian.org>  Wed, 23 Jul 2003 16:48:46 +0200
++
++wmbatppc (2.1-1) unstable; urgency=low
++
++  * Small bugfix, this is the first version uploaded since 1.2-1.
++
++ -- Julien BLACHE <jblache at debian.org>  Sun, 26 Jan 2003 16:16:07 +0100
++
++wmbatppc (2.0-1) unstable; urgency=low
++
++  * New upstream release, a bunch of new features.
++  * New description.
++
++ -- Julien BLACHE <jblache at debian.org>  Wed, 27 Nov 2002 22:09:30 +0100
++
++wmbatppc (1.2-1) unstable; urgency=low
++
++  * Added support for UNIX domain sockets (-u switch).
++  * Added support for /proc/pmu (-p swithc).
++  * Bumped upstream version, at author's request.
++  
++ -- Julien BLACHE <jblache at debian.org>  Wed, 16 Oct 2002 20:40:58 +0200
++
 +wmbatppc (1.0-1) unstable; urgency=low
 +
 +  * New upstream release.
 +  * Modified the menu to run wmbatppc -w (WindowMaker mode).
 +
 + -- Julien BLACHE <jblache at debian.org>  Mon, 29 Oct 2001 13:23:46 +0100
 +
 +wmbatppc (0.2-1) unstable; urgency=low
 +
 +  * Initial Release (closes: Bug#114191).
 +  * Reworked the description.
 +
 + -- Julien BLACHE <jblache at debian.org>  Sun,  2 Sep 2001 21:09:51 +0200
 +
 +Local variables:
 +mode: debian-changelog
 +End:
diff --cc debian/compat
index 0000000,0000000..b8626c4
new file mode 100644
--- /dev/null
+++ b/debian/compat
@@@ -1,0 -1,0 +1,1 @@@
++4
diff --cc debian/control
index f236450,0000000..afc2ba1
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,22 -1,0 +1,27 @@@
 +Source: wmbatppc
 +Section: utils
 +Priority: optional
 +Maintainer: Julien BLACHE <jblache at debian.org>
- Build-Depends: debhelper (>> 3.0.0), xlibs-dev
- Standards-Version: 3.5.2
++Build-Depends: debhelper (>> 4.0.0), libxosd-dev (>= 2.0.2-1), libxext-dev, libx11-dev, libxpm-dev
++Standards-Version: 3.6.1
 +
 +Package: wmbatppc
 +Architecture: powerpc
- Depends: pmud, ${shlibs:Depends}
- Suggests: wmaker
++Depends: ${shlibs:Depends}
++Suggests: wmaker, pmud
 +Description: Battery monitor for Apple G3/G4 ibooks/powerbooks
-  wmbatppc displays the status of your laptop's battery in a dock icon.
-  This is aimed at PPC laptops, suchs as iBooks and PowerBooks G3 or G4.
++ wmbatppc displays the status of your laptop's battery in a dock icon,
++ and features an On-Screen Display to remind you of the battery state.
++ This is aimed at PPC laptops, suchs as iBooks and PowerBooks G3 or G4 ;
++ laptops with two batteries are supported.
++ .
++ A command-line utility called batppc is also provided to access battery
++ information from the console.
 + .
 + The status infos include the charge of the battery, the voltage, whether
 + your laptop is plugged in or not, whether the battery is charging
-  or not, the time remaining (both se and charge) and the level of the
++ or not, the time remaining (both use and charge) and the level of the
 + battery (it indicates the level of each battery if your laptop has two
 + bays).
 + .
-  This package depends on pmud which provides the informations.
++ This package suggests pmud which can be used as a source of information.
diff --cc debian/copyright
index 99f8582,0000000..164a760
mode 100644,000000..100644
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,15 -1,0 +1,18 @@@
 +This package was debianized by Julien BLACHE <jblache at debian.org> on
 +Sun,  2 Sep 2001 21:08:22 +0200.
 +
- It was downloaded from http://titelou.free.fr/wmbatppc/
++It was downloaded from http://jblache.nerim.net/wmbatppc/
++                       (originally from http://titelou.free.fr/wmbatppc/)
 +
- Upstream Author: Carine BOURNEZ <titelou at free.fr>
++Upstream Authors: Carine BOURNEZ <titelou at free.fr>
++                  Julien BLACHE <jb at jblache.org>
 +
 +Copyright:
 +
 +This program is released under a totally free license, see
 +/usr/share/doc/wmbatppc/COPYING for more infos. (in short: do what you want,
 +and feel free to send feedback, ideas, bug reports and chocolate to its author)
++
 +However, it uses some piece of code from other softwares that are licensed under
 +the terms of the GNU General Public License. On Debian systems, the text of
 +the GNU General Public License can be found in /usr/share/common-licenses/GPL.
diff --cc debian/menu
index a1ea4fa,0000000..b6de0e2
mode 100644,000000..100644
--- a/debian/menu
+++ b/debian/menu
@@@ -1,2 -1,0 +1,2 @@@
- ?package(wmbatppc):needs=wm section=Apps/System\
++?package(wmbatppc):needs="X11" section="Apps/System"\
 +  title="wmbatppc" command="/usr/bin/wmbatppc -w"
diff --cc debian/rules
index 267ee3f,0000000..0cb3d3a
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,83 -1,0 +1,69 @@@
 +#!/usr/bin/make -f
 +# Sample debian/rules that uses debhelper.
 +# GNU copyright 1997 to 1999 by Joey Hess.
 +
 +# Uncomment this to turn on verbose mode.
 +#export DH_VERBOSE=1
 +
- # This is the debhelper compatability version to use.
- export DH_COMPAT=3
- 
 +configure: configure-stamp
 +configure-stamp:
 +	dh_testdir
 +	# Add here commands to configure the package.
 +
 +	touch configure-stamp
 +
 +build: configure-stamp build-stamp
 +build-stamp:
 +	dh_testdir
 +
 +	# Add here commands to compile the package.
 +	$(MAKE)
- 	#/usr/bin/docbook-to-man debian/wmbatppc.sgml > wmbatppc.1
 +
 +	touch build-stamp
 +
 +clean:
 +	dh_testdir
 +	dh_testroot
 +	rm -f build-stamp configure-stamp
 +
 +	# Add here commands to clean up after the build process.
 +	-$(MAKE) clean
 +
 +	dh_clean
 +
 +install: build
 +	dh_testdir
 +	dh_testroot
 +	dh_clean -k
 +	dh_installdirs
 +
 +	# Add here commands to install the package into debian/wmbatppc.
 +	$(MAKE) install DESTDIR=$(CURDIR)/debian/wmbatppc
 +
++	rm -f $(CURDIR)/debian/wmbatppc/usr/share/man/man1/batppc.1
 +
 +# 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_installdebconf	
 +	dh_installdocs
- #	dh_installexamples
 +	dh_installmenu
- #	dh_installlogrotate
- #	dh_installemacsen
- #	dh_installpam
- #	dh_installmime
- #	dh_installinit
- #	dh_installcron
 +	dh_installman wmbatppc.1
- #	dh_installinfo
- #	dh_undocumented
 +	dh_installchangelogs 
- 	dh_link
++	dh_link usr/share/man/man1/wmbatppc.1.gz usr/share/man/man1/batppc.1.gz \
++		usr/bin/wmbatppc usr/bin/batppc
 +	dh_strip
 +	dh_compress
 +	dh_fixperms
- #	dh_makeshlibs
 +	dh_installdeb
- #	dh_perl
 +	dh_shlibdeps
 +	dh_gencontrol
 +	dh_md5sums
 +	dh_builddeb
 +
 +binary: binary-indep binary-arch
 +.PHONY: build clean binary-indep binary-arch binary install configure

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



More information about the Pkg-wmaker-commits mailing list