From b2ea00161bbf0a252f1f374e7072fdef7cb9f5fe Mon Sep 17 00:00:00 2001 From: Gordon Fraser Date: Sun, 21 Sep 2003 13:40:03 +0200 Subject: [PATCH] Import Debian changes 1.25-9 wmcalclock (1.25-9) unstable; urgency=low * Use lower case only letters for binary name (Closes: #149916) * Add symbolic links to wmcalclock and wmcalclock.1.gz for backward compatibility. * Standards-version to 3.6.1.0 * Remove dh_make boilerplate from debian/copyright * Update DH_BUILD_OPTIONS handling * Remove trailing dot from short description wmcalclock (1.25-8) unstable; urgency=low * New maintainer (Closes: #145494) * Correct example on usage screen * Minor debhelper and packaging cleanups * Get rid of Lintian warnings wmcalclock (1.25-7) unstable; urgency=low * Orphaning package, changing owner to QA --- Src/Makefile | 5 +++-- Src/wmCalClock.c | 2 +- debian/changelog | 32 +++++++++++++++++++++++++++----- debian/compat | 1 + debian/control | 8 ++++---- debian/copyright | 2 +- debian/docs | 2 +- debian/rules | 45 ++++++++++++++++++++++----------------------- 8 files changed, 60 insertions(+), 37 deletions(-) create mode 100644 debian/compat diff --git a/Src/Makefile b/Src/Makefile index fecc1f9..8f40445 100644 --- a/Src/Makefile +++ b/Src/Makefile @@ -3,6 +3,7 @@ CFLAGS = -O2 -Wall INCDIR = -I/usr/X11R6/include/X11 -I/usr/X11R6/include DESTDIR= /usr/X11R6 LIBDIR = -L/usr/X11R6/lib +INSTALL_PROGRAM = install -c -s -m 0755 # for Linux LIBS = -lXpm -lX11 -lXext @@ -31,6 +32,6 @@ clean: rm -f wmCalClock install:: wmCalClock - install -c -s -m 0755 wmCalClock $(DESTDIR)/bin - install -c -m 0644 wmCalClock.1 $(DESTDIR)/man/man1 + $(INSTALL_PROGRAM) wmCalClock $(DESTDIR)/bin/wmcalclock + install -c -m 0644 wmCalClock.1 $(DESTDIR)/man/man1/wmcalclock.1 diff --git a/Src/wmCalClock.c b/Src/wmCalClock.c index fa9a2f7..a6dcf59 100644 --- a/Src/wmCalClock.c +++ b/Src/wmCalClock.c @@ -890,7 +890,7 @@ void print_usage(){ printf("\t-l\t\tUse a low-color pixmap to conserve colors. On 8-bit displays the\n"); printf("\t \t\tlow color pixmap will always be used.\n"); printf("\t-h\t\tDisplay help screen.\n"); - printf("\nExample: wmCalClock -b 100 -tc #001100 -bc #7e9e69 \n\n"); + printf("\nExample: wmCalClock -b 100 -tc '#001100' -bc '#7e9e69' \n\n"); } diff --git a/debian/changelog b/debian/changelog index dcdf336..c61f4f9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,30 @@ +wmcalclock (1.25-9) unstable; urgency=low + + * Use lower case only letters for binary name (Closes: #149916) + * Add symbolic links to wmcalclock and wmcalclock.1.gz for + backward compatibility. + * Standards-version to 3.6.1.0 + * Remove dh_make boilerplate from debian/copyright + * Update DH_BUILD_OPTIONS handling + * Remove trailing dot from short description + + -- Gordon Fraser Sun, 21 Sep 2003 13:40:03 +0200 + +wmcalclock (1.25-8) unstable; urgency=low + + * New maintainer (Closes: #145494) + * Correct example on usage screen + * Minor debhelper and packaging cleanups + * Get rid of Lintian warnings + + -- Gordon Fraser Thu, 2 May 2002 19:24:51 +0200 + +wmcalclock (1.25-7) unstable; urgency=low + + * Orphaning package, changing owner to QA + + -- Dan Nguyen Thu, 2 May 2002 00:10:33 -0500 + wmcalclock (1.25-6) unstable; urgency=low * Change /usr/X11R6/bin/wmCalClock to /usr/bin/wmCalClock in @@ -42,8 +69,3 @@ wmcalclock (1.24-1) unstable; urgency=low * My first package. -- Dan Nguyen Fri, 9 Apr 1999 00:12:45 -0400 - -Local variables: -mode: debian-changelog -add-log-mailing-address: "dnn@debian.org"" -End: diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..00750ed --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +3 diff --git a/debian/control b/debian/control index 9cdbbe4..7892850 100644 --- a/debian/control +++ b/debian/control @@ -1,14 +1,14 @@ Source: wmcalclock Section: x11 Priority: optional -Maintainer: Dan Nguyen -Build-Depends: debhelper (>> 2.0.0), xlibs-dev -Standards-Version: 3.2.1 +Maintainer: Gordon Fraser +Build-Depends: debhelper (>> 3.0.0), xlibs-dev +Standards-Version: 3.6.1.0 Package: wmcalclock Architecture: any Depends: ${shlibs:Depends} -Description: A dock.app which simply tells time and date. +Description: A dock.app which simply tells time and date wmCalclock is a dock app specifically written for Window Maker, but will work with other window managers. Some features include antialiased text display, with the ability to choose between different fonts, and colors. diff --git a/debian/copyright b/debian/copyright index b40f58d..017f823 100644 --- a/debian/copyright +++ b/debian/copyright @@ -3,7 +3,7 @@ Tue, 25 May 1999 23:51:54 -0400. It was downloaded from http://nis-www.lanl.gov/~mgh/WindowMaker/DockApps.shtml -Upstream Author(s): Michael G. Henderson +Upstream Author: Michael G. Henderson Copyright: It's license is GPLv2, which, on debian systems, is available at: diff --git a/debian/docs b/debian/docs index c12c35d..3b56489 100644 --- a/debian/docs +++ b/debian/docs @@ -1 +1 @@ -BUGS CHANGES README TODO HINTS +BUGS README TODO HINTS diff --git a/debian/rules b/debian/rules index 3befe34..2858355 100755 --- a/debian/rules +++ b/debian/rules @@ -1,28 +1,36 @@ #!/usr/bin/make -f -#-*- makefile -*- -# Made with the aid of dh_make, by Craig Small -# Sample debian/rules that uses debhelper. GNU copyright 1997 by Joey Hess. -# Some lines taken from debmake, by Christoph Lameter. # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 MAKE=make -C Src +CFLAGS=-W -Wall +INSTALL=/usr/bin/install +INSTALL_PROGRAM = $(INSTALL) -p -o root -g root -m 755 +INSTALL_FILE = $(INSTALL) -p -o root -g root -m 644 +BUILDDIR = $(CURDIR)/debian/wmcalclock + +ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS))) + CFLAGS += -g +endif +ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) + INSTALL_PROGRAM += -s +endif +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 +endif build: build-stamp build-stamp: dh_testdir - - # Add here commands to compile the package. - $(MAKE) - + $(MAKE) CFLAGS="$(CFLAGS)" touch build-stamp clean: dh_testdir dh_testroot rm -f build-stamp install-stamp - - # Add here commands to clean up after the build process. -$(MAKE) clean dh_clean @@ -33,10 +41,10 @@ install-stamp: build-stamp dh_testroot dh_clean -k dh_installdirs - - # Add here commands to install the package into debian/tmp. - $(MAKE) install DESTDIR=`pwd`/debian/tmp/usr - mv `pwd`/debian/tmp/usr/man `pwd`/debian/tmp/usr/share + $(MAKE) install DESTDIR=$(BUILDDIR)/usr INSTALL_PROGRAM="$(INSTALL_PROGRAM)" + mv $(BUILDDIR)/usr/man $(BUILDDIR)/usr/share + ln -s wmcalclock $(BUILDDIR)/usr/bin/wmCalClock + ln -s wmcalclock.1 $(BUILDDIR)/usr/share/man/man1/wmCalClock.1 touch install-stamp @@ -50,21 +58,12 @@ binary-arch: build install dh_testdir dh_testroot dh_installdocs - dh_installexamples dh_installmenu -# dh_installemacsen -# dh_installinit - dh_installcron -# dh_installmanpages -# dh_undocumented dh_installchangelogs CHANGES dh_link dh_strip dh_compress dh_fixperms - # You may want to make some executables suid here -# dh_suidregister -# dh_makeshlibs dh_installdeb dh_shlibdeps dh_gencontrol