callisto-debian/wmcalclock
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Import Debian changes 1.25-16

Browse Source 
wmcalclock (1.25-16) unstable; urgency=low

  * Remove deprecated dpatch and upgrade to packaging format "3.0 quilt".
  * Update to Standards-Version to 3.9.7 and debhelper to 9.
  * Add build-arch and build-indep targets; use dh_prep in rules file.
  * Patch 00 is new; in-line changes to original sources.
  * Add watch file although there is no reliable upstream source target.
  * Fix description-synopsis-starts-with-article (Lintian).
  * Fix copyright-refers-to-symlink-license (Lintian). Thanks to Jari
    Aalto <jari.aalto@cante.net> for these fixes. Closes: #670193.
This commit is contained in:
Kevin Coyner
2016-10-26 20:33:54 -04:00
committed by Doug Torrance
parent e49f73879d
commit 9d5abc7b94
17 changed files with 85 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Src/Makefile
View File

@ -3,7 +3,6 @@ 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
@ -32,6 +31,6 @@ clean:
rm -f wmCalClock
install:: wmCalClock
$(INSTALL_PROGRAM) wmCalClock $(DESTDIR)/bin/wmcalclock
install -c -m 0644 wmCalClock.1 $(DESTDIR)/man/man1/wmcalclock.1
install -c -s -m 0755 wmCalClock $(DESTDIR)/bin
install -c -m 0644 wmCalClock.1 $(DESTDIR)/man/man1

2
Src/wmCalClock.c
View File

@ -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");
}

6
debian/README.source vendored
View File

@ -1,6 +0,0 @@
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.

13
debian/changelog vendored
View File

@ -1,3 +1,16 @@
wmcalclock (1.25-16) unstable; urgency=low
* Remove deprecated dpatch and upgrade to packaging format "3.0 quilt".
* Update to Standards-Version to 3.9.7 and debhelper to 9.
* Add build-arch and build-indep targets; use dh_prep in rules file.
* Patch 00 is new; in-line changes to original sources.
* Add watch file although there is no reliable upstream source target.
* Fix description-synopsis-starts-with-article (Lintian).
* Fix copyright-refers-to-symlink-license (Lintian). Thanks to Jari
Aalto <jari.aalto@cante.net> for these fixes. Closes: #670193.
-- Kevin Coyner <kcoyner@debian.org> Wed, 26 Oct 2016 20:33:54 -0400
wmcalclock (1.25-15) unstable; urgency=low
* debian/control:

2
debian/compat vendored
View File

@ -1 +1 @@
7
9

6
debian/control vendored
View File

@ -2,13 +2,13 @@ Source: wmcalclock
Section: x11
Priority: optional
Maintainer: Kevin Coyner <kcoyner@debian.org>
Build-Depends: debhelper (>= 7.4~), libx11-dev, libxext-dev, libxpm-dev, x11proto-core-dev, dpatch
Standards-Version: 3.8.3
Build-Depends: debhelper (>= 9), libx11-dev, libxext-dev, libxpm-dev, x11proto-core-dev
Standards-Version: 3.9.7
Package: wmcalclock
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: A dock.app which simply tells time and date
Description: dock.app which simply tells time and date
wmCalClock is a dock app specifically written for WindowMaker, but will work
with other window managers. It features antialiased text display with the
ability to choose between different fonts and colors. wmCalclock supports

2
debian/copyright vendored
View File

@ -22,4 +22,4 @@ License:
Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
On Debian systems, the complete text of the GNU General Public License can be
found in `/usr/share/common-licenses/GPL'.
found in `/usr/share/common-licenses/GPL-2'.

37
debian/patches/00-debian-local-changes.patch vendored Normal file
View File

@ -0,0 +1,37 @@
From: Unknown
Subject: Local Debian changes
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");
}

4
debian/patches/00list vendored
View File

@ -1,4 +0,0 @@
01_manpage_patch
02_30hr_patch
03_manapge_30hr_patch
04_makefile_modifications

7
debian/patches/01_manpage_patch.dpatch → debian/patches/01-manpage-patch.patch vendored
View File

@ -1,9 +1,6 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
## 01_manpage- patch.dpatch by Kevin Coyner <kcoyner@debian.org>
##
## DP: manpage-patch
From: Kevin Coyner <kcoyner@debian.org>
Subject: manpage-patch
@DPATCH@
--- wmcalclock-1.25/Src/wmCalClock.1 1999-03-28 22:16:23.000000000 +0000
+++ wmcalclock-1.25-rwbarton/Src/wmCalClock.1 2005-01-29 10:02:30.000000000 +0000

13
debian/patches/02_30hr_patch.dpatch → debian/patches/02-30hr-patch.patch vendored
View File

@ -1,12 +1,9 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
## 02_30hr_patch.dpatch by Kevin Coyner <kcoyner@debian.org>
##
## DP: 30hr-patch See Debian bug #292736
## DP: Original patch from Reid W. Barton
## DP: Show local time in 30-hour format. Times between midnight and 6 AM
## DP: are displayed as belonging to the previous day,
From: Kevin Coyner <kcoyner@debian.org>
Subject: 30hr-patch See Debian bug #292736
Original patch from Reid W. Barton
Show local time in 30-hour format. Times between midnight and 6 AM
are displayed as belonging to the previous day,
@DPATCH@
--- wmcalclock-1.25/Src/wmCalClock.c~ 2007-06-04 11:16:43.000000000 -0400
+++ wmcalclock-1.25/Src/wmCalClock.c 2007-06-04 11:14:31.000000000 -0400

7
debian/patches/03_manapge_30hr_patch.dpatch → debian/patches/03-manapge-30hr-patch.patch vendored
View File

@ -1,9 +1,6 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
## 03_manpage-30hr.dpatch by Kevin Coyner <kcoyner@debian.org>
##
## DP: mapage 30hr
From: Kevin Coyner <kcoyner@debian.org>
Subject: mapage 30hr
@DPATCH@
--- wmcalclock-1.25/Src/wmCalClock.1~ 2007-06-04 11:37:04.000000000 -0400
+++ wmcalclock-1.25/Src/wmCalClock.1 2007-06-04 11:37:46.000000000 -0400

7
debian/patches/04_makefile_modifications.dpatch → debian/patches/04-makefile-modifications.patch vendored
View File

@ -1,9 +1,6 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
## 04_makefile_modifications.dpatch by Kevin Coyner <kcoyner@debian.org>
##
## DP: Modifications to Src/Makefile
From: Kevin Coyner <kcoyner@debian.org>
Subject: 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

5
debian/patches/series vendored Normal file
View File

@ -0,0 +1,5 @@
00-debian-local-changes.patch
01-manpage-patch.patch
02-30hr-patch.patch
03-manapge-30hr-patch.patch
04-makefile-modifications.patch

11
debian/rules vendored
View File

@ -3,7 +3,6 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
include /usr/share/dpatch/dpatch.make
MAKE=make -C Src
CFLAGS=-W -Wall
@ -25,14 +24,18 @@ else
CFLAGS += -O2
endif
build-arch: build
build-indep: build
build: build-stamp
build-stamp: patch-stamp
build-stamp:
dh_testdir
$(MAKE) CFLAGS="$(CFLAGS)"
touch build-stamp
clean: clean1 unpatch
clean: clean1
clean1:
dh_testdir
dh_testroot
@ -78,4 +81,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
.PHONY: build clean binary-indep binary-arch binary install

1
debian/source/format vendored Normal file
View File

@ -0,0 +1 @@
3.0 (quilt)

3
debian/watch vendored Normal file
View File

@ -0,0 +1,3 @@
version=3
# Upstream no longer maintains this package, therefore there is no longer a
# reliable target for uscan.