[Pkg-wmaker-commits] [wmclock] 29/66: Imported Debian patch 1.0.14-3

Doug Torrance dtorrance-guest at moszumanska.debian.org
Thu Aug 20 10:52:52 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 4b4edcb2675f957fb9c3cb8a23cdd5771887f573
Author: Doug Torrance <dtorrance at monmouthcollege.edu>
Date:   Mon Oct 7 18:07:12 2013 -0500

    Imported Debian patch 1.0.14-3
---
 debian/changelog                  | 11 ++++++
 debian/copyright                  | 76 +++++++++++++++++++--------------------
 debian/patches/correct_year.patch | 18 ++++++++++
 debian/patches/series             |  1 +
 debian/rules                      |  6 +++-
 5 files changed, 73 insertions(+), 39 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 975f35f..73b2b66 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+wmclock (1.0.14-3) unstable; urgency=low
+
+  * debian/copyright
+    + Update to copyright format 1.0.
+  * debian/patches
+    + Fix incorrect year with -year option (Closes: #723887).
+  * debian/rules
+    + Install translated xpms again (Closes: #725677).
+
+ -- Doug Torrance <dtorrance at monmouthcollege.edu>  Mon, 07 Oct 2013 18:07:12 -0500
+
 wmclock (1.0.14-2) unstable; urgency=low
 
   * New maintainer (Closes: #688534).
diff --git a/debian/copyright b/debian/copyright
index 663b1dd..795ca7d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,38 +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 is now maintained by Julien BLACHE <jblache at debian.org>.
-
-It was downloaded from: <http://www.bluestop.org/wmclock/>
-
-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'.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: wmsystemtray
+Upstream-Contact: Jim Knoble <jmknoble at pobox.com>
+Source: http://www.bluestop.org/wmclock/
+
+Files: *
+Copyright: 1999 Jim Knoble
+License: GPL-2+
+
+Files: debian/*
+Copyright: 2001 Szabolcs Horvath
+	   2003 Romain Francoise
+	   2007 Sandro Tosi
+	   2010 Julien Blache
+	   2013 Doug Torrance
+License: GPL-2+
+
+License: GPL-2+ 
+ This program is free software; you can redistribute it
+ and/or modify it under the terms of the GNU General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later
+ version.
+ .
+ This program is distributed in the hope that it will be
+ useful, but WITHOUT ANY WARRANTY; without even the implied
+ warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ PURPOSE.  See the GNU General Public License for more
+ details.
+ .
+ You should have received a copy of the GNU General Public
+ License along with this package; if not, write to the Free
+ Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ Boston, MA  02110-1301 USA
+ .
+ On Debian systems, the full text of the GNU General Public
+ License version 2 can be found in the file
+ `/usr/share/common-licenses/GPL-2'
\ No newline at end of file
diff --git a/debian/patches/correct_year.patch b/debian/patches/correct_year.patch
new file mode 100644
index 0000000..fea13a2
--- /dev/null
+++ b/debian/patches/correct_year.patch
@@ -0,0 +1,18 @@
+Description: <short summary of the patch>
+ When the -year option is selected, the 4th digit of the year is used in place
+of the 2nd digit.  This is due to a typo in the showYear function.
+
+Author: Doug Torrance <dtorrance at monmouthcollege.edu>
+Bug-Debian: http://bugs.debian.org/723887
+
+--- wmclock-1.0.14.orig/wmclock.c
++++ wmclock-1.0.14/wmclock.c
+@@ -490,7 +490,7 @@ void showYear(void)
+    XCopyArea(dpy, led.pixmap, visible.pixmap, normalGC,
+ 	     digitXOffset , digitYOffset, LED_NUM_WIDTH, LED_NUM_HEIGHT,
+ 	     xPos[DIGIT_1_X_POS], yPos[DIGIT_Y_POS]);
+-   digitXOffset = LED_NUM_WIDTH * ((year % 100) % 10);
++   digitXOffset = LED_NUM_WIDTH * ((year / 100) % 10);
+    XCopyArea(dpy, led.pixmap, visible.pixmap, normalGC,
+ 	     digitXOffset , digitYOffset, LED_NUM_WIDTH, LED_NUM_HEIGHT,
+ 	     xPos[DIGIT_2_X_POS], yPos[DIGIT_Y_POS]);
diff --git a/debian/patches/series b/debian/patches/series
index 6fa81c4..4154e87 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 manpage_fixes.patch
 manpage_xpm_notes.patch
 fix_12_year_display.patch
+correct_year.patch
diff --git a/debian/rules b/debian/rules
index 933b1da..ee2e7d5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,3 +1,7 @@
 #!/usr/bin/make -f
 %:
-	dh $@
\ No newline at end of file
+	dh $@
+
+override_dh_auto_install:
+	dh_auto_install
+	$(MAKE) install.share DESTDIR=$(CURDIR)/debian/wmclock/usr

-- 
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