From e49f73879d89e9a23f212399f0315a981dde1367 Mon Sep 17 00:00:00 2001 From: Kevin Coyner Date: Wed, 21 Oct 2009 11:17:22 -0400 Subject: [PATCH] Import Debian changes 1.25-15 wmcalclock (1.25-15) unstable; urgency=low * debian/control: - Changed Build-Depends from x-dev to x11proto-core-dev. Closes: #515486. - Bumped Standards-Version to 3.8.3. No changes. - Bumped debhelper version to 7.4~. - Removed homepage reference. * Changed debian/compat to version 7. * Small edit to 02_30hr_patch regarding daylight savings time. Closes: #506379. * Added new 04_makefile_modifications patch. * Removed debian/watch. Unable to find homepage or source code repository for upstream. Please file a bug if you find a legitimate homepage. * debian/rules: - Changed dh_clean -k to dh_prep. - Reworked file to use dpatch.make. * Added debian/README.source. --- debian/README.source | 6 ++++ debian/changelog | 19 +++++++++++ debian/compat | 2 +- debian/control | 6 ++-- debian/patches/00list | 1 + debian/patches/02_30hr_patch.dpatch | 2 +- .../patches/04_makefile_modifications.dpatch | 34 +++++++++++++++++++ debian/rules | 26 ++++++-------- debian/watch | 2 -- 9 files changed, 75 insertions(+), 23 deletions(-) create mode 100644 debian/README.source create mode 100644 debian/patches/04_makefile_modifications.dpatch delete mode 100644 debian/watch diff --git a/debian/README.source b/debian/README.source new file mode 100644 index 0000000..d421cc5 --- /dev/null +++ b/debian/README.source @@ -0,0 +1,6 @@ +This package is using the dpatch patch system. + +To get the fully patched source after unpacking the source package, cd to +the root level of the source package and run `./debian/rules patch` + +See /usr/share/doc/dpatch/README.source.gz for more information. diff --git a/debian/changelog b/debian/changelog index 9fd1c08..15482ac 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,22 @@ +wmcalclock (1.25-15) unstable; urgency=low + + * debian/control: + - Changed Build-Depends from x-dev to x11proto-core-dev. Closes: #515486. + - Bumped Standards-Version to 3.8.3. No changes. + - Bumped debhelper version to 7.4~. + - Removed homepage reference. + * Changed debian/compat to version 7. + * Small edit to 02_30hr_patch regarding daylight savings time. Closes: #506379. + * Added new 04_makefile_modifications patch. + * Removed debian/watch. Unable to find homepage or source code repository + for upstream. Please file a bug if you find a legitimate homepage. + * debian/rules: + - Changed dh_clean -k to dh_prep. + - Reworked file to use dpatch.make. + * Added debian/README.source. + + -- Kevin Coyner Wed, 21 Oct 2009 11:17:22 -0400 + wmcalclock (1.25-14) unstable; urgency=low * Add line to debian/rules to ensure *.o binary files are removed during diff --git a/debian/compat b/debian/compat index 7ed6ff8..7f8f011 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -5 +7 diff --git a/debian/control b/debian/control index 083d0d5..0e908c8 100644 --- a/debian/control +++ b/debian/control @@ -2,8 +2,8 @@ Source: wmcalclock Section: x11 Priority: optional Maintainer: Kevin Coyner -Build-Depends: debhelper (>= 5.0), libx11-dev, libxext-dev, libxpm-dev, x-dev, dpatch -Standards-Version: 3.7.2 +Build-Depends: debhelper (>= 7.4~), libx11-dev, libxext-dev, libxpm-dev, x11proto-core-dev, dpatch +Standards-Version: 3.8.3 Package: wmcalclock Architecture: any @@ -14,5 +14,3 @@ Description: A dock.app which simply tells time and date ability to choose between different fonts and colors. wmCalclock supports 12, 24 and 30 hour time, Greenwich time, Greenwich Mean Sidereal Time, and Local Sidereal Time. - . - Homepage: http://dockapps.org/file.php/id/9 diff --git a/debian/patches/00list b/debian/patches/00list index e63baf2..1cb4761 100644 --- a/debian/patches/00list +++ b/debian/patches/00list @@ -1,3 +1,4 @@ 01_manpage_patch 02_30hr_patch 03_manapge_30hr_patch +04_makefile_modifications diff --git a/debian/patches/02_30hr_patch.dpatch b/debian/patches/02_30hr_patch.dpatch index 67aa026..28beb8e 100644 --- a/debian/patches/02_30hr_patch.dpatch +++ b/debian/patches/02_30hr_patch.dpatch @@ -30,7 +30,7 @@ + /* Careful. Need to handle daylight savings time changes correctly. */ + if (Time->tm_hour < 6){ + int old_hour = Time->tm_hour; -+ time_t new_time = CurrentLocalTime - 24 * 60 * 60; ++ time_t new_time = CurrentLocalTime - 12 * 60 * 60; + Time = localtime(&new_time); + Time->tm_hour = old_hour + 24; + } diff --git a/debian/patches/04_makefile_modifications.dpatch b/debian/patches/04_makefile_modifications.dpatch new file mode 100644 index 0000000..9a924a8 --- /dev/null +++ b/debian/patches/04_makefile_modifications.dpatch @@ -0,0 +1,34 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 04_makefile_modifications.dpatch by Kevin Coyner +## +## DP: Modifications to Src/Makefile + +@DPATCH@ +diff -urNad wmcalclock-1.25~/Src/Makefile wmcalclock-1.25/Src/Makefile +--- wmcalclock-1.25~/Src/Makefile 2009-10-18 22:35:56.000000000 -0400 ++++ wmcalclock-1.25/Src/Makefile 2009-10-21 12:31:49.000000000 -0400 +@@ -1,9 +1,9 @@ +-CC = gcc +-CFLAGS = -O2 -Wall ++CC = $(DEB_HOST_GNU_TYPE)-gcc ++CFLAGS = -W -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 ++INSTALL_PROGRAM = install -p -o root -g root -m 755 + + # for Linux + LIBS = -lXpm -lX11 -lXext +@@ -14,11 +14,9 @@ + OBJS = wmCalClock.o \ + xutils.o + +- + .c.o: + $(CC) $(CFLAGS) -D$(shell echo `uname -s`) -c $< -o $*.o $(INCDIR) + +- + all: wmCalClock.o wmCalClock + + wmCalClock.o: wmCalClock_master.xpm wmCalClock_mask.xbm diff --git a/debian/rules b/debian/rules index 378534f..4d91255 100755 --- a/debian/rules +++ b/debian/rules @@ -2,12 +2,16 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 + +include /usr/share/dpatch/dpatch.make + 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 +PACKAGE = wmcalclock ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS))) CFLAGS += -g @@ -22,34 +26,26 @@ else endif build: build-stamp -build-stamp: patch + +build-stamp: patch-stamp dh_testdir $(MAKE) CFLAGS="$(CFLAGS)" touch build-stamp -clean: clean-patched unpatch - -clean-patched: +clean: clean1 unpatch +clean1: dh_testdir dh_testroot - rm -f build-stamp install-stamp + rm -rf build-stamp install-stamp ./debian/$(PACKAGE) -find ./Src -name '*.o' | xargs rm -f $(MAKE) clean dh_clean -patch: patch-stamp -patch-stamp: - dpatch apply-all - -unpatch: - dpatch deapply-all - rm -rf patch-stamp debian/patched - install: install-stamp install-stamp: build-stamp dh_testdir dh_testroot - dh_clean -k + dh_prep dh_installdirs $(MAKE) install DESTDIR=$(BUILDDIR)/usr INSTALL_PROGRAM="$(INSTALL_PROGRAM)" mv $(BUILDDIR)/usr/man $(BUILDDIR)/usr/share @@ -82,4 +78,4 @@ source diff: @echo >&2 'source and diff are obsolete - use dpkg-source -b'; false binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install patch unpatch clean-patched +.PHONY: build clean binary-indep binary-arch binary install patch unpatch diff --git a/debian/watch b/debian/watch deleted file mode 100644 index f081f2b..0000000 --- a/debian/watch +++ /dev/null @@ -1,2 +0,0 @@ -version=3 -http://dockapps.org/file.php/id/9 (?:.*/)?wmCalClock-?_?([\d+\.]+|\d+)\.tar.*