[Pkg-wmaker-commits] [wmclock] 24/66: Imported Debian patch 1.0.12.2-10
Doug Torrance
dtorrance-guest at moszumanska.debian.org
Thu Aug 20 10:52:50 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 ad62b9491a6f4d08c4cca7003b60914bde56c9ef
Author: Julien BLACHE <jblache at debian.org>
Date: Sun Nov 16 18:42:27 2008 +0100
Imported Debian patch 1.0.12.2-10
---
debian/README.source | 4 -
debian/changelog | 37 +++++++++-
debian/control | 11 +--
debian/patches/00list | 10 ++-
.../patches/10-fix_manpage_lintian_warning.dpatch | 19 -----
debian/patches/10_manpage_fixes.dpatch | 29 ++++++++
debian/patches/20_fix_manpage_name.dpatch | 20 -----
...adoption.dpatch => 20_manpage_xpm_notes.dpatch} | 2 +-
..._adoption.dpatch => 21_fix_year_display.dpatch} | 2 +-
debian/patches/22_fix_12_year_display.dpatch | 26 +++++++
debian/patches/23_select_dont_sleep.dpatch | 85 ++++++++++++++++++++++
11 files changed, 188 insertions(+), 57 deletions(-)
diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index 0d0aa40..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,4 +0,0 @@
-This package uses dpatch to handle patches against upstream source code; you
-can find additional information about dpatch at
-
- /usr/share/doc/dpatch/
diff --git a/debian/changelog b/debian/changelog
index 93101b0..16bb46b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,34 @@
+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
@@ -41,7 +72,7 @@ wmclock (1.0.12.2-7) unstable; urgency=low
- bump to 5
* debian/copyright
- added myself as new maintainer
- - added new upstram website address
+ - 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)
@@ -57,7 +88,7 @@ wmclock (1.0.12.2-7) unstable; urgency=low
* debian/wmclock.menu
- renamed wmclock.menu to menu
* debian/menu
- - manu section is Applications
+ - menu section is Applications
* debian/wmclock.post{inst,rm}
- deleted since menu update is managed by dh_installmenu
* wmclock.man.in
@@ -70,7 +101,7 @@ wmclock (1.0.12.2-7) unstable; urgency=low
- 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 buy Debian maintainer, not upstream
+ - 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
diff --git a/debian/control b/debian/control
index fb5a694..40d5ab0 100644
--- a/debian/control
+++ b/debian/control
@@ -1,8 +1,8 @@
Source: wmclock
Section: x11
Priority: optional
-Maintainer: Sandro Tosi <matrixhasu at gmail.com>
-Build-Depends: debhelper (>= 5), libxpm-dev, libx11-dev, xutils-dev, dpatch, libxt-dev, libxext-dev
+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/
@@ -11,7 +11,8 @@ 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
+ 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 --git a/debian/patches/00list b/debian/patches/00list
index 31e05ca..bed5b47 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1,4 +1,6 @@
-00-fix_manpage_source_chgs_prior_adoption
-00-fix_wmclockc_source_chgs_prior_adoption
-10-fix_manpage_lintian_warning
-20_fix_manpage_name
+10_manpage_fixes
+20_manpage_xpm_notes
+21_fix_year_display
+22_fix_12_year_display
+23_select_dont_sleep
+
diff --git a/debian/patches/10-fix_manpage_lintian_warning.dpatch b/debian/patches/10-fix_manpage_lintian_warning.dpatch
deleted file mode 100644
index dd1ae31..0000000
--- a/debian/patches/10-fix_manpage_lintian_warning.dpatch
+++ /dev/null
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 10-fix_manpage_lintian_warning.dpatch by Sandro Tosi <matrixhasu at gmail.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad wmclock~/wmclock.man.in wmclock/wmclock.man.in
---- wmclock~/wmclock.man.in 2007-10-03 22:47:17.000000000 +0200
-+++ wmclock/wmclock.man.in 2007-10-03 22:47:51.000000000 +0200
-@@ -211,7 +211,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 --git a/debian/patches/10_manpage_fixes.dpatch b/debian/patches/10_manpage_fixes.dpatch
new file mode 100644
index 0000000..6f2adb8
--- /dev/null
+++ b/debian/patches/10_manpage_fixes.dpatch
@@ -0,0 +1,29 @@
+#! /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.
+
+ at 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
+@@ -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 @@
+ .\" ----------------------------------------------------------------
+ .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 --git a/debian/patches/20_fix_manpage_name.dpatch b/debian/patches/20_fix_manpage_name.dpatch
deleted file mode 100644
index 93785c3..0000000
--- a/debian/patches/20_fix_manpage_name.dpatch
+++ /dev/null
@@ -1,20 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 20_fix_manpage_name.dpatch by Sandro Tosi <matrixhasu at gmail.com>
-##
-## DP: Fix the upstream manpage for a valid first line
-
- at DPATCH@
-diff -urNad wmclock~/wmclock.man.in wmclock/wmclock.man.in
---- wmclock~/wmclock.man.in 2007-12-27 19:27:36.512023741 +0100
-+++ wmclock/wmclock.man.in 2007-12-27 19:27:49.856784215 +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
diff --git a/debian/patches/00-fix_manpage_source_chgs_prior_adoption.dpatch b/debian/patches/20_manpage_xpm_notes.dpatch
similarity index 95%
rename from debian/patches/00-fix_manpage_source_chgs_prior_adoption.dpatch
rename to debian/patches/20_manpage_xpm_notes.dpatch
index fff0b66..a7ab104 100644
--- a/debian/patches/00-fix_manpage_source_chgs_prior_adoption.dpatch
+++ b/debian/patches/20_manpage_xpm_notes.dpatch
@@ -2,7 +2,7 @@
## 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: No description.
+## DP: Document usage of translated XPM files.
@DPATCH@
diff -urNad wmclock~/wmclock.man.in wmclock/wmclock.man.in
diff --git a/debian/patches/00-fix_wmclockc_source_chgs_prior_adoption.dpatch b/debian/patches/21_fix_year_display.dpatch
similarity index 95%
rename from debian/patches/00-fix_wmclockc_source_chgs_prior_adoption.dpatch
rename to debian/patches/21_fix_year_display.dpatch
index fc5e316..b77133c 100644
--- a/debian/patches/00-fix_wmclockc_source_chgs_prior_adoption.dpatch
+++ b/debian/patches/21_fix_year_display.dpatch
@@ -2,7 +2,7 @@
## 00-fix_wmclockc_source_chgs_prior_adoption.dpatch by Sandro Tosi <matrixhasu at gmail.com>
##
## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+## DP: Fix year display in -year mode. Fix for #126742.
@DPATCH@
diff -urNad wmclock~/wmclock.c wmclock/wmclock.c
diff --git a/debian/patches/22_fix_12_year_display.dpatch b/debian/patches/22_fix_12_year_display.dpatch
new file mode 100644
index 0000000..762e36c
--- /dev/null
+++ b/debian/patches/22_fix_12_year_display.dpatch
@@ -0,0 +1,26 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 22_fix_12_year_display.dpatch by <jblache at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix display when both -12 and -year are given. Fix for 228985.
+
+ at DPATCH@
+diff -urNad wmclock-1.0.12.2~/wmclock.c wmclock-1.0.12.2/wmclock.c
+--- wmclock-1.0.12.2~/wmclock.c 2008-11-16 18:23:07.185633821 +0100
++++ wmclock-1.0.12.2/wmclock.c 2008-11-16 18:23:25.482650412 +0100
+@@ -828,7 +828,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 --git a/debian/patches/23_select_dont_sleep.dpatch b/debian/patches/23_select_dont_sleep.dpatch
new file mode 100644
index 0000000..8315ce0
--- /dev/null
+++ b/debian/patches/23_select_dont_sleep.dpatch
@@ -0,0 +1,85 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 23_select_dont_sleep.dpatch by <jblache at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Use select() instead of sleeping, reducing the number of wakeups to the
+## DP: bare minimum depending on the command line options. From #495468.
+
+ at DPATCH@
+diff -urNad wmclock-1.0.12.2~/wmclock.c wmclock-1.0.12.2/wmclock.c
+--- wmclock-1.0.12.2~/wmclock.c 2008-11-16 18:29:35.825644352 +0100
++++ wmclock-1.0.12.2/wmclock.c 2008-11-16 18:30:45.389973898 +0100
+@@ -20,6 +20,7 @@
+ * with the software or the use or other dealings in the software.
+ */
+
++#include <sys/select.h>
+ #include <sys/types.h>
+ #include <sys/wait.h>
+ #include <sys/time.h>
+@@ -141,7 +142,8 @@
+ Display *dpy;
+ Window rootWindow;
+ int screen;
+-/* int xFd; */
++int xFd;
++fd_set xFdSet;
+ int displayDepth;
+ XSizeHints sizeHints;
+ XWMHints wmHints;
+@@ -801,6 +803,7 @@
+ XTextProperty wmName;
+ XClassHint classHint;
+ Pixmap shapeMask;
++ struct timeval nextEvent;
+
+ /* Parse command line options */
+ progName = extractProgName(argv[0]);
+@@ -842,7 +845,7 @@
+ screen = DefaultScreen(dpy);
+ rootWindow = RootWindow(dpy, screen);
+ displayDepth = DefaultDepth(dpy, screen);
+- /* xFd = XConnectionNumber(dpy); */
++ xFd = XConnectionNumber(dpy);
+
+ /* Icon Daten nach XImage konvertieren */
+ GetXpms();
+@@ -1042,14 +1045,31 @@
+ poll((struct poll *) 0, (size_t) 0, 50); /* 5/100 sec */
+ }
+ #else
+- if (enableYearDisplay)
+- {
+- usleep(200000L); /* 1/5 sec */
+- }
++ /* compute the date of next event, in order to avoid polling */
++ if (enableBlinking)
++ {
++ gettimeofday(&nextEvent, NULL);
++ nextEvent.tv_sec = 0;
++ nextEvent.tv_usec = 1000000 - nextEvent.tv_usec;
++ }
+ else
+- {
+- usleep(50000L); /* 5/100 sec */
+- }
++ {
++ if (enableYearDisplay)
++ {
++ nextEvent.tv_sec = 86400 - actualTime%86400;
++ nextEvent.tv_usec = 0;
++ }
++ else
++ {
++ nextEvent.tv_sec = 60 - actualTime%60;
++ nextEvent.tv_usec = 0;
++ }
++ }
++
++ FD_ZERO(&xFdSet);
++ FD_SET(xFd, &xFdSet);
++
++ select(FD_SETSIZE, &xFdSet, NULL, NULL, &nextEvent);
+ #endif
+ }
+ return(0);
--
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