[Pkg-wmaker-commits] [wmclock] 20/66: Imported Debian patch 1.0.12.2-7
Doug Torrance
dtorrance-guest at moszumanska.debian.org
Thu Aug 20 10:52:49 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 b46c5555991cff84525f011b18ac60bd2a8336a1
Author: Sandro Tosi <matrixhasu at gmail.com>
Date: Wed Oct 3 22:54:36 2007 +0200
Imported Debian patch 1.0.12.2-7
---
debian/changelog | 48 ++++++++++++++++++++++
debian/compat | 2 +-
debian/control | 16 ++++----
debian/copyright | 31 +++++++++++---
{lang.polish => debian/lang.polish}/month.xpm | 0
{lang.polish => debian/lang.polish}/weekday.xpm | 0
debian/menu | 3 ++
...0-fix_manpage_source_chgs_prior_adoption.dpatch | 32 +++++++++++++++
...-fix_wmclockc_source_chgs_prior_adoption.dpatch | 24 +++++++++++
debian/patches/00list | 3 ++
.../patches/10-fix_manpage_lintian_warning.dpatch | 19 +++++++++
debian/rules | 28 ++++---------
debian/watch | 2 +
debian/wmclock.docs | 1 -
debian/wmclock.menu | 3 --
debian/wmclock.postinst | 24 -----------
debian/wmclock.postrm | 27 ------------
wmclock.c | 13 ++----
wmclock.man.in | 15 -------
19 files changed, 177 insertions(+), 114 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index c23b757..d99e29c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,51 @@
+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 upstram 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
+ - manu 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 buy Debian maintainer, not upstream
+
+ -- Sandro Tosi <matrixhasu at gmail.com> Wed, 03 Oct 2007 22:54:36 +0200
+
wmclock (1.0.12.2-6) unstable; urgency=low
* debian/control:
diff --git a/debian/compat b/debian/compat
index b8626c4..7ed6ff8 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-4
+5
diff --git a/debian/control b/debian/control
index 1037545..d63e3d2 100644
--- a/debian/control
+++ b/debian/control
@@ -1,17 +1,17 @@
Source: wmclock
Section: x11
Priority: optional
-Maintainer: Debian QA Group <packages at qa.debian.org>
-Build-Depends: debhelper (>= 4), libxpm-dev, libx11-dev, xutils
+Maintainer: Sandro Tosi <matrixhasu at gmail.com>
+Build-Depends: debhelper (>= 5), libxpm-dev, libx11-dev, xutils, dpatch
Standards-Version: 3.7.2
+Homepage: http://www.jmknoble.net/WindowMaker/wmclock/
Package: wmclock
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Recommends: wmaker
-Description: A 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.
- .
- For further information see http://www.jmknoble.net/WindowMaker/wmclock/
+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 --git a/debian/copyright b/debian/copyright
index a5c810e..dd4d98b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,14 +1,33 @@
This package was debianized by Szabolcs Horvath
<horvaths at janus.gimsz.sulinet.hu> on Sun, 15 Apr 2001 07:08:38 +0000.
-It is now maintained by Romain Francoise <rfrancoise at debian.org>.
-It was downloaded from http://www.bensinclair.com/dockapp/
+It was maintained by Romain Francoise <rfrancoise at debian.org>.
+Is is not maintained by Sandro Tosi <matrixhasu at gmail.com>
+
+It was downloaded from http://www.bensinclair.com/dockapp/ and it is
+now available on http://www.jmknoble.net/WindowMaker/wmclock/ .
Upstream Author: Jim Knoble <jmknoble at pobox.com>
-Copyright: wmclock contains parts from asclock and original code, all
-licensed under the GNU General Public License (GPL), with additional
-warranty-voiding clauses.
+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 can be found in `/usr/share/common-licenses/GPL'.
+License, version 2, can be found in `/usr/share/common-licenses/GPL-2'.
diff --git a/lang.polish/month.xpm b/debian/lang.polish/month.xpm
similarity index 100%
rename from lang.polish/month.xpm
rename to debian/lang.polish/month.xpm
diff --git a/lang.polish/weekday.xpm b/debian/lang.polish/weekday.xpm
similarity index 100%
rename from lang.polish/weekday.xpm
rename to debian/lang.polish/weekday.xpm
diff --git a/debian/menu b/debian/menu
new file mode 100644
index 0000000..22b0eb6
--- /dev/null
+++ b/debian/menu
@@ -0,0 +1,3 @@
+?package(wmclock):needs="x11" \
+ section="Applications/Tools" hints="Clocks" title="Wmclock" \
+ command="/usr/bin/wmclock"
diff --git a/debian/patches/00-fix_manpage_source_chgs_prior_adoption.dpatch b/debian/patches/00-fix_manpage_source_chgs_prior_adoption.dpatch
new file mode 100644
index 0000000..fff0b66
--- /dev/null
+++ b/debian/patches/00-fix_manpage_source_chgs_prior_adoption.dpatch
@@ -0,0 +1,32 @@
+#! /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: No description.
+
+ at 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 @@
+ 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 --git a/debian/patches/00-fix_wmclockc_source_chgs_prior_adoption.dpatch b/debian/patches/00-fix_wmclockc_source_chgs_prior_adoption.dpatch
new file mode 100644
index 0000000..fc5e316
--- /dev/null
+++ b/debian/patches/00-fix_wmclockc_source_chgs_prior_adoption.dpatch
@@ -0,0 +1,24 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 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.
+
+ at DPATCH@
+diff -urNad wmclock~/wmclock.c wmclock/wmclock.c
+--- wmclock~/wmclock.c 2000-03-08 08:31:33.000000000 +0100
++++ wmclock/wmclock.c 2007-10-03 22:42:36.000000000 +0200
+@@ -470,11 +470,11 @@
+ 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 % 1000);
++ digitXOffset = LED_NUM_WIDTH * (year % 1000 / 100);
+ XCopyArea(dpy, led.pixmap, visible.pixmap, normalGC,
+ digitXOffset , digitYOffset, LED_NUM_WIDTH, LED_NUM_HEIGHT,
+ xPos[DIGIT_2_X_POS], yPos[DIGIT_Y_POS]);
+- digitXOffset = LED_NUM_WIDTH * (year % 100);
++ digitXOffset = LED_NUM_WIDTH * (year % 100 / 10);
+ XCopyArea(dpy, led.pixmap, visible.pixmap, normalGC,
+ digitXOffset , digitYOffset, LED_NUM_WIDTH, LED_NUM_HEIGHT,
+ xPos[DIGIT_3_X_POS], yPos[DIGIT_Y_POS]);
diff --git a/debian/patches/00list b/debian/patches/00list
new file mode 100644
index 0000000..3e5df3b
--- /dev/null
+++ b/debian/patches/00list
@@ -0,0 +1,3 @@
+00-fix_manpage_source_chgs_prior_adoption
+00-fix_wmclockc_source_chgs_prior_adoption
+10-fix_manpage_lintian_warning
diff --git a/debian/patches/10-fix_manpage_lintian_warning.dpatch b/debian/patches/10-fix_manpage_lintian_warning.dpatch
new file mode 100644
index 0000000..dd1ae31
--- /dev/null
+++ b/debian/patches/10-fix_manpage_lintian_warning.dpatch
@@ -0,0 +1,19 @@
+#! /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/rules b/debian/rules
index b89c41c..be0812c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,8 @@
#!/usr/bin/make -f
-configure: configure-stamp
+include /usr/share/dpatch/dpatch.make
+configure: configure-stamp
configure-stamp:
dh_testdir
./configure --prefix=/usr \
@@ -9,13 +10,12 @@ configure-stamp:
touch configure-stamp
build: build-stamp
-
-build-stamp: configure-stamp
+build-stamp: patch-stamp configure-stamp
dh_testdir
$(MAKE)
touch build-stamp
-clean:
+clean: unpatch
dh_testdir
dh_testroot
rm -f build-stamp configure-stamp
@@ -32,7 +32,7 @@ install: build
dh_clean -k
dh_installdirs
$(MAKE) install BINDIR=$(CURDIR)/debian/wmclock/usr/bin
- for dir in lang.*; do \
+ for dir in lang.* debian/lang.*; do \
cp -r "$$dir" $(CURDIR)/debian/wmclock/usr/share/wmclock; \
done
@@ -41,26 +41,16 @@ binary-indep: build install;
binary-arch: build install
dh_testdir
dh_testroot
-# dh_installdebconf
- dh_installdocs
+ dh_installdocs README
dh_installexamples
- dh_installmenu -n
-# dh_installlogrotate
-# dh_installemacsen
-# dh_installpam
-# dh_installmime
-# dh_installinit
-# dh_installcron
- dh_installman wmclock.man
-# dh_undocumented
- dh_installchangelogs ChangeLog
+ dh_installmenu
+ dh_installman wmclock.man
+ dh_installchangelogs ChangeLog
dh_link
dh_strip
dh_compress
dh_fixperms
-# dh_makeshlibs
dh_installdeb
-# dh_perl
dh_shlibdeps
dh_gencontrol
dh_md5sums
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..6b2cad4
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,2 @@
+version=3
+http://www.jmknoble.net/WindowMaker/wmclock/ wmclock-([\d\.]*)\.tar\.gz
diff --git a/debian/wmclock.docs b/debian/wmclock.docs
deleted file mode 100644
index e845566..0000000
--- a/debian/wmclock.docs
+++ /dev/null
@@ -1 +0,0 @@
-README
diff --git a/debian/wmclock.menu b/debian/wmclock.menu
deleted file mode 100644
index 3810326..0000000
--- a/debian/wmclock.menu
+++ /dev/null
@@ -1,3 +0,0 @@
-?package(wmclock):needs="x11" \
- section="Apps/Tools" hints="Clocks" title="Wmclock" \
- command="/usr/bin/wmclock"
diff --git a/debian/wmclock.postinst b/debian/wmclock.postinst
deleted file mode 100644
index ef8e044..0000000
--- a/debian/wmclock.postinst
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-
-set -e
-
-case "$1" in
- configure)
- if [ -x /usr/bin/update-menus ]; then
- update-menus;
- fi
- ;;
-
- abort-upgrade|abort-remove|abort-deconfigure)
-
- ;;
-
- *)
- echo "postinst called with unknown argument \`$1'" >&2
- exit 0
- ;;
-esac
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/wmclock.postrm b/debian/wmclock.postrm
deleted file mode 100644
index e8baecb..0000000
--- a/debian/wmclock.postrm
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh
-
-set -e
-
-case "$1" in
- remove)
- if [ -x /usr/bin/update-menus ]; then
- update-menus;
- fi
- ;;
-
- purge|upgrade|abort-install|abort-upgrade|disappear)
- ;;
-
- failed-upgrade)
- exit 1
- ;;
-
- *)
- echo "postrm called with unknown argument \`$1'" >&2
- exit 1
- ;;
-esac
-
-#DEBHELPER#
-
-exit 0
diff --git a/wmclock.c b/wmclock.c
index d3a0eba..5844331 100644
--- a/wmclock.c
+++ b/wmclock.c
@@ -470,11 +470,11 @@ void showYear()
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 % 1000 / 100);
+ digitXOffset = LED_NUM_WIDTH * (year % 1000);
XCopyArea(dpy, led.pixmap, visible.pixmap, normalGC,
digitXOffset , digitYOffset, LED_NUM_WIDTH, LED_NUM_HEIGHT,
xPos[DIGIT_2_X_POS], yPos[DIGIT_Y_POS]);
- digitXOffset = LED_NUM_WIDTH * (year % 100 / 10);
+ digitXOffset = LED_NUM_WIDTH * (year % 100);
XCopyArea(dpy, led.pixmap, visible.pixmap, normalGC,
digitXOffset , digitYOffset, LED_NUM_WIDTH, LED_NUM_HEIGHT,
xPos[DIGIT_3_X_POS], yPos[DIGIT_Y_POS]);
@@ -828,14 +828,7 @@ int main(int argc, char **argv)
#endif /* !ONLY_SHAPED_WINDOW */
for (i = 0; i < NUM_TIME_POSITIONS; i++)
{
- if (enable12HourClock && (!enableYearDisplay))
- {
- xPos[i] += timePos24[i];
- }
- else
- {
- xPos[i] += timePos12[i];
- }
+ xPos[i] += enable12HourClock ? timePos24[i] : timePos12[i];
}
/* Open the display */
diff --git a/wmclock.man.in b/wmclock.man.in
index 81fd224..bf0f018 100644
--- a/wmclock.man.in
+++ b/wmclock.man.in
@@ -160,21 +160,6 @@ beginning with January at the top and continuing down to December at
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
--
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