[Pkg-wmaker-commits] [wmclock] 25/66: Imported Debian patch 1.0.13-1
Doug Torrance
dtorrance-guest at moszumanska.debian.org
Thu Aug 20 10:52:51 UTC 2015
This is an automated email from the git hooks/post-receive script.
dtorrance-guest pushed a commit to branch master
in repository wmclock.
commit 16e1ab2d567705dfcfc80b1f3edeca953fe6eb03
Merge: ad62b94 d4f30cb
Author: Julien BLACHE <jblache at debian.org>
Date: Sat Dec 4 17:37:47 2010 +0100
Imported Debian patch 1.0.13-1
ChangeLog | 17 +++
INSTALL | 4 +-
Imakefile | 7 +-
debian/changelog | 28 +++++
debian/control | 6 +-
debian/copyright | 12 +-
debian/lang.polish/month.xpm | 81 -------------
debian/lang.polish/weekday.xpm | 47 --------
debian/patches/00list | 6 -
debian/patches/21_fix_year_display.dpatch | 24 ----
debian/patches/22_fix_12_year_display.dpatch | 26 -----
debian/patches/23_select_dont_sleep.dpatch | 85 --------------
debian/patches/fix_12_year_display.patch | 24 ++++
...10_manpage_fixes.dpatch => manpage_fixes.patch} | 17 ++-
...ge_xpm_notes.dpatch => manpage_xpm_notes.patch} | 18 ++-
debian/patches/series | 3 +
debian/rules | 17 ++-
debian/source/format | 1 +
debian/watch | 2 +-
debian/wmclock.docs | 1 +
debian/wmclock.manpages | 1 +
debian/{menu => wmclock.menu} | 0
lang.croatian/month.xpm | 82 +++++++++++++
lang.croatian/weekday.xpm | 48 ++++++++
lang.english/weekday.xpm | 6 +-
lang.polish/month.txt | 12 ++
lang.polish/month.xpm | 79 +++++++++++++
lang.polish/weekday.txt | 7 ++
lang.polish/weekday.xpm | 48 ++++++++
month.xpm | 1 +
weekday.xpm | 1 +
wmclock.c | 99 +++++++++++-----
wmclock.man.in | 5 +-
wmclock.spec | 128 ---------------------
wmclock.spec.in | 2 +-
35 files changed, 470 insertions(+), 475 deletions(-)
diff --cc debian/changelog
index 16bb46b,0000000..e0bd84b
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,182 -1,0 +1,210 @@@
++wmclock (1.0.13-1) unstable; urgency=low
++
++ * New upstream release.
++ * Switch to source format 3.0 (quilt).
++
++ * debian/control:
++ + Bump Standards-Version to 3.9.1 (no changes).
++ + Update Homepage field for new upstream website.
++ + Drop dpatch build-dep.
++ * debian/copyright:
++ + Updated to reflect new upstream maintainer and website.
++ * debian/watch:
++ + Updated for new upstream website.
++ * debian/rules:
++ + Removed dpatch support.
++
++ * debian/lang.polish:
++ + Removed; a better version is now provided by upstream.
++
++ * debian/patches/21_fix_year_display.dpatch:
++ + Removed; proper fix added upstream.
++ * debian/patches/23_select_dont_sleep.dpatch:
++ + Removed; applied upstream.
++ * debian/patches/*:
++ + Renamed and refreshed.
++
++ -- Julien BLACHE <jblache at debian.org> Sat, 04 Dec 2010 17:37:47 +0100
++
+wmclock (1.0.12.2-10) unstable; urgency=low
+
+ * debian/control:
+ + New maintainer (closes: #490735).
+ + Reorder Build-Depends.
+ + Remove extraneous spaces in description.
+
+ * debian/changelog:
+ + Fixed typos in previous entries.
+ * debian/README.source:
+ + Remove useless file.
+
+ * debian/patches/00-fix_manpage_source_chgs_prior_adoption.dpatch:
+ + Renamed to 20_manpage_xpm_notes.dpatch.
+ + Add patch description.
+ * debian/patches/00-fix_wmclockc_source_chgs_prior_adoption.dpatch:
+ + Renamed to 21_fix_year_display.dpatch.
+ + Add patch description.
+ * debian/patches/10-fix_manpage_lintian_warning.dpatch,
+ debian/patches/20_fix_manpage_name.dpatch:
+ + Coalesced into 10_manpage_fixes.dpatch.
+ + Add a proper patch description.
+ * debian/patches/22_fix_12_year_display.dpatch:
+ + Added; add back fix for broken display when both -12 and -year are
+ given on the command line. Fix got lost at some point.
+ * debian/patches/23_select_dont_sleep.dpatch:
+ + Added; use select() instead of sleeping in order to reduce wakeups
+ (closes: #495468).
+
+ -- Julien BLACHE <jblache at debian.org> Sun, 16 Nov 2008 18:42:27 +0100
+
+wmclock (1.0.12.2-9) unstable; urgency=low
+
+ * debian/control
+ - removed x11proto-xext-dev build-dep since libxext-dev already depends on
+ it
+ - replaced xutils build-dep with xutils-dev; thanks to Daniel Schepler for
+ the report; Closes: #485239
+ - bump Standards-Version to 3.8.0
+ + debian/README.source added
+
+ -- Sandro Tosi <matrixhasu at gmail.com> Fri, 11 Jul 2008 23:20:13 +0200
+
+wmclock (1.0.12.2-8) unstable; urgency=low
+
+ * debian/control
+ - adding build-dependency (Closes: #450537)
+ - bump Standard-Version to 3.7.3
+ * debian/rules
+ - some little changes
+ * debian/copyright
+ - indented with 4 spaces
+ * debian/menu
+ - updated to new menu policy
+ * debian/patches/20_fix_manpage_name.dpatch
+ - added to fix manpage first line (lintian warning)
+
+ -- Sandro Tosi <matrixhasu at gmail.com> Thu, 27 Dec 2007 19:20:07 +0100
+
+wmclock (1.0.12.2-7) unstable; urgency=low
+
+ * Adopting package (Closes: #439966)
+ * debian/control
+ - add myself as maintainer
+ - added Homepage field to source stanza
+ - little reorg of short and long description
+ - depends against debhelper at least version 5
+ - added dependency against dpatch
+ * debian/watch
+ - added
+ * debian/compat
+ - bump to 5
+ * debian/copyright
+ - added myself as new maintainer
+ - added new upstream website address
+ - reported upstream as copyright holder, along with asclock copyright
+ holders, since wmclock derives from that
+ - separated license and copyright section (previous mixed up)
+ - fixed license location on a debian machine (it is GPLv2 not GPLv1)
+ * debian/rules
+ - removed unused dh_ tools calls
+ - added explicit file names to dh_installdocs
+ - removed "-n" param from dh_installmenu call
+ - added dpatch stuff
+ - installing debian/lang.* too
+ * debian/wmclock.docs
+ - removed since merged with debian/rules
+ * debian/wmclock.menu
+ - renamed wmclock.menu to menu
+ * debian/menu
+ - menu section is Applications
+ * debian/wmclock.post{inst,rm}
+ - deleted since menu update is managed by dh_installmenu
+ * wmclock.man.in
+ - taken back to upstream version
+ * debian/patches/00-fix_manpage_source_chgs_prior_adoption.dpatch
+ - apply source code modification done (before adoption) without patching
+ * debian/patches/00-fix_wmclockc_source_chgs_prior_adoption.dpatch
+ - apply source code modification done (before adoption) without patching
+ * debian/patches/10-fix_manpage_lintian_warning.dpatch
+ - added to fix a lintian warning about (c) character in manpage
+ represented using extended char and not with "\(co)" escape sequence
+ * debian/lang.polish/*
+ - moved here since they are provided by Debian maintainer, not upstream
+
+ -- Sandro Tosi <matrixhasu at gmail.co> Wed, 19 Dec 2007 22:59:04 +0100
+
+wmclock (1.0.12.2-6) unstable; urgency=low
+
+ * debian/control:
+ + Set maintainer to Debian QA group.
+ + Bump Standards-Version to 3.7.2, no changes needed.
+
+ -- Romain Francoise <rfrancoise at debian.org> Tue, 28 Aug 2007 21:38:43 +0200
+
+wmclock (1.0.12.2-5) unstable; urgency=low
+
+ * Add Polish versions of the XPM files courtesy of Kacper Perschke.
+ * debian/control: change Build-Depends to libx11-dev, libxpm-dev.
+
+ -- Romain Francoise <rfrancoise at debian.org> Fri, 15 Apr 2005 20:25:10 +0200
+
+wmclock (1.0.12.2-4) unstable; urgency=low
+
+ * Apply patch from Vino Fernando Crescini <jcrescin at cit.uws.edu.au> to
+ fix -12 and -year combined display (closes: #228985).
+
+ -- Romain Francoise <rfrancoise at debian.org> Sun, 25 Jan 2004 15:48:43 +0100
+
+wmclock (1.0.12.2-3) unstable; urgency=low
+
+ * New maintainer (closes: #214392).
+ * debian/control:
+ + Update maintainer contact info.
+ + Bump Standards-Version to 3.6.1.0.
+ + Build-Depends on debhelper (>= 4).
+ + Add Depends on ${misc:Depends}.
+ + Add Recommends on wmaker.
+ + Rewrite synopsis and description, including upstream URL.
+ * debian/copyright:
+ + Update maintainer information.
+ + Clarify license info.
+ + Reword sentence about the location of the GNU GPL on Debian
+ systems.
+ * debian/rules:
+ + Major facelift, separating configure and build stages.
+ + Remove old DH_COMPAT variables.
+ + Install localized XPM images in /usr/share/wmclock/.
+ + Call dh_installmenu -n.
+ * debian/compat: New file.
+ * debian/README.Debian: New file, explaining how to use the localized
+ display.
+ * debian/wmclock.{postinst,postrm,menu}: New files. Install wmclock
+ in the Debian menu in Apps/Tools.
+ * Don't ship the manpage in the Debian diff, use the version provided
+ by upstream since they are identical. Include information about the
+ localized XPM files.
+ * Acknowledging NMU (closes: #105699).
+ * Include patch to fix -year display (closes: #126742).
+
+ -- Romain Francoise <rfrancoise at debian.org> Mon, 6 Oct 2003 20:19:30 +0200
+
+wmclock (1.0.12.2-2.1) unstable; urgency=low
+
+ * NMU
+ * debian/control: added build-dependency on xutils (Closes: #105699)
+
+ -- Branden Robinson <branden at debian.org> Wed, 18 Jul 2001 17:27:06 -0500
+
+wmclock (1.0.12.2-2) unstable; urgency=low
+
+ * Source dependency xlibs-dev added. Closes: #99377
+
+ -- Szabolcs Horvath <horvaths at janus.gimsz.sulinet.hu> Mon, 4 Jun 2001 07:58:30 +0000
+
+wmclock (1.0.12.2-1) unstable; urgency=low
+
+ * Initial Release. Closes: #93782
+
+ -- Szabolcs Horvath <horvaths at janus.gimsz.sulinet.hu> Sun, 15 Apr 2001 07:08:38 +0000
+
+
diff --cc debian/control
index 40d5ab0,0000000..00ed75d
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,18 -1,0 +1,18 @@@
+Source: wmclock
+Section: x11
+Priority: optional
+Maintainer: Julien BLACHE <jblache at debian.org>
- Build-Depends: debhelper (>= 5), dpatch, libxpm-dev, libx11-dev, libxt-dev, libxext-dev, xutils-dev
- Standards-Version: 3.8.0
- Homepage: http://www.jmknoble.net/WindowMaker/wmclock/
++Build-Depends: debhelper (>= 5), libxpm-dev, libx11-dev, libxt-dev, libxext-dev, xutils-dev
++Standards-Version: 3.9.1
++Homepage: http://www.bluestop.org/wmclock/
+
+Package: wmclock
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Recommends: wmaker
+Description: dockable clock applet for Window Maker
+ wmclock is an applet for Window Maker which displays the date and
+ time in a dockable tile. It features multiple language support, 24h
+ or 12h time display, and can run a user-specified program on mouse
+ click.
+
diff --cc debian/copyright
index 7e6c2f9,0000000..663b1dd
mode 100644,000000..100644
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,36 -1,0 +1,38 @@@
+This package was debianized by Szabolcs Horvath
+<horvaths at janus.gimsz.sulinet.hu> on Sun, 15 Apr 2001 07:08:38 +0000.
++Romain Francoise <rfrancoise at debian.org> took over maintenance in
++October 2003, handing over maintenance to Sandro Tosi <matrixhasu at gmail.com>
++in December 2007.
+
- It was maintained by Romain Francoise <rfrancoise at debian.org>.
- Is is not maintained by Sandro Tosi <matrixhasu at gmail.com>
++It is now maintained by Julien BLACHE <jblache at debian.org>.
+
- It was downloaded from http://www.bensinclair.com/dockapp/ and it is
- now available on http://www.jmknoble.net/WindowMaker/wmclock/ .
++It was downloaded from: <http://www.bluestop.org/wmclock/>
+
- Upstream Author:
++Upstream Authors:
+
+ Jim Knoble <jmknoble at pobox.com>
++ Bruce Cran <bruce at cran.org.uk>
+
+Copyright:
+
+ 1999 Jim Knoble <jmknoble at pobox.com>
+ Significant portions of wmclock are directly derived from asclock
+ by Beat Christen <spiff at longstreet.ch>, who, along with asclock's
+ other authors, owns the copyright to those portions of wmclock.
+
+License:
+
+ Wmclock is licensed under the GNU General Public License, version
+ 2, or (at your option) any later version. See
+ <http://www.gnu.org/> for more information.
+
+ The software is provided ``as is'', without warranty of any kind,
+ express or implied, including but not limited to the warranties of
+ merchantability, fitness for a particular purpose and
+ noninfringement. In no event shall the author(s) be liable for
+ any claim, damages or other liability, whether in an action of
+ contract, tort or otherwise, arising from, out of or in connection
+ with the software or the use or other dealings in the software.
+
+On Debian GNU/Linux systems, the complete text of the GNU General Public
+License, version 2, can be found in `/usr/share/common-licenses/GPL-2'.
diff --cc debian/patches/fix_12_year_display.patch
index 0000000,0000000..4cfd953
new file mode 100644
--- /dev/null
+++ b/debian/patches/fix_12_year_display.patch
@@@ -1,0 -1,0 +1,24 @@@
++Description: Fix display when both -12 and -year are given
++Author: Vino Fernando Crescini <jcrescin at cit.uws.edu.au>
++Bug-Debian: http://bugs.debian.org/228985
++
++Index: wmclock-1.0.13/wmclock.c
++===================================================================
++--- wmclock-1.0.13.orig/wmclock.c 2010-12-03 21:49:51.000000000 +0100
+++++ wmclock-1.0.13/wmclock.c 2010-12-04 17:39:27.215473570 +0100
++@@ -850,7 +850,14 @@
++ #endif /* !ONLY_SHAPED_WINDOW */
++ for (i = 0; i < NUM_TIME_POSITIONS; i++)
++ {
++- xPos[i] += enable12HourClock ? timePos24[i] : timePos12[i];
+++ if (enable12HourClock && (!enableYearDisplay))
+++ {
+++ xPos[i] += timePos24[i];
+++ }
+++ else
+++ {
+++ xPos[i] += timePos12[i];
+++ }
++ }
++
++ /* Open the display */
diff --cc debian/patches/manpage_fixes.patch
index 6f2adb8,0000000..6b778fd
mode 100644,000000..100644
--- a/debian/patches/manpage_fixes.patch
+++ b/debian/patches/manpage_fixes.patch
@@@ -1,29 -1,0 +1,28 @@@
- #! /bin/sh /usr/share/dpatch/dpatch-run
- ## 20_fix_manpage_name.dpatch by Sandro Tosi <matrixhasu at gmail.com>
- ##
- ## DP: Fix manpage first line. Use proper escape sequence for (c) character.
++Description: Manpage fixes
++ Fix first line and use proper escape sequence for (c) character.
++Author: Sandro Tosi <matrixhasu at gmail.com>
+
- @DPATCH@
- diff -urNad wmclock-1.0.12.2~/wmclock.man.in wmclock-1.0.12.2/wmclock.man.in
- --- wmclock-1.0.12.2~/wmclock.man.in 2008-11-16 18:22:33.061623927 +0100
- +++ wmclock-1.0.12.2/wmclock.man.in 2008-11-16 18:22:33.417626015 +0100
++Index: wmclock-1.0.13/wmclock.man.in
++===================================================================
++--- wmclock-1.0.13.orig/wmclock.man.in 2010-12-03 21:47:21.000000000 +0100
+++++ wmclock-1.0.13/wmclock.man.in 2010-12-04 17:39:17.764387469 +0100
+@@ -25,9 +25,7 @@
+ .TH wmclock 1x "@DATE@" "Version @VERSION@"
+ .\" ----------------------------------------------------------------
+ .SH NAME
+-.PP
+-.BR wmclock :
+-a dockable clock for the Window Maker window manager
++wmclock \- A dockable clock for the Window Maker window manager
+ .\" ----------------------------------------------------------------
+ .SH SYNOPSIS
+ .HP
- @@ -196,7 +194,7 @@
++@@ -199,7 +197,7 @@
+ .\" ----------------------------------------------------------------
+ .SH COPYRIGHT AND LICENSE
+ .PP
+-Copyright � 1999 by Jim Knoble <jmknoble at pobox.com>. Significant
++Copyright \(co 1999 by Jim Knoble <jmknoble at pobox.com>. Significant
+ portions of
+ .B wmclock
+ are directly derived from
diff --cc debian/patches/manpage_xpm_notes.patch
index a7ab104,0000000..cc6002d
mode 100644,000000..100644
--- a/debian/patches/manpage_xpm_notes.patch
+++ b/debian/patches/manpage_xpm_notes.patch
@@@ -1,32 -1,0 +1,30 @@@
- #! /bin/sh /usr/share/dpatch/dpatch-run
- ## 00-fix_manpage_source_chgs_prior_adoption.dpatch by Sandro Tosi <matrixhasu at gmail.com>
- ##
- ## All lines beginning with `## DP:' are a description of the patch.
- ## DP: Document usage of translated XPM files.
++Description: Document Debian-specific XPM files location
++ Add a section about usage of translated XPM files in Debian.
++Author: Sandro Tosi <matrixhasu at gmail.com>
+
- @DPATCH@
- diff -urNad wmclock~/wmclock.man.in wmclock/wmclock.man.in
- --- wmclock~/wmclock.man.in 2000-03-08 07:56:36.000000000 +0100
- +++ wmclock/wmclock.man.in 2007-10-03 22:40:05.000000000 +0200
- @@ -160,6 +160,21 @@
++Index: wmclock-1.0.13/wmclock.man.in
++===================================================================
++--- wmclock-1.0.13.orig/wmclock.man.in 2010-12-04 17:39:17.764387469 +0100
+++++ wmclock-1.0.13/wmclock.man.in 2010-12-04 17:39:22.043973644 +0100
++@@ -161,6 +161,21 @@
+ the bottom. The weekday abbreviations must also be arranged
+ vertically, beginning with Monday at the top and continuing to Sunday
+ at the bottom.
++.PP
++On Debian systems you can find XPM files for a variety of languages in:
++.PP
++.RS
++.BR /usr/share/wmclock/
++.RE
++.PP
++For example, to have a French display, you could use the following
++command line:
++.PP
++.RS
++.TQ
++wmclock \-monthxpm /usr/share/wmclock/lang.french/month.xpm \-weekdayxpm /usr/share/wmclock/lang.french/weekday.xpm
++.RE
++.PP
+ .SS Obsolete Options
+ .PP
+ In order to maintain command-line compatibility (mostly) with
diff --cc debian/patches/series
index 0000000,0000000..6fa81c4
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,3 @@@
++manpage_fixes.patch
++manpage_xpm_notes.patch
++fix_12_year_display.patch
diff --cc debian/rules
index de45e31,0000000..44c2155
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,60 -1,0 +1,57 @@@
+#!/usr/bin/make -f
+
- include /usr/share/dpatch/dpatch.make
-
+configure: configure-stamp
+configure-stamp:
+ dh_testdir
+ ./configure --prefix=/usr --mandir=/usr/share/man
+ touch configure-stamp
+
+build: build-stamp
- build-stamp: patch-stamp configure-stamp
++build-stamp: configure-stamp
+ dh_testdir
+ $(MAKE)
+ touch build-stamp
+
- clean: clean-patched unpatch
- clean-patched: patch-stamp
++clean:
+ dh_testdir
+ dh_testroot
- rm -f build-stamp configure-stamp patch-stamp
++ rm -f build-stamp configure-stamp
+ if [ -f Makefile ]; then \
+ rm -f month.xpm weekday.xpm; \
+ $(MAKE) clean; \
+ rm -f Makefile wmclock.man wmclock._man; \
+ fi
+ dh_clean
+
+install: build
+ dh_testdir
+ dh_testroot
+ dh_clean -k
+ dh_installdirs
+ +$(MAKE) install BINDIR=$(CURDIR)/debian/wmclock/usr/bin
- for dir in lang.* debian/lang.*; do \
++ for dir in lang.*; do \
+ cp -r "$$dir" $(CURDIR)/debian/wmclock/usr/share/wmclock; \
+ done
+
+binary-indep: build install;
+# Build architecture-dependent files here.
+binary-arch: build install
+ dh_testdir
+ dh_testroot
- dh_installdocs README
++ dh_installdocs
+ dh_installexamples
+ dh_installmenu
- dh_installman wmclock.man
- dh_installchangelogs ChangeLog
++ dh_installman
++ dh_installchangelogs ChangeLog
+ dh_link
+ dh_strip
+ dh_compress
+ dh_fixperms
+ dh_installdeb
+ dh_shlibdeps
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install configure
diff --cc debian/source/format
index 0000000,0000000..163aaf8
new file mode 100644
--- /dev/null
+++ b/debian/source/format
@@@ -1,0 -1,0 +1,1 @@@
++3.0 (quilt)
diff --cc debian/watch
index 6b2cad4,0000000..ebc2120
mode 100644,000000..100644
--- a/debian/watch
+++ b/debian/watch
@@@ -1,2 -1,0 +1,2 @@@
+version=3
- http://www.jmknoble.net/WindowMaker/wmclock/ wmclock-([\d\.]*)\.tar\.gz
++http://www.bluestop.org/wmclock/ wmclock-([\d\.]*)\.tar\.gz
diff --cc debian/wmclock.docs
index 0000000,0000000..e845566
new file mode 100644
--- /dev/null
+++ b/debian/wmclock.docs
@@@ -1,0 -1,0 +1,1 @@@
++README
diff --cc debian/wmclock.manpages
index 0000000,0000000..c04894c
new file mode 100644
--- /dev/null
+++ b/debian/wmclock.manpages
@@@ -1,0 -1,0 +1,1 @@@
++wmclock.man
diff --cc debian/wmclock.menu
index ca327ac,0000000..ca327ac
mode 100644,000000..100644
--- a/debian/wmclock.menu
+++ b/debian/wmclock.menu
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmclock.git
More information about the Pkg-wmaker-commits
mailing list