--- xbattbar-1.4.4.orig/Makefile +++ xbattbar-1.4.4/Makefile @@ -4,20 +4,23 @@ TARGET = xbattbar APM_CHECK = xbattbar-check-apm +CPPFLAGS = -D_FORTIFY_SOURCE=2 +CFLAGS = -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Werror=format-security $(CPPFLAGS) +LDFLAGS = -Wl,-z,relro all: $(TARGET) $(APM_CHECK) $(TARGET): obj/xbattbar.o - gcc -o $@ $< -lX11 + gcc -o $@ $< -lX11 $(LDFLAGS) obj/xbattbar.o: xbattbar.c obj/stamp - gcc -MMD -o $@ -c $< + gcc -MMD -o $@ -c $< $(CFLAGS) $(APM_CHECK): obj/xbattbar-check-apm.o - gcc -o $@ $< + gcc -o $@ $< $(LDFLAGS) obj/xbattbar-check-apm.o: xbattbar-check-apm.c obj/stamp - gcc -MMD -D$(OS_TYPE) -o $@ -c $< + gcc -MMD -D$(OS_TYPE) -o $@ -c $< $(CFLAGS) obj/stamp: mkdir obj --- xbattbar-1.4.4.orig/xbattbar.man +++ xbattbar-1.4.4/xbattbar.man @@ -85,20 +85,17 @@ .Nm xbattbar tries to know its battery status in every 10 seconds in default. This is achived by APM polling. - .Pp If it is used with option .Nm -c then ACPI polling will be used. - .Pp If it is used with option .Nm -r then sysfs polling will be used (thanks to Elena Grandi for the script). - .Pp You can use your external script for check battery status. It must print two lines to --- xbattbar-1.4.4.orig/debian/changelog +++ xbattbar-1.4.4/debian/changelog @@ -0,0 +1,78 @@ +xbattbar (1.4.4-1) unstable; urgency=low + + * Add support for getting battery data from /sys/class/power_supply, + thanks to Elena Grandi for script, + closes: #684491. + * Add option '-r' to use the script. + * Update manpage. + + -- Dmitry E. Oboukhov Thu, 17 Oct 2013 11:19:57 +0400 + +xbattbar (1.4.3-1) unstable; urgency=low + + * New maintainer, closes: #524997, #526834; + * Upstream version has been incremented. + * Upstream make system was rewritten. + * Added ACPI support for xbattbar. + * Fixed description, closes: #517682. + * Unnecessary dependencies have been dropped. + * Manpage has been updated. + * Standards-Version has been bumped to 3.8.1. + * GIT-repo has been created on git.debian.org. + + -- Dmitry E. Oboukhov Mon, 04 May 2009 09:04:05 +0400 + +xbattbar (1.4.2-5.1) unstable; urgency=low + + * Non-maintainer upload. + * debian/control: + + Add libxext-dev to Build-Depends (Closes: #449121). + * debian/menu: + + Update to the new menu policy (Closes: #485762). + + -- Marco Rodrigues Wed, 11 Jun 2008 10:38:15 +0100 + +xbattbar (1.4.2-5) unstable; urgency=low + + * New Maintainer (Closes: #366524) + * Added references to xbattbar-acpi (Closes: #430609) + + -- Davide Truffa Sun, 01 Jul 2007 18:15:54 +0200 + +xbattbar (1.4.2-4) unstable; urgency=high + + * Build-depend on xutils-dev for the X11R7 transition, and adjust the + packaging to use the FHS paths (closes: #366400) + * Bumped Standards-Version to 3.7.2 + * Bumped debhelper compatibility level to 4.0.0 + + -- Thomas Seyrat Mon, 8 May 2006 17:32:44 +0200 + +xbattbar (1.4.2-3.1) unstable; urgency=low + + * Non-maintainer upload. + * Remove Build-Dependency on xlibs-dev (Closes: #346759). + * Credit and Big Thanks to Nico Golde for the patch and + testing. + + -- Amaya Rodrigo Sastre Wed, 18 Jan 2006 16:25:54 +0100 + +xbattbar (1.4.2-3) unstable; urgency=low + + * Improved description (thanks to Martin Schulze) (closes: #146973) + * Previous upload closes: #146517, #146538 + + -- Thomas Seyrat Tue, 14 May 2002 21:12:13 +0200 + +xbattbar (1.4.2-2) unstable; urgency=low + + * Added missing build dependency on xlibs-dev. + + -- Thomas Seyrat Mon, 13 May 2002 20:38:14 +0200 + +xbattbar (1.4.2-1) unstable; urgency=low + + * Initial Release. (closes: #144739) + + -- Thomas Seyrat Wed, 1 May 2002 18:10:15 +0200 + --- xbattbar-1.4.4.orig/debian/copyright +++ xbattbar-1.4.4/debian/copyright @@ -0,0 +1,33 @@ +This package was debianized by Thomas Seyrat on +Mon, 29 Apr 2002 14:37:09 +0200. + +The current Debian maintainer is Davide truffa + +It was downloaded from http://iplab.aist-nara.ac.jp/member/suguru/xbattbar.html +It was modified by Dmitry E. Oboukhov + +Upstream Author: Suguru Yamaguchi + + Copyright (c) 1998-2001 Suguru Yamaguchi + Copyright (c) Dmitry E. Oboukhov + + +License: + + This package 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; version 2 dated June, 1991. + + This package 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 package; if not, write to the Free Software Foundation, + Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. + +On Debian systems, the complete text of the GNU General Public License, +version 2, can be found in /usr/share/common-licenses/GPL-2. +The Debian packaging is (C) 2007, Davide Truffa and +is licensed under the GPL, see above. --- xbattbar-1.4.4.orig/debian/docs +++ xbattbar-1.4.4/debian/docs @@ -0,0 +1 @@ +README --- xbattbar-1.4.4.orig/debian/compat +++ xbattbar-1.4.4/debian/compat @@ -0,0 +1 @@ +5 --- xbattbar-1.4.4.orig/debian/rules +++ xbattbar-1.4.4/debian/rules @@ -0,0 +1,58 @@ +#!/usr/bin/make -f +#export DH_VERBOSE=1 + +build: build-stamp + +build-stamp: + dh_testdir + $(MAKE) + touch build-stamp + +clean: + dh_testdir + dh_testroot + rm -f build-stamp configure-stamp + $(MAKE) clean + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + $(MAKE) install OS_TYPE=linux DESTDIR=$(CURDIR)/debian/xbattbar + +build-arch: build-stamp +build-indep: build-stamp + +binary-indep: build install + +binary-arch: build install + dh_testdir + dh_testroot + dh_installmenu + dh_installdocs + dh_installchangelogs + dh_link + dh_strip + dh_compress + dh_fixperms + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + + +package_version := $(shell dpkg-parsechangelog \ + |grep ^Version|awk '{print $$2}'|sed 's/-.*//') + +tarball: + test -d ../xbattbar-$(package_version) + cd .. && tar --exclude=debian --exclude=.git -czvf \ + xbattbar_$(package_version).orig.tar.gz \ + xbattbar-$(package_version) + + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install configure --- xbattbar-1.4.4.orig/debian/menu +++ xbattbar-1.4.4/debian/menu @@ -0,0 +1,2 @@ +?package(xbattbar):needs="X11" section="Applications/System/Monitoring"\ + title="Xbattbar" command="/usr/bin/xbattbar" --- xbattbar-1.4.4.orig/debian/control +++ xbattbar-1.4.4/debian/control @@ -0,0 +1,25 @@ +Source: xbattbar +Section: x11 +Priority: optional +Maintainer: Dmitry E. Oboukhov +Build-Depends: debhelper (>> 5.0.0), libx11-dev +Standards-Version: 3.9.3 +VCS-Git: git://git.debian.org/collab-maint/xbattbar.git +VCS-Browser: http://git.debian.org/?p=collab-maint/xbattbar.git;a=summary + +Package: xbattbar +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, python +Recommends: acpi +Description: Display battery status in X11 + Xbattbar displays the current (laptop) battery status in the X window + environment. Battery status is obtained through the APM interface. + . + The battery indicator of this program is very simple: a simple bar + at the top/bottom of your display. With its color, it indicates the + AC-line status (plugged in or off-line), and battery charging/remaining + level. Also, if the mouse cursor enters the indicator window, a popup + diagnosis window comes up in the center of your display showing the + current AC line status and battery level. + . + This package supports ACPI and APM checks for battery status.