--- bbtime-0.1.5.orig/Makefile.am +++ bbtime-0.1.5/Makefile.am @@ -1,6 +1,6 @@ CPPFLAGS = @CPPFLAGS@ \ - -DDEFAULT_CONF=\"$(datadir)/bbtools/bbtime.conf\" \ - -DDEFAULT_NOBB=\"$(datadir)/bbtools/bbtime.nobb\" + -DDEFAULT_CONF=\"$(sysconfdir)/bbtools/bbtime.conf\" \ + -DDEFAULT_NOBB=\"$(sysconfdir)/bbtools/bbtime.nobb\" SUBDIRS = data --- bbtime-0.1.5.orig/resource.cc +++ bbtime-0.1.5/resource.cc @@ -462,10 +462,17 @@ } else { delete [] report.strftimeFormat; - int len=strlen("%I:%M %p"); - report.strftimeFormat = new char [len +1]; - memset(report.strftimeFormat,0,len+1); - strncpy(report.strftimeFormat,"%I:%M %p",len); + if(report.clock24Hour) { + int len=strlen("%H:%M"); + report.strftimeFormat = new char [len +1]; + memset(report.strftimeFormat,0,len+1); + strncpy(report.strftimeFormat,"%H:%M",len); + } else { + int len=strlen("%I:%M %p"); + report.strftimeFormat = new char [len +1]; + memset(report.strftimeFormat,0,len+1); + strncpy(report.strftimeFormat,"%I:%M %p",len); + } } #ifdef HAVE_STRFTIME --- bbtime-0.1.5.orig/Makefile.in +++ bbtime-0.1.5/Makefile.in @@ -64,7 +64,7 @@ VERSION = @VERSION@ regex_cmd = @regex_cmd@ -CPPFLAGS = @CPPFLAGS@ -DDEFAULT_CONF=\"$(datadir)/bbtools/bbtime.conf\" -DDEFAULT_NOBB=\"$(datadir)/bbtools/bbtime.nobb\" +CPPFLAGS = @CPPFLAGS@ -DDEFAULT_CONF=\"$(sysconfdir)/bbtools/bbtime.conf\" -DDEFAULT_NOBB=\"$(sysconfdir)/bbtools/bbtime.nobb\" SUBDIRS = data --- bbtime-0.1.5.orig/bbtime.hh +++ bbtime-0.1.5/bbtime.hh @@ -21,6 +21,11 @@ #ifndef __MAIN_HH #define __MAIN_HH +// Added by Timshel Knoll, 22/02/2001 to fix Debian bug #86967 +#ifdef HAVE_STRFTIME +# include +#endif + #include "Image.hh" #include "Basewindow.hh" #include "resource.hh" --- bbtime-0.1.5.orig/bbtime.cc +++ bbtime-0.1.5/bbtime.cc @@ -34,7 +34,7 @@ selected_friend=0; MakeWindow(False); mbmenu->setHighlight(0); - CheckTime(False); + CheckTime(True); Redraw(); } @@ -316,7 +316,7 @@ mbmenu->UpdateTime(tmp+resource->timefriend[i].offset,i); ctmp=tmp + resource->timefriend[selected_friend].offset; if (! (tt = localtime(&ctmp))) return; - if (tt->tm_min != minute || tt->tm_hour != hour || redraw) { + if (redraw || tt->tm_min != minute || tt->tm_hour != hour) { hour = tt->tm_hour; minute = tt->tm_min; --- bbtime-0.1.5.orig/data/Makefile.am +++ bbtime-0.1.5/data/Makefile.am @@ -1,13 +1,12 @@ -configdir = $(datadir)/bbtools +configdir = $(sysconfdir)/bbtools CLEANFILES = bbtoolsrc -config_DATA = bbtoolsrc.in \ - bbtime.conf \ +config_DATA = bbtime.conf \ bbtime.style \ bbtime.nobb \ README.bbtime -EXTRA_DIST = $(config_DATA) +EXTRA_DIST = $(config_DATA) bbtoolsrc.in all-local: bbtoolsrc --- bbtime-0.1.5.orig/data/Makefile.in +++ bbtime-0.1.5/data/Makefile.in @@ -64,13 +64,13 @@ VERSION = @VERSION@ regex_cmd = @regex_cmd@ -configdir = $(datadir)/bbtools +configdir = $(sysconfdir)/bbtools CLEANFILES = bbtoolsrc -config_DATA = bbtoolsrc.in bbtime.conf bbtime.style bbtime.nobb README.bbtime +config_DATA = bbtime.conf bbtime.style bbtime.nobb README.bbtime -EXTRA_DIST = $(config_DATA) +EXTRA_DIST = $(config_DATA) bbtoolsrc.in mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_CLEAN_FILES = DATA = $(config_DATA) --- bbtime-0.1.5.orig/debian/rules +++ bbtime-0.1.5/debian/rules @@ -0,0 +1,119 @@ +#!/usr/bin/make -f +# -*- makefile -*- +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +# DebHelper control +export DH_ALWAYS_EXCLUDE=CVS:.svn + +# 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) + +PACKAGE=bbtime + +CFLAGS = -Wall -g + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 +endif + +config.status: configure + dh_testdir + # Add here commands to configure the package. + CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info + +build: patch build-stamp + +build-stamp: config.status + dh_testdir +ifneq "$(wildcard /usr/share/misc/config.sub)" "" + cp -f /usr/share/misc/config.sub config.sub +endif +ifneq "$(wildcard /usr/share/misc/config.guess)" "" + cp -f /usr/share/misc/config.guess config.guess +endif + + # Add here commands to compile the package. + $(MAKE) + + touch build-stamp + +clean: clean-patched unpatch + +clean-patched: + dh_testdir + dh_testroot + rm -f build-stamp + if [ -e Makefile ]; then $(MAKE) -i distclean; fi + find \( -name config.sub -o -name config.guess \) -print0 | xargs -0 -r rm -f \; + dh_clean + +patch: patch-stamp + +patch-stamp: + dpatch apply-all + dpatch cat-all >patch-stamp + +unpatch: + dpatch deapply-all + rm -rf patch-stamp debian/patched + +install: install-stamp +install-stamp: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + # Add here commands to install the package into debian/bbtime. + $(MAKE) install prefix=$(CURDIR)/debian/tmp/usr sysconfdir=$(CURDIR)/debian/tmp/etc + + rm -f $(CURDIR)/debian/tmp/etc/bbtools/README.$(PACKAGE) + + dh_movefiles + + # remove empty directories + rmdir --ignore-fail-on-non-empty `find debian/tmp -type d | sort -r` + + -@(if [ -d debian/tmp ]; then \ + echo " ***"; \ + echo " *** warning: debian/tmp still has unmoved files in it. " \ + "These files will not"; \ + echo " *** be installed into the $(PACKAGE) package!!!"; \ + echo " ***"; fi) + + touch $@ + + +# 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_installexamples + dh_installmenu + dh_installcron + dh_installinfo + dh_installman + dh_link + dh_strip + dh_compress + dh_fixperms + dh_makeshlibs + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install patch unpatch clean-patched --- bbtime-0.1.5.orig/debian/copyright +++ bbtime-0.1.5/debian/copyright @@ -0,0 +1,27 @@ +This package was debianized by Timshel Knoll on +Thu, 31 Aug 2000 01:28:25 +1100. + +It was downloaded from http://bbtools.windsofstorm.net/sources/ + +Upstream Author: John Kennis + +Copyright: + + Copyright (C) 1998-2000 John Kennis + Translations Copyright (C) 1999 Free Software Foundation, Inc. + 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 Street, Fifth Floor, Boston, MA 02110-1301 USA + +On Debian GNU/Linux systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL'. + + -- Kevin Coyner Tue, 14 Aug 2007 14:16:20 -0400 --- bbtime-0.1.5.orig/debian/compat +++ bbtime-0.1.5/debian/compat @@ -0,0 +1 @@ +5 --- bbtime-0.1.5.orig/debian/control +++ bbtime-0.1.5/debian/control @@ -0,0 +1,21 @@ +Source: bbtime +Section: x11 +Priority: optional +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Kevin Coyner +Build-Depends: debhelper (>= 5), autotools-dev, libice-dev, libsm-dev, libx11-dev, libxt-dev, dpatch +Standards-Version: 3.7.2 + +Package: bbtime +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Suggests: blackbox | fluxbox +Description: Time tool for the blackbox/fluxbox window managers + bbtime is a blackbox tool to display the system time in your + blackbox slit. It can also display other times as an offset + of your local time in a menu. + . + Note that you don't actually need blackbox or fluxbox for this program + to work, but it won't look as good in other window managers. + . + Homepage: http://bbtools.sourceforge.net/ --- bbtime-0.1.5.orig/debian/changelog +++ bbtime-0.1.5/debian/changelog @@ -0,0 +1,186 @@ +bbtime (0.1.5-12ubuntu1) oneiric; urgency=low + + * debian/patches/002-fix-as-needed.dpatch: (LP: #765966) + Libraries should go into X_LIBS instead of LDFLAGS to fix + building with ld --as-needed. + + -- Andreas Moog Sun, 26 Jun 2011 18:26:50 +0000 + +bbtime (0.1.5-12) unstable; urgency=low + + * Add dpatch to Build-Depends in debian/control. + * Add patch to remove stripping from Makefile.in. Closes: #436577. + * Add dpatch language to debian/rules. + * Remove cruft from debian/watch. + + -- Kevin Coyner Tue, 14 Aug 2007 14:32:07 -0400 + +bbtime (0.1.5-11) unstable; urgency=low + + * New e-mail address for maintainer. Changed throughout debian/* files. + * Cleaned up cruft in debian/changelog. + * Updated maintainer name/e-mail at bottom of debian/copyright. + * Cleaned up unneeded comments in debian/rules. + + -- Kevin Coyner Tue, 14 Aug 2007 14:16:20 -0400 + +bbtime (0.1.5-10) unstable; urgency=low + + * Update Standards-Version to 3.7.2 (no changes). + * Added homepage to description in debian/control. + * Bumped up debhelper version to 5.0. + * Added ${misc:Depends} to binary Depends: in debian/control. + * Added missing debian/compat file with value of 5, removed DH_COMPAT + line in debian/rules. + * Corrected address of FSF in debian/copyright. + * In debian/rules, changed use of `pwd` to $(CURDIR) per bug #390383. + + -- Kevin Coyner Wed, 4 Oct 2006 10:59:11 -0400 + +bbtime (0.1.5-9) unstable; urgency=low + + * Small changes to short and long descriptions to include fluxbox + * Added new file debian/watch + * New maintainer (Closes: Bug#285161) + * Added language to debian/rules to create configure.sub and configure.guess + files + * Added autotools-dev to debian/rules Build-Depends + + -- Kevin Coyner Sun, 14 Aug 2005 07:27:40 -0400 + +bbtime (0.1.5-8) unstable; urgency=low + + * QA Upload + * Recompile for g++ transition + * Update Standards-Version to 3.6.2 (no changes) + * Remove needless dependecy on libx11-6 + + -- Frank Lichtenheld Thu, 7 Jul 2005 19:07:40 +0300 + +bbtime (0.1.5-7) unstable; urgency=low + + * QA Group upload orphaning this package + + -- Andrew Pollock Wed, 9 Mar 2005 11:30:32 +1100 + +bbtime (0.1.5-6) unstable; urgency=low + + * Fine, I will do a bit of voodoo programming and add a + dependency on libxt-dev, despite the fact I can see no + reason why it would fix the problem. (Closes: #234838) + * Hoping this is the last release for a while. + + -- David Starner Wed, 25 Feb 2004 23:18:11 -0600 + +bbtime (0.1.5-5) unstable; urgency=low + + * As far as I can tell, the new X11 development packages + no where depend on libx11. Adding that as an explicit + build-dependency. + + -- David Starner Sun, 22 Feb 2004 06:43:06 -0600 + +bbtime (0.1.5-4) unstable; urgency=low + + * Since the new X11 packages have xlibs-dev as a dummy package, + all the architectures which haven't built X yet are trying + to pull in the new X packages and failing. + * May as well update the X11 dependencies to the "new and improved" + ones. + + -- David Starner Sun, 22 Feb 2004 01:01:43 -0600 + +bbtime (0.1.5-3) unstable; urgency=low + + * Avast, ye mateys! We be seizing this here abandonded vessel. + (Closes: #190191) + * It's not valgrind-clean, but there doesn't seem to be any + observable effects from this + + -- David Starner Wed, 18 Feb 2004 03:17:05 -0600 + +bbtime (0.1.5-2) unstable; urgency=low + + * Uploading with maintainer set to QA group + + -- Andrew Pollock Fri, 7 Nov 2003 20:44:48 +1100 + +bbtime (0.1.5-1) unstable; urgency=low + + * New upstream release + + GCC-3.0 fixes in upstream + * Standards-Version 3.5.8: + + Support DEB_BUILD_OPTIONS=noopt, build with -g as default + + -- Timshel Knoll Thu, 28 Nov 2002 12:48:44 +1100 + +bbtime (0.1.3-6) unstable; urgency=low + + * Really fix build errors on hppa (closes: #105056) (again), + thanks to James Troup & LaMont Jones + * Integrated 24 hour clock fix (closes: #121415), thanks to Julien Puydt + + -- Timshel Knoll Mon, 11 Feb 2002 09:58:03 +1100 + +bbtime (0.1.3-5) unstable; urgency=low + + * debian/control: Build-Depends on build-essential libstdc++-dev and g++ + packages removed (closes: #105946), xlib6g-dev -> xlibs-dev + * Integrated NMU fixes (see previous log entry) (closes: #105946, $105056) + * debian/bbtime.1, debian/bbtime.manpages: added manpage bbtime.1, removed + (thanks Chris Tillman ) (closes: #89479) + * debian/rules: DH_COMPAT=3, removed dh_undocumented manpage link, + dh_installmanpages -> dh_installman, debhelper 3 automagically marks + files in /etc as conffiles (closes: #132154) + * debian/copyright: fixed common-licences -> common licenses misspelling + (thanks to Chris Tillman ) (closes: #126911) + * Standards-Version: 3.5.6 (no changes required) + + -- Timshel Knoll Sat, 9 Feb 2002 11:28:01 +1100 + +bbtime (0.1.3-4.1) unstable; urgency=low + + * NMU + * Remove build-depend on (build-essential) libstdc++-dev. Closes: #105946. + * Fix compile errors on hppa. Closes: #105056. + + -- LaMont Jones Thu, 26 Jul 2001 22:31:11 -0600 + +bbtime (0.1.3-4) unstable; urgency=low + + * debian/rules: removed call to deprecated dh_testversion, updated + to DH_COMPAT=2 + * debian/control: added Suggests: blackbox, + Build-Depends: debhelper (>= 2.0.0) + * Changed install location for config files from /usr/share/bbtools + to /etc/bbtools. + * Removed bbtoolsrc.in file from package, now install the generated + bbtoolsrc with dh_installexamples. + * debian/examples: Added files from upstream's data/ dir: + bbtoolsrc, bbtime.conf, bbtime.nobb and bbtime.style. + + -- Timshel Knoll Sun, 25 Mar 2001 00:37:36 +1100 + +bbtime (0.1.3-3) unstable; urgency=low + + * Made bbtime.hh '#include ' if HAVE_STRFTIME is defined + (closes: Bug#86967) + * debian/rules: Removed call to obsolete dh_suidregister, changed install + location from /usr/X11R6 to /usr (to comply with latest policy) + * debian/docs: removed INSTALL documentation - this fixes lintian warning. + + -- Timshel Knoll Tue, 13 Mar 2001 18:18:11 +1100 + +bbtime (0.1.3-2) unstable; urgency=low + + * Renamed usr/share/bbtools/bbtoolsrc.in to bbtoolsrc.in.bbtime, to fix + filename conflict with the bbdate package + (closes: Bug#70776, Bug#82996, Bug#83320, Bug#83655) + + -- Timshel Knoll Sun, 4 Feb 2001 17:58:34 +1100 + +bbtime (0.1.3-1) unstable; urgency=low + + * Initial Release. + + -- Timshel Knoll Thu, 31 Aug 2000 22:16:29 +1100 --- bbtime-0.1.5.orig/debian/bbtime.files +++ bbtime-0.1.5/debian/bbtime.files @@ -0,0 +1,4 @@ +etc/bbtools/bbtime.conf +etc/bbtools/bbtime.style +etc/bbtools/bbtime.nobb +usr/bin/bbtime --- bbtime-0.1.5.orig/debian/examples +++ bbtime-0.1.5/debian/examples @@ -0,0 +1,4 @@ +data/bbtime.conf +data/bbtime.nobb +data/bbtime.style +data/bbtoolsrc --- bbtime-0.1.5.orig/debian/watch +++ bbtime-0.1.5/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://sf.net/bbtools/bbtime-(.*)\.tar\.gz --- bbtime-0.1.5.orig/debian/bbtime.1 +++ bbtime-0.1.5/debian/bbtime.1 @@ -0,0 +1,142 @@ +'\" t +.TH BBTIME 1 "December 29 2001" +.SH NAME +bbtime \- Display the time in a small blackbox style window +.SH SYNOPSIS +.B bbtime +.BI [\-display\ ] +.BI [\-config\ ] +.br +.B " [-spooldir] [-version] [-help] [[-position] | [-pos]]" +.I +.SH "DESCRIPTION" +This manual page documents briefly the +.BR bbtime +command. +.PP +.B bbtime +displays the time in a small blackbox style window. +.SH OPTIONS +A summary of options are included below. +.TP +.BI \-d[isplay]\ +X server to connect to +.TP +.BI \-c[onfig]\ +Alternate config file +.TP +.BI \-bb[config]\ +Alternate Blackbox config file +.TP +.B \-def[ault] +Fall back on default configuration +.TP +.BI \-m[ailbox]\ +Filename of mailbox +.TP +.B \-v[ersion] +Display version number +.TP +.B \-h[elp] +Display this help +.TP +.BI \-p[osition]\ +Set position of window, +.I += +.I [+]|[-]x[+]|[-]y +.TP +.B \-w[withdrawn] +Place bbtool in the Slit +.TP +.B \-s[hape] +Don't display groundplate +.SH "CONFIGURATION" +.PP + +.B Blackbox Users: + +By default +.B bbtime +reads the Blackbox style-file as defined in +.B .blackboxrc +and copies as much of the style as possible. The result is an application +which looks a lot like the toolbar. Further configuration options can be +found in +.BR bbtime.style . +Most likely you want to change these options, +copy this file to somewhere in your homedir (eg +.BR blackbox/bbtime.config ) +and edit it. Edit the file +.B .blackboxrc +and add or edit the line: bbtime.configFile: . + +WARNING: You have to define the entire PATH. + +All style options set by reading the Blackbox-style file can be overridden by +placing them in +.B bbtime.config +(and changing them). See +.B bbtime.style +for all possible options. + +Make sure the file +.B .bbtoolsrc +does not exist, else the configuration style for other Window Managers will be used. + +.B "Users of other Window managers:" + +By default +.B bbtime +reads the +.B bbtoolsrc +and +.B bbtime.nobb +config files. +If you want to define your personal config-file copy +.B bbtoolsrc +to your homedir as +.BR ./.bbtoolsrc . +Copy +.B bbtime.nobb +somewhere in your homedir. +Edit +.B .bbtoolsrc +and add or edit the line: bbtime.configFile: . + +WARNING: You have to define the entire PATH. + +.B Reconfiguration + +Press the right mouse-button on the envelope to cause +.B bbtime +to re-read its settings. +.SH FILES +.PP +.B bbtime +automatically copies the style of the blackbox toolbar. It copies: +.TS +tab (@); +l l. +toolbar@ -> bbtime.frame +toolbar.label@ -> bbtime.label +toolbar.color@ -> bbtime.frame.color +toolbar.colorTo@ -> bbtime.frame.colorTo +toolbar.label.color@ -> bbtime.label.color +toolbar.label.colorTo@ -> bbtime.label.colorTo +toolbar.textColor@ -> bbtime.textColor +bevelWidth@ -> bbtime.bevelWidth +.TE +WARNING: if +.B .bbtoolsrc +is defined it won't copy the blackbox style. + +For the meaning of the different resources see the comments in the +config-files. +.SH "SEE ALSO" +.BR bbdate (1), +.BR bbppp (1) +.SH AUTHOR +This manual page was written by Chris Tillman +for the Debian GNU/Linux system (but may be used by others). + --- bbtime-0.1.5.orig/debian/docs +++ bbtime-0.1.5/debian/docs @@ -0,0 +1,5 @@ +BUGS +README +TODO +AUTHORS +data/README.bbtime --- bbtime-0.1.5.orig/debian/bbtime.manpages +++ bbtime-0.1.5/debian/bbtime.manpages @@ -0,0 +1 @@ +debian/bbtime.1 --- bbtime-0.1.5.orig/debian/patches/001_Makefile_nostrip.dpatch +++ bbtime-0.1.5/debian/patches/001_Makefile_nostrip.dpatch @@ -0,0 +1,18 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 001_Makefile_nostrip.dpatch by Kevin Coyner +## +## DP: Remove stripping from Makefile.in. + +@DPATCH@ +diff -urNad bbtime-0.1.5~/Makefile.in bbtime-0.1.5/Makefile.in +--- bbtime-0.1.5~/Makefile.in 2007-08-14 14:14:29.000000000 -0400 ++++ bbtime-0.1.5/Makefile.in 2007-08-14 14:35:58.000000000 -0400 +@@ -349,7 +349,7 @@ + all-am: Makefile $(PROGRAMS) + all-redirect: all-recursive + install-strip: +- $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install ++ $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS= install + installdirs: installdirs-recursive + installdirs-am: + $(mkinstalldirs) $(DESTDIR)$(bindir) --- bbtime-0.1.5.orig/debian/patches/002-fix-as-needed.dpatch +++ bbtime-0.1.5/debian/patches/002-fix-as-needed.dpatch @@ -0,0 +1,32 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +Description: Fix FTBFS with ld --as-needed, libraries should go + into X_LIBS instead of LDFLAGS. For an explanation, see + http://lists.debian.org/debian-devel-announce/2011/02/msg00011.html +Author: Andreas Moog +Bug-Ubuntu: https://bugs.launchpad.net/bugs/765966 + +@DPATCH@ +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' bbtime~/configure bbtime/configure +--- bbtime~/configure 2011-06-26 18:25:58.000000000 +0000 ++++ bbtime/configure 2011-06-26 18:26:46.763143964 +0000 +@@ -2290,7 +2290,7 @@ + fi + if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 +- LDFLAGS="$LDFLAGS -lX11" ++ X_LIBS="$X_LIBS -lX11" + else + echo "$ac_t""no" 1>&6 + { echo "configure: error: XOpenDisplay not found in -lX11" 1>&2; exit 1; } +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' bbtime~/configure.in bbtime/configure.in +--- bbtime~/configure.in 2011-06-26 18:25:58.000000000 +0000 ++++ bbtime/configure.in 2011-06-26 18:26:46.763143964 +0000 +@@ -51,7 +51,7 @@ + CXXFLAGS="$CXXFLAGS $X_CFLAGS" + LDFLAGS="$LDFLAGS $X_LIBS $X_PRE_LIBS" + dnl Checks for X libraries. +-AC_CHECK_LIB(X11, XOpenDisplay, LDFLAGS="$LDFLAGS -lX11", ++AC_CHECK_LIB(X11, XOpenDisplay, X_LIBS="$X_LIBS -lX11", + AC_MSG_ERROR(XOpenDisplay not found in -lX11)) + + LDFLAGS="$LDFLAGS $X_EXTRA_LIBS" --- bbtime-0.1.5.orig/debian/patches/00list +++ bbtime-0.1.5/debian/patches/00list @@ -0,0 +1,2 @@ +001_Makefile_nostrip +002-fix-as-needed.dpatch