[Pkg-wmaker-commits] [wmsun] 02/73: Imported Debian patch 1.03-16
Doug Torrance
dtorrance-guest at moszumanska.debian.org
Fri Aug 28 12:04:41 UTC 2015
This is an automated email from the git hooks/post-receive script.
dtorrance-guest pushed a commit to branch master
in repository wmsun.
commit 6add01d98a48469055f9330c33660dd9c0342a35
Author: Martin A. Godisch <godisch at debian.org>
Date: Fri Feb 11 22:18:05 2005 +0100
Imported Debian patch 1.03-16
---
debian/changelog | 110 ++++++++++++++++++++++++++++++++++++++++++++++
debian/changelog.upstream | 63 ++++++++++++++++++++++++++
debian/config | 26 ++++++++---
debian/control | 21 +++++----
debian/copyright | 21 ++++-----
debian/docs | 2 -
debian/menu | 2 +-
debian/po/POTFILES.in | 1 +
debian/po/cs.po | 88 +++++++++++++++++++++++++++++++++++++
debian/po/de.po | 91 ++++++++++++++++++++++++++++++++++++++
debian/po/es.po | 91 ++++++++++++++++++++++++++++++++++++++
debian/po/fr.po | 93 +++++++++++++++++++++++++++++++++++++++
debian/po/ja.po | 88 +++++++++++++++++++++++++++++++++++++
debian/po/pt_BR.po | 92 ++++++++++++++++++++++++++++++++++++++
debian/po/templates.pot | 75 +++++++++++++++++++++++++++++++
debian/postinst | 61 +++++++++++++------------
debian/postrm | 21 +++++++++
debian/rules | 107 ++++++++++++++++++++++----------------------
debian/templates | 45 +++++++------------
wmSun/Makefile | 12 +++--
wmSun/SunRise.c | 13 +++---
wmSun/wmSun.c | 11 +++--
22 files changed, 972 insertions(+), 162 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index e30b240..ab928e4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,113 @@
+wmsun (1.03-16) unstable; urgency=low
+
+ * Added Czech debconf translation, closes: #294734.
+ Thanks to Miroslav Kure.
+ * Fixed POSIX compliance of debian/rules.
+ * Removed watch file, upstream homepage is gone.
+
+ -- Martin A. Godisch <godisch at debian.org> Fri, 11 Feb 2005 22:18:05 +0100
+
+wmsun (1.03-15) unstable; urgency=low
+
+ * Added Japanese debconf translation, closes: #236819.
+ Thanks to Hideki Yamane.
+ * Removed ucf/debconf and lintian workarounds.
+ * Updated debian/menu, debian/rules, and standards version.
+
+ -- Martin A. Godisch <godisch at debian.org> Mon, 08 Mar 2004 16:41:45 +0100
+
+wmsun (1.03-14) unstable; urgency=low
+
+ * Simplified ucf handling, see bug #199233, adjusted ucf dependency,
+ closes: #201574.
+ * Added Spanish debconf translation, closes: #201902.
+ Thanks to Carlos Alberto Martín Edo.
+ * Removed useless BUGS file.
+ * Converted debian/changelog to UTF-8.
+ * Updated standards version.
+
+ -- Martin A. Godisch <godisch at debian.org> Sun, 27 Jul 2003 15:56:32 +0200
+
+wmsun (1.03-13) unstable; urgency=low
+
+ * Improved ucf transition.
+
+ -- Martin A. Godisch <godisch at debian.org> Sun, 29 Jun 2003 10:24:00 +0200
+
+wmsun (1.03-12) unstable; urgency=low
+
+ * Updated deb'configuration, added ucf support.
+
+ -- Martin A. Godisch <godisch at debian.org> Fri, 27 Jun 2003 07:11:55 +0200
+
+wmsun (1.03-11) unstable; urgency=low
+
+ * Updated deb'configuration.
+ * Updated standards version.
+
+ -- Martin A. Godisch <godisch at debian.org> Fri, 30 May 2003 18:38:35 +0200
+
+wmsun (1.03-10) unstable; urgency=low
+
+ * Added french debconf translation, closes: #189225.
+ Thanks to Christian Perrier.
+ * Updated configuration.
+
+ -- Martin A. Godisch <godisch at debian.org> Wed, 16 Apr 2003 09:52:25 +0200
+
+wmsun (1.03-9) unstable; urgency=low
+
+ * Added portuguese debconf translation, closes: #185684.
+ Thanks to André Luís Lopes.
+ * Improved debconf template, see #185710.
+
+ -- Martin A. Godisch <godisch at debian.org> Sat, 22 Mar 2003 07:33:40 +0100
+
+wmsun (1.03-8) unstable; urgency=low
+
+ * Transition to po-debconf, updated build-dependencies.
+ * Fixed package description.
+ * Updated standards version.
+
+ -- Martin A. Godisch <godisch at debian.org> Fri, 14 Mar 2003 08:09:42 +0100
+
+wmsun (1.03-7) unstable; urgency=low
+
+ * Made debian/config asking wmmoonclock for default values.
+ * Fixed update-menus in debian/postinst and debian/postrm.
+ * Added upstream changelog.
+ * Added upstream homepage to package description.
+
+ -- Martin A. Godisch <godisch at debian.org> Sat, 01 Mar 2003 09:54:54 +0100
+
+wmsun (1.03-6) unstable; urgency=low
+
+ * Fixed Makefile and compiler warnings.
+ * Added Lintian override about menu file not in DEBIAN/md5sums,
+ because it is debconf'igured.
+ * Simplified debian/config.
+ * Removed build-dependency on debhelper.
+ * Updated maintainer email address.
+
+ -- Martin A. Godisch <godisch at debian.org> Fri, 21 Feb 2003 20:22:10 +0100
+
+wmsun (1.03-5) unstable; urgency=low
+
+ * Fixed handling of menu file (closes: #161745).
+ * Updated Debian standards version.
+
+ -- Martin A. Godisch <godisch at tcs.inf.tu-dresden.de> Sat, 21 Sep 2002 15:41:40 +0200
+
+wmsun (1.03-4) unstable; urgency=low
+
+ * Added symbolic links "wmsun -> wmSun" and "wmsun.1.gz -> wmSun.1.gz"
+ (closes: #149923).
+ * Added Spanish debconf translation.
+ Thanks to Ricardo Javier Cardenes <ricardo at conysis.com>.
+ * Added debian/watch.
+
+ -- Martin A. Godisch <godisch at tcs.inf.tu-dresden.de> Fri, 30 Aug 2002 18:49:06 +0200
+
wmsun (1.03-3) unstable; urgency=low
* Moved files from /usr/X11R6 to /usr.
diff --git a/debian/changelog.upstream b/debian/changelog.upstream
new file mode 100644
index 0000000..8370ef1
--- /dev/null
+++ b/debian/changelog.upstream
@@ -0,0 +1,63 @@
+/*
+ *
+ * wmSun-1.03 (C) 1999 Mike Henderson (mghenderson at lanl.gov)
+ *
+ * - Shows Sun Rise/Set Times....
+ *
+ *
+ *
+ *
+ *
+ * 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, 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 program (see the file COPYING); if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA
+ *
+ * Things TODO:
+ * - clean up code!
+ * - support for 8-bit displays.
+ * - more detailed documentation.
+ * - eclipses?
+ * - add buttons to play will date and lat lon...
+ * Could be something like this;
+ * First click brings up buttons to change date.
+ * Second click brings up buttons to change lat/lon.
+ * Third goes back to display
+ * Set time delay to go back to display if user doesnt do it...
+ *
+ *
+ *
+ *
+ *
+ * Changes:
+ *
+ * Version 1.03 - released February 4, 1999.
+ * cosmetic for AfterStep users. removed spurious black line at RHS edge an mask.
+ *
+ *
+ * Version 1.02 - released January 12, 1999.
+ * Added support for User-specified date and Time difference so that
+ * you can have the display be correct in local time even for remote
+ * lat/lons. (I am in Hawaii right now. I dont want to reset the time on
+ * my laptop, so with these new options I can still get the correct
+ * local times of rise/set. Sunset is awesome here in Kona!!! And the calcs
+ * seem to be quite good -- it's a good test here because the Sun sets over
+ * the Pacific (no mountains are in the way)).
+ *
+ * Version 1.01 - released January 6, 1999.
+ * Fixed stupid bug in Date change montior.
+ *
+ * Version 1.0 - released January 5, 1999.
+ *
+ *
+ */
diff --git a/debian/config b/debian/config
index c490959..1554435 100644
--- a/debian/config
+++ b/debian/config
@@ -1,10 +1,26 @@
-#! /bin/sh -e
+#!/bin/sh
+
+set -e
+
+[ -x /usr/bin/ucf ] || exit 0
. /usr/share/debconf/confmodule
-db_version "2.0"
-db_title "Configuring wmSun"
+db_version 2.0
+
+db_get wmsun/latitude
+if [ -z "$RET" ] && db_get wmmoonclock/latitude; then
+ db_set wmsun/latitude "$RET"
+fi
+db_get wmsun/longitude
+if [ -z "$RET" ] && db_get wmmoonclock/longitude; then
+ db_set wmsun/longitude "$RET"
+fi
-db_input medium wmsun/latitude && db_go || :
-db_input medium wmsun/longitude && db_go || :
+db_beginblock
+db_input medium wmsun/latitude || true
+db_input medium wmsun/longitude || true
+db_endblock
+db_go || true
+db_stop
exit 0
diff --git a/debian/control b/debian/control
index abc8390..88cd069 100644
--- a/debian/control
+++ b/debian/control
@@ -1,16 +1,19 @@
Source: wmsun
Section: x11
Priority: optional
-Maintainer: Martin A. Godisch <godisch at tcs.inf.tu-dresden.de>
-Build-Depends: xlibs-dev, debhelper (>> 3.0.0)
-Standards-Version: 3.5.6
+Maintainer: Martin A. Godisch <godisch at debian.org>
+Build-Depends: xlibs-dev, po-debconf
+Standards-Version: 3.6.1
Package: wmsun
Architecture: any
-Depends: debconf, ${shlibs:Depends}
-Suggests: wmaker
+Depends: ${shlibs:Depends}
+Recommends: debconf (>= 0.5) | debconf-2.0, ucf (>= 0.30)
+Conflicts: ucf (<< 0.30)
+Suggests: wmmoonclock, wmaker | afterstep
Description: Dockable WindowMaker SunRise/SunSet App
- wmSun displays the current day's Sun Rise and Set Times. You must
- enter your Latitude and Longitude for it to work correctly. wmSun
- is designed to work with the WindowMaker dock, but will work
- with other window managers as well.
+ wmSun displays the current day's Sun Rise and Set Times. You have to
+ enter your Latitude and Longitude for it to work correctly. wmSun is
+ designed to work with the WindowMaker dock, but will work with other
+ window managers as well. wmSun's upstream homepage can be found at
+ http://nis-www.lanl.gov/~mgh/WindowMaker/DockApps.shtml.
diff --git a/debian/copyright b/debian/copyright
index 51d8f58..450171d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,11 +1,6 @@
-This package was debianized by
-Martin A. Godisch <godisch at tcs.inf.tu-dresden.de>
-on Mon, 1 Feb 1999 01:37:20 -0800.
-
+This package was debianized by Martin A. Godisch <godisch at debian.org>.
It was downloaded from
-http://nis-www.lanl.gov/~mgh/WindowMaker/DockApps.shtml
-
-Upstream Author: Michael G. Henderson <mghenderson at lanl.gov>
+http://nis-www.lanl.gov/~mgh/WindowMaker/DockApps.shtml.
Copyright (c) Michael G. Henderson <mghenderson at lanl.gov>
@@ -14,14 +9,14 @@ Copyright (c) Michael G. Henderson <mghenderson at lanl.gov>
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.
+ 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 program; if not, write to the Free Software Foundation, Inc.,
59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
-On Debian GNU/Linux systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
+On Debian GNU/Linux systems, the complete text of the GNU General Public
+License can be found in /usr/share/common-licenses/GPL.
diff --git a/debian/docs b/debian/docs
deleted file mode 100644
index 2e58c4d..0000000
--- a/debian/docs
+++ /dev/null
@@ -1,2 +0,0 @@
-BUGS
-TODO
diff --git a/debian/menu b/debian/menu
index 230a87a..aed6d00 100644
--- a/debian/menu
+++ b/debian/menu
@@ -1,2 +1,2 @@
-?package(wmsun):needs=X11 section=Apps/Tools\
+?package(wmsun):needs="X11" section="Apps/Tools" \
title="wmSun" command="/usr/bin/wmSun"
diff --git a/debian/po/POTFILES.in b/debian/po/POTFILES.in
new file mode 100644
index 0000000..cef83a3
--- /dev/null
+++ b/debian/po/POTFILES.in
@@ -0,0 +1 @@
+[type: gettext/rfc822deb] templates
diff --git a/debian/po/cs.po b/debian/po/cs.po
new file mode 100644
index 0000000..a75f8ed
--- /dev/null
+++ b/debian/po/cs.po
@@ -0,0 +1,88 @@
+#
+# Translators, if you are not familiar with the PO format, gettext
+# documentation is worth reading, especially sections dedicated to
+# this format, e.g. by running:
+# info -n '(gettext)PO Files'
+# info -n '(gettext)Header Entry'
+#
+# Some information specific to po-debconf are available at
+# /usr/share/doc/po-debconf/README-trans
+# or http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+# Developers do not need to manually edit POT or PO files.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: wmsun\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-03-08 16:37+0100\n"
+"PO-Revision-Date: 2005-02-11 12:46+0100\n"
+"Last-Translator: Miroslav Kure <kurem at debian.cz>\n"
+"Language-Team: Czech <debian-l10n-czech at debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-2\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: string
+#. Description
+#: ../templates:3
+msgid "Please enter the latitude of the observer."
+msgstr "Zadejte zem�pisnou ���ku pozorovatele."
+
+#. Type: string
+#. Description
+#: ../templates:3
+msgid ""
+"You have to enter your latitude for wmSun to work correctly. You may find it "
+"out at http://www.calle.com/world/, positive is northern hemisphere, "
+"negative is southern hemisphere. If you don't know your latitude at this "
+"moment, leave the input field blank and run `dpkg-reconfigure wmsun' later."
+msgstr ""
+"Aby wmSun pracoval spr�vn�, mus�te zadat svou zem�pisnou ���ku. "
+"Zjistit ji m��ete t�eba na http://www.calle.com/world/ (severn� polokoule "
+"m� ��sla kladn�, ji�n� z�porn�). Pokud nyn� svou zem�pisnou ���ku nezn�te, "
+"nezad�vejte nic a pozd�ji spus�te `dpkg-reconfigure wmsun'."
+
+#. Type: string
+#. Description
+#: ../templates:3
+msgid ""
+"Note that this configuration applies only to the X menu system. If you call "
+"wmSun from a terminal prompt you can supply the `-lat' option."
+msgstr ""
+"Toto nastaven� se t�k� pouze spu�t�n� z menu. Zavol�te-li wmSun z "
+"termin�lu, m��ete zadat parametr `-lat'."
+
+#. Type: string
+#. Description
+#: ../templates:16
+msgid "Please enter the longitude of the observer."
+msgstr "Zadejte zem�pisnou d�lku pozorovatele."
+
+#. Type: string
+#. Description
+#: ../templates:16
+msgid ""
+"You have to enter your longitude for wmSun to work correctly. You may find "
+"it out at http://www.calle.com/world/. Greenwich is 0.0, and longitude "
+"increases positively toward the west. Alternatively, negative numbers can "
+"also be used to specify longitudes to the east of Greenwich. If you don't "
+"know your longitude at this moment, leave the input field blank and run "
+"`dpkg-reconfigure wmsun' later."
+msgstr ""
+"Aby wmSun pracoval spr�vn�, mus�te zadat svou zem�pisnou d�lku. "
+"Zjistit ji m��ete t�eba na http://www.calle.com/world/. Greenwich m� hodnotu "
+"0.0, sm�rem na z�pad se d�lka zv�t�uje. Voliteln� m��ete zadat i z�pornou "
+"hodnotu, kter� zna�� d�lky na v�chod od Greenwiche. Pokud nyn� svou "
+"zem�pisnou d�lku nezn�te, nezad�vejte nic a pozd�ji spus�te "
+"`dpkg-reconfigure wmsun'."
+
+#. Type: string
+#. Description
+#: ../templates:16
+msgid ""
+"Note that this configuration applies only to the X menu system. If you call "
+"wmSun from a terminal prompt you can supply the `-lon' option."
+msgstr ""
+"Toto nastaven� se t�k� pouze spu�t�n� z menu. Zavol�te-li wmSun z "
+"termin�lu, m��ete zadat parametr `-lon'."
diff --git a/debian/po/de.po b/debian/po/de.po
new file mode 100644
index 0000000..a1f073a
--- /dev/null
+++ b/debian/po/de.po
@@ -0,0 +1,91 @@
+#
+# Translators, if you are not familiar with the PO format, gettext
+# documentation is worth reading, especially sections dedicated to
+# this format, e.g. by running:
+# info -n '(gettext)PO Files'
+# info -n '(gettext)Header Entry'
+#
+# Some information specific to po-debconf are available at
+# /usr/share/doc/po-debconf/README-trans
+# or http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+# Developers do not need to manually edit POT or PO files.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: wmsun 1.03-8\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-03-08 16:37+0100\n"
+"PO-Revision-Date: 2003-03-21 10:30+0100\n"
+"Last-Translator: Martin A. Godisch <godisch at debian.org>\n"
+"Language-Team: Martin A. Godisch <godisch at debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=iso-8859-15\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: string
+#. Description
+#: ../templates:3
+msgid "Please enter the latitude of the observer."
+msgstr "Bitte geben Sie Ihren Breitengrad ein."
+
+#. Type: string
+#. Description
+#: ../templates:3
+msgid ""
+"You have to enter your latitude for wmSun to work correctly. You may find it "
+"out at http://www.calle.com/world/, positive is northern hemisphere, "
+"negative is southern hemisphere. If you don't know your latitude at this "
+"moment, leave the input field blank and run `dpkg-reconfigure wmsun' later."
+msgstr ""
+"Zur korrekten Funktion ben�tigt wmSun Ihren Breitengrad. Dieser l��t sich "
+"unter http://www.calle.com/world/ herausfinden, positive Werte kennzeichnen "
+"die n�rdliche Halbkugel, negative die s�dliche. Falls Sie Ihren Breitengrad "
+"im Moment nicht kennen, lassen Sie dieses Eingabefeld leer und rufen Sie "
+"sp�ter \"dpkg-reconfigure wmsun\" auf."
+
+#. Type: string
+#. Description
+#: ../templates:3
+msgid ""
+"Note that this configuration applies only to the X menu system. If you call "
+"wmSun from a terminal prompt you can supply the `-lat' option."
+msgstr ""
+"Beachten Sie, da� sich diese Konfiguration nur auf das X-Men�system bezieht. "
+"Wenn Sie wmSun von der Kommandozeile aus aufrufen, sollten Sie die Option \"-"
+"lat\" angeben."
+
+#. Type: string
+#. Description
+#: ../templates:16
+msgid "Please enter the longitude of the observer."
+msgstr "Bitte geben Sie Ihren L�ngengrad ein."
+
+#. Type: string
+#. Description
+#: ../templates:16
+msgid ""
+"You have to enter your longitude for wmSun to work correctly. You may find "
+"it out at http://www.calle.com/world/. Greenwich is 0.0, and longitude "
+"increases positively toward the west. Alternatively, negative numbers can "
+"also be used to specify longitudes to the east of Greenwich. If you don't "
+"know your longitude at this moment, leave the input field blank and run "
+"`dpkg-reconfigure wmsun' later."
+msgstr ""
+"Zur korrekten Funktion ben�tigt wmSun Ihren L�ngengrad. Dieser l��t sich "
+"unter http://www.calle.com/world/ herausfinden. 0.0 steht f�r Greenwich, die "
+"L�nge wird positiv nach Westen gez�hlt. Alternativ k�nnen auch negative "
+"Werte f�r L�ngengrade �stlich von Greenwich angegeben werden. Falls Sie "
+"Ihren L�ngengrad im Moment nicht kennen, lassen Sie dieses Eingabefeld leer "
+"und rufen Sie sp�ter \"dpkg-reconfigure wmsun\" auf."
+
+#. Type: string
+#. Description
+#: ../templates:16
+msgid ""
+"Note that this configuration applies only to the X menu system. If you call "
+"wmSun from a terminal prompt you can supply the `-lon' option."
+msgstr ""
+"Beachten Sie, da� sich diese Konfiguration nur auf das X-Men�system bezieht. "
+"Wenn Sie wmSun von der Kommandozeile aus aufrufen, sollten Sie die Option \"-"
+"lon\" angeben."
diff --git a/debian/po/es.po b/debian/po/es.po
new file mode 100644
index 0000000..8b28c5a
--- /dev/null
+++ b/debian/po/es.po
@@ -0,0 +1,91 @@
+#
+# Translators, if you are not familiar with the PO format, gettext
+# documentation is worth reading, especially sections dedicated to
+# this format, e.g. by running:
+# info -n '(gettext)PO Files'
+# info -n '(gettext)Header Entry'
+#
+# Some information specific to po-debconf are available at
+# /usr/share/doc/po-debconf/README-trans
+# or http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+# Developers do not need to manually edit POT or PO files.
+#
+# Carlos Alberto Mart�n Edo <carlos at dat.etsit.upm.es>, 2003
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: wmsun 1.03-13\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-03-08 16:37+0100\n"
+"PO-Revision-Date: 2003-07-13 12:27+0200\n"
+"Last-Translator: Carlos Alberto Mart�n Edo <carlos at dat.etsit.upm.es>\n"
+"Language-Team: Debian L10n Spanish <debian-l10n-spanish at lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-15\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: string
+#. Description
+#: ../templates:3
+msgid "Please enter the latitude of the observer."
+msgstr "Por favor, introduzca la latitud del observador."
+
+#. Type: string
+#. Description
+#: ../templates:3
+msgid ""
+"You have to enter your latitude for wmSun to work correctly. You may find it "
+"out at http://www.calle.com/world/, positive is northern hemisphere, "
+"negative is southern hemisphere. If you don't know your latitude at this "
+"moment, leave the input field blank and run `dpkg-reconfigure wmsun' later."
+msgstr ""
+"Tiene que introducir su latitud para que wmSun funcione correctamente. Puede "
+"encontrar ese dato en http://www.calle.com/world/. Una latitud positiva "
+"indica hemisferio norte y negativa hemisferio sur. Si en estos momentos "
+"desconoce su latitud, deje vac�o el campo y ejecute `dpkg-reconfigure wmsun' "
+"m�s tarde."
+
+#. Type: string
+#. Description
+#: ../templates:3
+msgid ""
+"Note that this configuration applies only to the X menu system. If you call "
+"wmSun from a terminal prompt you can supply the `-lat' option."
+msgstr ""
+"N�tese que esta configuraci�n se aplica �nicamente al sistema de men�s de X. "
+"Si ejecuta wmSun desde un terminal puede utilizar las opciones `-lat'."
+
+#. Type: string
+#. Description
+#: ../templates:16
+msgid "Please enter the longitude of the observer."
+msgstr "Por favor, introduzca la longitud del observador."
+
+#. Type: string
+#. Description
+#: ../templates:16
+msgid ""
+"You have to enter your longitude for wmSun to work correctly. You may find "
+"it out at http://www.calle.com/world/. Greenwich is 0.0, and longitude "
+"increases positively toward the west. Alternatively, negative numbers can "
+"also be used to specify longitudes to the east of Greenwich. If you don't "
+"know your longitude at this moment, leave the input field blank and run "
+"`dpkg-reconfigure wmsun' later."
+msgstr ""
+"Debe introducir su longitud para que wmSun funcione correctamente. Puede "
+"encontrar ese dato en http://www.calle.com/world/. La longitud de Greenwich "
+"es 0 y va aumentando hacia el oeste. Por otra parte, se pueden utilizar "
+"n�meros negativos para especificar longitudes este respecto a Greenwich. Si "
+"ignora en estos momentos su longitud, deje vac�o el campo y ejecute `dpkg-"
+"reconfigure wmsun' m�s tarde."
+
+#. Type: string
+#. Description
+#: ../templates:16
+msgid ""
+"Note that this configuration applies only to the X menu system. If you call "
+"wmSun from a terminal prompt you can supply the `-lon' option."
+msgstr ""
+"N�tese que esta configuraci�n se aplica �nicamente al sistema de men�s de X. "
+"Si ejecuta wmSun desde un terminal puede utilizar las opciones '-lon'."
diff --git a/debian/po/fr.po b/debian/po/fr.po
new file mode 100644
index 0000000..5591872
--- /dev/null
+++ b/debian/po/fr.po
@@ -0,0 +1,93 @@
+#
+# Translators, if you are not familiar with the PO format, gettext
+# documentation is worth reading, especially sections dedicated to
+# this format, e.g. by running:
+# info -n '(gettext)PO Files'
+# info -n '(gettext)Header Entry'
+#
+# Some information specific to po-debconf are available at
+# /usr/share/doc/po-debconf/README-trans
+# or http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+# Developers do not need to manually edit POT or PO files.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: wmsun 1.03-9\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-03-08 16:37+0100\n"
+"PO-Revision-Date: 2003-04-04 08:07-0100\n"
+"Last-Translator: Christian Perrier <bubulle at debian.org>\n"
+"Language-Team: Debian french translation team <debian-l10n-french at lists."
+"debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=iso-8859-15\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: string
+#. Description
+#: ../templates:3
+msgid "Please enter the latitude of the observer."
+msgstr "Veuillez entrer la latitude de l'observateur."
+
+#. Type: string
+#. Description
+#: ../templates:3
+msgid ""
+"You have to enter your latitude for wmSun to work correctly. You may find it "
+"out at http://www.calle.com/world/, positive is northern hemisphere, "
+"negative is southern hemisphere. If you don't know your latitude at this "
+"moment, leave the input field blank and run `dpkg-reconfigure wmsun' later."
+msgstr ""
+"Vous devez indiquer la latitude du lieu o� vous vous situez pour que wmSun "
+"fonctionne correctement. Vous pouvez la trouver sur http://www.calle.com/"
+"world/, les valeurs �tant positives pour l'h�misph�re nord et n�gatives pour "
+"l'h�misph�re sud. Si vous ne connaissez pas votre latitude maintenant, "
+"laissez cette entr�e vide et lancez ��dpkg-reconfigure wmsun�� plus tard."
+
+#. Type: string
+#. Description
+#: ../templates:3
+msgid ""
+"Note that this configuration applies only to the X menu system. If you call "
+"wmSun from a terminal prompt you can supply the `-lat' option."
+msgstr ""
+"Veuillez noter que cette option de configuration ne sera utilis�e que par le "
+"syst�me de menus de X Window. Si vous d�marrez wmSun depuis la ligne de "
+"commande en mode terminal, vous pouvez utiliser l'option ��-lat��."
+
+#. Type: string
+#. Description
+#: ../templates:16
+msgid "Please enter the longitude of the observer."
+msgstr "Veuillez entrer la longitude de l'observateur."
+
+#. Type: string
+#. Description
+#: ../templates:16
+msgid ""
+"You have to enter your longitude for wmSun to work correctly. You may find "
+"it out at http://www.calle.com/world/. Greenwich is 0.0, and longitude "
+"increases positively toward the west. Alternatively, negative numbers can "
+"also be used to specify longitudes to the east of Greenwich. If you don't "
+"know your longitude at this moment, leave the input field blank and run "
+"`dpkg-reconfigure wmsun' later."
+msgstr ""
+"Vous devez indiquer la longitude du lieu o� vous vous situez pour que wmSun "
+"fonctionne correctement. Vous pouvez la trouver sur http://www.calle.com/"
+"world/. Les lieux situ�s sur le m�ridien de Greenwich ont une longitude "
+"�gale � 0.0. Les valeurs augmentent en allant vers l'ouest. � l'oppos�, des "
+"nombres n�gatifs sont utilis�s pour les lieux situ�s � l'est du m�ridien de "
+"Greenwich. Si vous ne connaissez pas votre longitude maintenant, laissez "
+"cette entr�e vide et lancez ��dpkg-reconfigure wmsun�� plus tard."
+
+#. Type: string
+#. Description
+#: ../templates:16
+msgid ""
+"Note that this configuration applies only to the X menu system. If you call "
+"wmSun from a terminal prompt you can supply the `-lon' option."
+msgstr ""
+"Veuillez noter que cette option de configuration ne sera utilis�e que par le "
+"syst�me de menus de X Window. Si vous d�marrez wmSun depuis la ligne de "
+"commande en mode terminal, vous pouvez utiliser l'option ��-lon��."
diff --git a/debian/po/ja.po b/debian/po/ja.po
new file mode 100644
index 0000000..2abf928
--- /dev/null
+++ b/debian/po/ja.po
@@ -0,0 +1,88 @@
+#
+# Translators, if you are not familiar with the PO format, gettext
+# documentation is worth reading, especially sections dedicated to
+# this format, e.g. by running:
+# info -n '(gettext)PO Files'
+# info -n '(gettext)Header Entry'
+#
+# Some information specific to po-debconf are available at
+# /usr/share/doc/po-debconf/README-trans
+# or http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+# Developers do not need to manually edit POT or PO files.
+#
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: wmsun 1.03-14\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-03-08 16:37+0100\n"
+"PO-Revision-Date: 2004-02-29 16:04+0900\n"
+"Last-Translator: Hideki Yamane <henrich at samba.gr.jp>\n"
+"Language-Team: Japanese <debian-japanese at lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=EUC-JP\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: string
+#. Description
+#: ../templates:3
+msgid "Please enter the latitude of the observer."
+msgstr "���ѼԤΰ��٤����Ϥ��Ƥ���������"
+
+#. Type: string
+#. Description
+#: ../templates:3
+msgid ""
+"You have to enter your latitude for wmSun to work correctly. You may find it "
+"out at http://www.calle.com/world/, positive is northern hemisphere, "
+"negative is southern hemisphere. If you don't know your latitude at this "
+"moment, leave the input field blank and run `dpkg-reconfigure wmsun' later."
+msgstr ""
+"wmSun ��������ư���٤ˤ��ʤ��ε���ΰ��٤����Ϥ���ɬ�פ�����ޤ�������"
+"�� http://www.calle.com/world/ ��Ĵ�٤��ޤ�������Ⱦ��Ǥ����ο���Ⱦ��Ǥ�"
+"��ο�Ǥ����������˰��٤��狼��ʤ���硢����������Τޤޤˤ��Ƹ�ۤ� "
+"`dpkg-reconfigure wmsun' �ȼ¹Ԥ��Ƥ���������"
+
+#. Type: string
+#. Description
+#: ../templates:3
+msgid ""
+"Note that this configuration applies only to the X menu system. If you call "
+"wmSun from a terminal prompt you can supply the `-lat' option."
+msgstr ""
+"��������� X ��˥塼�����ƥ�ˤΤ�Ŭ�Ѥ���뤳�Ȥ���դ��Ƥ��������������ߥ�"
+"�뤫�� wmSun ��ư������� `-lat' ���ץ������դ����ͤ����Ǥ��ޤ���"
+
+#. Type: string
+#. Description
+#: ../templates:16
+msgid "Please enter the longitude of the observer."
+msgstr "���ѼԤη��٤����Ϥ��Ƥ���������"
+
+#. Type: string
+#. Description
+#: ../templates:16
+msgid ""
+"You have to enter your longitude for wmSun to work correctly. You may find "
+"it out at http://www.calle.com/world/. Greenwich is 0.0, and longitude "
+"increases positively toward the west. Alternatively, negative numbers can "
+"also be used to specify longitudes to the east of Greenwich. If you don't "
+"know your longitude at this moment, leave the input field blank and run "
+"`dpkg-reconfigure wmsun' later."
+msgstr ""
+"wmSun ��������ư���٤ˤ��ʤ��ε���η��٤����Ϥ���ɬ�פ�����ޤ�������"
+"�� http://www.calle.com/world/ ��Ĵ�٤��ޤ�������˥å��� 0.0 �ǡ����˹Ԥ�"
+"�˽��äƷ��٤������Ƥ����ޤ���ȿ�Фˡ�����˥å�����η��٤���ꤹ��٤ˤ���"
+"�ο����ѤǤ��ޤ����������˷��٤��狼��ʤ���硢����������Τޤޤˤ��Ƹ�"
+"�ۤ� `dpkg-reconfigure wmsun' �ȼ¹Ԥ��Ƥ���������"
+
+#. Type: string
+#. Description
+#: ../templates:16
+msgid ""
+"Note that this configuration applies only to the X menu system. If you call "
+"wmSun from a terminal prompt you can supply the `-lon' option."
+msgstr ""
+"��������� X ��˥塼�����ƥ�ˤΤ�Ŭ�Ѥ���뤳�Ȥ���դ��Ƥ��������������ߥ�"
+"�뤫�� wmSun ��ư������� `-lon' ���ץ������դ����ͤ����Ǥ��ޤ���"
diff --git a/debian/po/pt_BR.po b/debian/po/pt_BR.po
new file mode 100644
index 0000000..70fea54
--- /dev/null
+++ b/debian/po/pt_BR.po
@@ -0,0 +1,92 @@
+#
+# Translators, if you are not familiar with the PO format, gettext
+# documentation is worth reading, especially sections dedicated to
+# this format, e.g. by running:
+# info -n '(gettext)PO Files'
+# info -n '(gettext)Header Entry'
+#
+# Some information specific to po-debconf are available at
+# /usr/share/doc/po-debconf/README-trans
+# or http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+# Developers do not need to manually edit POT or PO files.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: wmsun-1.03-8\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-03-08 16:37+0100\n"
+"PO-Revision-Date: 2003-03-21 23:03-0300\n"
+"Last-Translator: Andr� Lu�s Lopes <andrelop at ig.com.br>\n"
+"Language-Team: Debian-BR Project <debian-l10n-portuguese at lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: string
+#. Description
+#: ../templates:3
+msgid "Please enter the latitude of the observer."
+msgstr "Por favor informe a latitude do observador."
+
+#. Type: string
+#. Description
+#: ../templates:3
+msgid ""
+"You have to enter your latitude for wmSun to work correctly. You may find it "
+"out at http://www.calle.com/world/, positive is northern hemisphere, "
+"negative is southern hemisphere. If you don't know your latitude at this "
+"moment, leave the input field blank and run `dpkg-reconfigure wmsun' later."
+msgstr ""
+"Voc� precisa informar sua latitude para que o wmSun funcione corretamente. � "
+"poss�vel encontrar sua latitude correta em http://www.calle.com/world/, "
+"valores positivos s�o do hemisf�rio norte, negativos s�o do hemisf�rio sul. "
+"Caso voc� n�o saiba sua latitude agora, deixe o campo em branco e execute o "
+"comando `dpkg-reconfigure wmsum' posteriormente para definir esta op��o."
+
+#. Type: string
+#. Description
+#: ../templates:3
+msgid ""
+"Note that this configuration applies only to the X menu system. If you call "
+"wmSun from a terminal prompt you can supply the `-lat' option."
+msgstr ""
+"Note que esta configura��o se aplica somente ao sistema de menus do X. Caso "
+"voc� execute o wmSun a partir de um terminal voc� ainda precisar� fornecer a "
+"op��o `-lat'."
+
+#. Type: string
+#. Description
+#: ../templates:16
+msgid "Please enter the longitude of the observer."
+msgstr "Por favor informe a longitude do observador."
+
+#. Type: string
+#. Description
+#: ../templates:16
+msgid ""
+"You have to enter your longitude for wmSun to work correctly. You may find "
+"it out at http://www.calle.com/world/. Greenwich is 0.0, and longitude "
+"increases positively toward the west. Alternatively, negative numbers can "
+"also be used to specify longitudes to the east of Greenwich. If you don't "
+"know your longitude at this moment, leave the input field blank and run "
+"`dpkg-reconfigure wmsun' later."
+msgstr ""
+"Voc� precisa informar sua lomgitude para que o wnSum funcione corretamente. "
+"� poss�vel encontrar sua longitude em http://www.calle.com/world/. Greenwich "
+"� o meridiano 0.0 e a longitude aumenta positivamente em dire��o ao "
+"ocidente. Alternativamente, n�meros negativos podem tamb�m ser usados para "
+"especificar longitudes para o leste de Greenwich. Caso voc� n�o saiba sua "
+"longitude agora, deixe o campo em branco e execute o comando `dpkg-"
+"reconfigure wmsun' posteriormente para definir esta op��o."
+
+#. Type: string
+#. Description
+#: ../templates:16
+msgid ""
+"Note that this configuration applies only to the X menu system. If you call "
+"wmSun from a terminal prompt you can supply the `-lon' option."
+msgstr ""
+"Note que esta configura��o se aplica somente ao sistema de menus do X. Caso "
+"voc� execute o wmSun a partir de um terminal voc� ainda precisar� fornecer a "
+"op��o `-lon'."
diff --git a/debian/po/templates.pot b/debian/po/templates.pot
new file mode 100644
index 0000000..f50ae36
--- /dev/null
+++ b/debian/po/templates.pot
@@ -0,0 +1,75 @@
+#
+# Translators, if you are not familiar with the PO format, gettext
+# documentation is worth reading, especially sections dedicated to
+# this format, e.g. by running:
+# info -n '(gettext)PO Files'
+# info -n '(gettext)Header Entry'
+#
+# Some information specific to po-debconf are available at
+# /usr/share/doc/po-debconf/README-trans
+# or http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+# Developers do not need to manually edit POT or PO files.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-03-08 16:37+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: string
+#. Description
+#: ../templates:3
+msgid "Please enter the latitude of the observer."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../templates:3
+msgid ""
+"You have to enter your latitude for wmSun to work correctly. You may find it "
+"out at http://www.calle.com/world/, positive is northern hemisphere, "
+"negative is southern hemisphere. If you don't know your latitude at this "
+"moment, leave the input field blank and run `dpkg-reconfigure wmsun' later."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../templates:3
+msgid ""
+"Note that this configuration applies only to the X menu system. If you call "
+"wmSun from a terminal prompt you can supply the `-lat' option."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../templates:16
+msgid "Please enter the longitude of the observer."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../templates:16
+msgid ""
+"You have to enter your longitude for wmSun to work correctly. You may find "
+"it out at http://www.calle.com/world/. Greenwich is 0.0, and longitude "
+"increases positively toward the west. Alternatively, negative numbers can "
+"also be used to specify longitudes to the east of Greenwich. If you don't "
+"know your longitude at this moment, leave the input field blank and run "
+"`dpkg-reconfigure wmsun' later."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../templates:16
+msgid ""
+"Note that this configuration applies only to the X menu system. If you call "
+"wmSun from a terminal prompt you can supply the `-lon' option."
+msgstr ""
diff --git a/debian/postinst b/debian/postinst
index 4a5897f..dfd2c33 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -1,33 +1,36 @@
-#! /bin/sh -e
-
-. /usr/share/debconf/confmodule
-menu="/usr/lib/menu/wmsun"
-
-case "$1" in
-configure)
- db_get wmsun/latitude || :
- if [ -n "$RET" ]; then
- latitude="-lat $RET"
- else
- latitude=""
+#!/bin/sh
+
+set -e
+
+[ "$1" = configure ] || exit 0
+
+if [ -e /usr/share/debconf/confmodule -a -x /usr/bin/ucf ]; then
+ . /usr/share/debconf/confmodule
+
+ args=""
+ umask 022
+
+ db_get wmsun/latitude
+ if [ "$RET" ]; then
+ args="$args -lat $RET"
fi
- db_get wmsun/longitude || :
- if [ -n "$RET" ]; then
- longitude="-lon $RET"
- else
- longitude=""
+
+ db_get wmsun/longitude
+ if [ "$RET" ]; then
+ args="$args -lon $RET"
fi
- echo "?package(wmsun):needs=X11 section=Apps/Tools\\" > $menu && \
- echo " title=\"wmSun\" command=\"/usr/bin/wmSun $latitude $longitude\"" >> $menu || :
- ;;
-abort-upgrade|abort-remove|abort-deconfigure)
- ;;
-*)
- echo "postinst called with unknown argument \`$1'" >&2
- exit 1
- ;;
-esac
-
-#DEBHELPER#
+
+ echo "?package(wmsun):needs=\"X11\" section=\"Apps/Tools\" \\" > /etc/menu/wmsun.new && \
+ echo " title=\"wmSun\" command=\"/usr/bin/wmSun $args\"" >> /etc/menu/wmsun.new
+
+ ucf --debconf-ok /etc/menu/wmsun.new /etc/menu/wmsun
+ rm -f /etc/menu/wmsun.new
+
+ db_stop
+fi
+
+if [ -x /usr/bin/update-menus ]; then
+ update-menus
+fi
exit 0
diff --git a/debian/postrm b/debian/postrm
new file mode 100644
index 0000000..7a12d4a
--- /dev/null
+++ b/debian/postrm
@@ -0,0 +1,21 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" = purge ]; then
+ if [ -e /usr/share/debconf/confmodule ]; then
+ . /usr/share/debconf/confmodule
+ db_purge
+ db_stop
+ fi
+ if [ -x /usr/bin/ucf ]; then
+ ucf --purge /etc/menu/wmsun
+ fi
+ rm -f /etc/menu/wmsun /etc/menu/wmsun.*
+fi
+
+if [ -x /usr/bin/update-menus ]; then
+ update-menus
+fi
+
+exit 0
diff --git a/debian/rules b/debian/rules
index bac123d..6e952ae 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,66 +1,65 @@
#!/usr/bin/make -f
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
-#export DH_VERBOSE=1
-export DH_COMPAT=3
+BUILDDIR = debian/wmsun
+DEBDIR = $(BUILDDIR)/DEBIAN
+DOCDIR = $(BUILDDIR)/usr/share/doc/wmsun
+testdir = test -f wmSun/wmSun.c && test -f debian/rules
+testroot = test x`whoami` = xroot
-configure: configure-stamp
-configure-stamp:
- dh_testdir
- touch configure-stamp
+CFLAGS = -Wall -g
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+ CFLAGS += -O0
+else
+ CFLAGS += -O2
+endif
+export CFLAGS
-build: build-stamp
+clean:
+ $(testdir)
+ -rm -f build debian/files debian/substvars
+ -$(MAKE) -C wmSun clean
+ -rm -rf debian/wmsun
-build-stamp: configure-stamp
- dh_testdir
+build:
+ $(testdir)
$(MAKE) -C wmSun
- touch build-stamp
+ touch build
-clean:
- dh_testdir
- dh_testroot
- rm -f build-stamp configure-stamp
- -$(MAKE) -C wmSun clean
- dh_clean
+binary: binary-arch
+
+binary-indep:
+
+binary-arch: build
+ $(testdir)
+ $(testroot)
+ rm -rf debian/wmsun
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
$(MAKE) -C wmSun install DESTDIR=$(CURDIR)/debian/wmsun
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+ strip -R .comment -R .note $(BUILDDIR)/usr/bin/wmSun
+endif
+ gzip -9 $(BUILDDIR)/usr/share/man/man1/wmSun.1
+ ln -s wmSun $(BUILDDIR)/usr/bin/wmsun
+ ln -s wmSun.1.gz $(BUILDDIR)/usr/share/man/man1/wmsun.1.gz
+ install -D -m 0644 debian/menu $(BUILDDIR)/usr/lib/menu/wmsun
+ install -d -m 0755 $(BUILDDIR)/etc/menu
+
+ install -D -m 0644 debian/changelog $(DOCDIR)/changelog.Debian
+ install -D -m 0644 debian/changelog.upstream $(DOCDIR)/changelog
+ install -m 0644 TODO debian/copyright $(DOCDIR)
+ gzip -9 $(DOCDIR)/changelog*
-binary-indep: build install
+ install -d -m 0755 $(DEBDIR)
+ install -m 0644 debian/control $(DEBDIR)
+ install -m 0755 debian/config debian/postinst debian/postrm $(DEBDIR)
+ cd $(BUILDDIR) && find usr -type f -print0 | xargs -0 md5sum | tee DEBIAN/md5sums
+ po2debconf debian/templates > $(DEBDIR)/templates
+ chmod 0644 $(DEBDIR)/md5sums $(DEBDIR)/templates
-binary-arch: build install
- dh_testdir
- dh_testroot
- dh_installdebconf
- dh_installdocs
- dh_installexamples
- dh_installmenu
-# dh_installlogrotate
-# dh_installemacsen
-# dh_installpam
-# dh_installmime
-# dh_installinit
-# dh_installcron
- dh_installman
-# dh_installinfo
-# dh_undocumented
- dh_installchangelogs
- dh_link
- dh_strip
- dh_compress
- dh_fixperms
-# dh_makeshlibs
- dh_installdeb
-# dh_perl
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
+ dpkg-shlibdeps $(BUILDDIR)/usr/bin/wmSun
+ dpkg-gencontrol -isp -pwmsun -P$(BUILDDIR)
+ chown -R root:root $(BUILDDIR)
+ chmod -R go=u-w $(BUILDDIR)
+ dpkg --build $(BUILDDIR) ..
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+.PHONY: clean binary-indep binary-arch binary
diff --git a/debian/templates b/debian/templates
index 4015e20..79c5ea8 100644
--- a/debian/templates
+++ b/debian/templates
@@ -1,41 +1,26 @@
Template: wmsun/latitude
Type: string
-Description: Please enter the latitude of the observer.
+_Description: Please enter the latitude of the observer.
You have to enter your latitude for wmSun to work correctly.
- You may find it out at http://www.calle.com/world/. If you don't
+ You may find it out at http://www.calle.com/world/, positive is
+ northern hemisphere, negative is southern hemisphere. If you don't
know your latitude at this moment, leave the input field blank and
run `dpkg-reconfigure wmsun' later.
.
- Note that this configuration applies only to the X menu system. If
- you call wmSun from a terminal prompt you can supply the `-lat'
- option.
-Description-de: Bitte geben Sie den Breitengrad des Beobachters an.
- Um korrekte Zeiten zu ermitteln, mu� wmSun Ihren Breitengrad kennen.
- Diesen k�nnen Sie unter http://www.calle.com/world/ abfragen.
- Sollten Sie Ihren Breitengrad im Moment nicht kennen, lassen Sie das
- Eingabefeld leer und rufen Sie sp�ter "dpkg-reconfigure wmsun" auf.
- .
- Beachten Sie, da� diese Konfiguration nur f�r X-Men�s verwendet wird.
- Beim Aufruf von der Kommandozeile k�nnen Sie den Schalter "-lat"
- angeben.
+ Note that this configuration applies only to the X menu system.
+ If you call wmSun from a terminal prompt you can supply the
+ `-lat' option.
Template: wmsun/longitude
Type: string
-Description: Please enter the longitude of the observer.
+_Description: Please enter the longitude of the observer.
You have to enter your longitude for wmSun to work correctly.
- You may find it out at http://www.calle.com/world/. If you don't
- know your longitude at this moment, leave the input field blank and
- run `dpkg-reconfigure wmsun' later.
- .
- Note that this configuration applies only to the X menu system. If
- you call wmSun from a terminal prompt you can supply the `-lon'
- option.
-Description-de: Bitte geben Sie den L�ngengrad des Beobachters ein.
- Um korrekte Zeiten zu ermitteln, mu� wmSun Ihren L�ngengrad kennen.
- Diesen k�nnen Sie unter http://www.calle.com/world/ abfragen.
- Sollten Sie Ihren L�ngengrad im Moment nicht kennen, lassen Sie das
- Eingabefeld leer und rufen Sie sp�ter "dpkg-reconfigure wmsun" auf.
+ You may find it out at http://www.calle.com/world/. Greenwich is 0.0,
+ and longitude increases positively toward the west. Alternatively,
+ negative numbers can also be used to specify longitudes to the east
+ of Greenwich. If you don't know your longitude at this moment, leave
+ the input field blank and run `dpkg-reconfigure wmsun' later.
.
- Beachten Sie, da� diese Konfiguration nur f�r X-Men�s verwendet wird.
- Beim Aufruf von der Kommandozeile k�nnen Sie den Schalter "-lon"
- angeben.
+ Note that this configuration applies only to the X menu system.
+ If you call wmSun from a terminal prompt you can supply the
+ `-lon' option.
diff --git a/wmSun/Makefile b/wmSun/Makefile
index bbc7fce..a3835ab 100644
--- a/wmSun/Makefile
+++ b/wmSun/Makefile
@@ -1,5 +1,5 @@
CC = gcc
-CFLAGS = -O2 -Wall
+# CFLAGS = -O2 -Wall
INCDIR = -I/usr/X11R6/include/X11
DESTDIR= /usr/X11R6
LIBDIR = -L/usr/X11R6/lib
@@ -22,14 +22,14 @@ OBJS = wmSun.o SunRise.o ../wmgeneral/wmgeneral.o
.c.o:
- $(CC) $(COPTS) -D$(shell echo `uname -s`) -c $< -o $*.o $(INCDIR)
+ $(CC) $(CFLAGS) -D$(shell echo `uname -s`) -c $< -o $*.o $(INCDIR)
all: wmSun.o wmSun
wmSun.o: wmSun_master.xpm wmSun_mask.xbm
wmSun: $(OBJS)
- $(CC) $(COPTS) $(SYSTEM) -lm -o wmSun $^ $(INCDIR) $(LIBDIR) $(LIBS)
+ $(CC) $(CFLAGS) $(SYSTEM) -lm -o wmSun $^ $(INCDIR) $(LIBDIR) $(LIBS)
clean:
for i in $(OBJS) ; do \
@@ -38,8 +38,6 @@ clean:
rm -f wmSun
install:: wmSun
- install -d $(DESTDIR)/usr/bin
- install -d $(DESTDIR)/usr/share/man/man1
- install -s -m 0755 wmSun $(DESTDIR)/usr/bin
- install -m 0644 wmSun.1 $(DESTDIR)/usr/share/man/man1
+ install -D -m 0755 wmSun $(DESTDIR)/usr/bin/wmSun
+ install -D -m 0644 wmSun.1 $(DESTDIR)/usr/share/man/man1/wmSun.1
diff --git a/wmSun/SunRise.c b/wmSun/SunRise.c
index 1126667..865ca22 100644
--- a/wmSun/SunRise.c
+++ b/wmSun/SunRise.c
@@ -10,8 +10,9 @@ double cosEPS = 0.91748;
double sinEPS = 0.39778;
double P2 = 6.283185307;
+int Interp(double, double, double, double*, double*, double*, double*, int*);
-SunRise(int year, int month, int day, double LocalHour, double *UTRise, double *UTSet){
+void SunRise(int year, int month, int day, double LocalHour, double *UTRise, double *UTSet){
double UT, ym, y0, yp, SinH0;
double xe, ye, z1, z2, SinH(), hour24();
@@ -80,7 +81,7 @@ SunRise(int year, int month, int day, double LocalHour, double *UTRise, double *
}
-UTTohhmm(double UT, int *h, int *m){
+void UTTohhmm(double UT, int *h, int *m){
if (UT < 0.0) {
@@ -98,7 +99,7 @@ UTTohhmm(double UT, int *h, int *m){
-Interp(double ym, double y0, double yp, double *xe, double *ye, double *z1, double *z2, int *nz){
+int Interp(double ym, double y0, double yp, double *xe, double *ye, double *z1, double *z2, int *nz){
double a, b, c, d, dx;
@@ -129,8 +130,8 @@ Interp(double ym, double y0, double yp, double *xe, double *ye, double *z1, doub
double SinH(int year, int month, int day, double UT){
- double TU0, TU, TU2, TU3, LambdaMoon, BetaMoon, R, AGE, frac(), jd();
- double RA_Sun, DEC_Sun, T0, gmst, lmst, Tau, epsilon;
+ double TU0, TU, TU2, TU3, frac(), jd();
+ double RA_Sun, DEC_Sun, gmst, lmst, Tau;
double M, DL, L, SL, X, Y, Z, RHO;
@@ -176,7 +177,7 @@ double jd(ny, nm, nd, UT)
int ny, nm, nd;
double UT;
{
- double A, B, C, D, JD, MJD, day;
+ double A, B, C, D, JD, day;
day = nd + UT/24.0;
diff --git a/wmSun/wmSun.c b/wmSun/wmSun.c
index d2e33ce..42651e0 100644
--- a/wmSun/wmSun.c
+++ b/wmSun/wmSun.c
@@ -95,6 +95,7 @@
+void SunRise(int, int, int, double, double*, double*);
void ParseCMDLine(int argc, char *argv[]);
void pressEvent(XButtonEvent *xev);
@@ -125,14 +126,12 @@ int main(int argc, char *argv[]) {
struct tm *GMTTime, *LocalTime;
XEvent event;
- int i, n, k, j, ImageNumber;
- int Year, Month, DayOfWeek, OldLocalDayOfMonth;
+ int n;
+ int Year, Month, OldLocalDayOfMonth;
int LocalDayOfMonth, DayOfMonth;
- int Hours, Mins, Secs, OldSecs, digit, xoff, xsize;
long CurrentLocalTime, CurrentGMTTime, date;
- double UT, val, RA, DEC, LTRise, LTSet, LocalHour, hour24();
- int D, H, M, S, sgn, A, B, q;
- char str[10];
+ double UT, val, LTRise, LTSet, LocalHour, hour24();
+ int H, M;
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmsun.git
More information about the Pkg-wmaker-commits
mailing list