[Python-apps-commits] r9518 - in packages/cycle/trunk/debian (35 files)

miriam at users.alioth.debian.org miriam at users.alioth.debian.org
Thu Apr 4 23:21:43 UTC 2013 

    Date: Thursday, April 4, 2013 @ 23:21:41
  Author: miriam
Revision: 9518

Prepare new release

Added:
  packages/cycle/trunk/debian/cycle.desktop
  packages/cycle/trunk/debian/cycle.png
  packages/cycle/trunk/debian/export.png
  packages/cycle/trunk/debian/manpages
  packages/cycle/trunk/debian/patches/06a_save_load.patch
  packages/cycle/trunk/debian/source/include-binaries
  packages/cycle/trunk/debian/source/options
Modified:
  packages/cycle/trunk/debian/changelog
  packages/cycle/trunk/debian/compat
  packages/cycle/trunk/debian/control
  packages/cycle/trunk/debian/copyright
  packages/cycle/trunk/debian/cycle.1
  packages/cycle/trunk/debian/dirs
  packages/cycle/trunk/debian/install
  packages/cycle/trunk/debian/msg/ca.po
  packages/cycle/trunk/debian/msg/cs.po
  packages/cycle/trunk/debian/msg/de.po
  packages/cycle/trunk/debian/msg/es.po
  packages/cycle/trunk/debian/msg/gl.po
  packages/cycle/trunk/debian/msg/hu.po
  packages/cycle/trunk/debian/msg/nn.po
  packages/cycle/trunk/debian/msg/no.po
  packages/cycle/trunk/debian/msg/ru.po
  packages/cycle/trunk/debian/msg/sk.po
  packages/cycle/trunk/debian/msg/sv.po
  packages/cycle/trunk/debian/patches/01_directories.patch
  packages/cycle/trunk/debian/patches/02_dialogs_fix.patch
  packages/cycle/trunk/debian/patches/03a_dialogs_message.patch
  packages/cycle/trunk/debian/patches/03b_dialogs_strings.patch
  packages/cycle/trunk/debian/patches/04_cal_year_strings.patch
  packages/cycle/trunk/debian/patches/05a_report_year_ical.patch
  packages/cycle/trunk/debian/patches/05b_export_to_ical.patch
  packages/cycle/trunk/debian/patches/series
  packages/cycle/trunk/debian/rules
  packages/cycle/trunk/debian/source/format

Modified: packages/cycle/trunk/debian/changelog
===================================================================
--- packages/cycle/trunk/debian/changelog	2013-04-02 16:47:19 UTC (rev 9517)
+++ packages/cycle/trunk/debian/changelog	2013-04-04 23:21:41 UTC (rev 9518)
@@ -1,4 +1,4 @@
-cycle (0.3.1-8) UNRELEASED; urgency=low
+cycle (0.3.1-9) UNRELEASED; urgency=low
 
   [ Emilio Pozuelo Monfort ]
   * Added a watch file, thanks to Per Hansen.
@@ -7,8 +7,30 @@
   * Added a README.source, as required by Debian Policy Manual section 4.14
   * Added the Vcs-* tags
 
- -- Ryan Kavanagh <ryanakca at kubuntu.org>  Sun, 15 Nov 2009 10:38:15 -0500
+  [ Miriam Ruiz ]
+  * Updated Hungarian translation. Closes: #684277
+  * Removed annoying warning about deprecated md5 module. Closes: #658723
+  * Fixed grammar error in debian/control. Closes: #684791
+  * Upgraded Standards-Version from 3.7.3 to 3.9.3
+  * Changed source package to DebSrc 3.0
+  * Changed my email to miriam at debian.org
+  * Removed many Lintian warnings
 
+ -- Miriam Ruiz <miriam at debian.org>  Thu, 04 Apr 2013 23:32:37 +0200
+
+cycle (0.3.1-8) unstable; urgency=low
+
+  * Switch to wxwidgets2.8: (Closes: #645627)
+    - Update Depends from python-wxgtk2.6 to python-wxgtk2.8.
+    - This also removes warnings. (Closes: #530339)
+  * Small fix to the German translation, thanks Meike. (Closes: #629639)
+  * Update the Catalan translation, thanks Mònica.
+  * Fix typo, "Enter you name" -> "Enter your name" (Closes: #444776)
+  * Switch to dh_python2 from dh_pysupport.
+  * Add cycle.desktop, thanks to Mònica!
+
+ -- Ana Beatriz Guerrero Lopez <ana at debian.org>  Fri, 11 Nov 2011 19:28:21 +0100
+
 cycle (0.3.1-7) unstable; urgency=low
 
   * Package now co-maintained by the Python Applications Team.

Modified: packages/cycle/trunk/debian/compat
===================================================================
--- packages/cycle/trunk/debian/compat	2013-04-02 16:47:19 UTC (rev 9517)
+++ packages/cycle/trunk/debian/compat	2013-04-04 23:21:41 UTC (rev 9518)
@@ -1 +1 @@
-5
+9

Modified: packages/cycle/trunk/debian/control
===================================================================
--- packages/cycle/trunk/debian/control	2013-04-02 16:47:19 UTC (rev 9517)
+++ packages/cycle/trunk/debian/control	2013-04-04 23:21:41 UTC (rev 9518)
@@ -2,17 +2,17 @@
 Section: utils
 Priority: optional
 Maintainer: Ana Beatriz Guerrero Lopez <ana at debian.org>
-Uploaders: Miriam Ruiz <little_miry at yahoo.es>,  Python Applications Team <python-apps-team at lists.alioth.debian.org>
-Build-Depends-Indep: quilt, python (>= 2.3), python-support (>= 0.6), gettext, sharutils
-Build-Depends: debhelper (>= 5.0.37.2)
-Standards-Version: 3.7.3
+Uploaders: Miriam Ruiz <miriam at debian.org>, Python Applications Team <python-apps-team at lists.alioth.debian.org>
+Build-Depends-Indep: python (>= 2.3), gettext
+Build-Depends: debhelper (>= 9)
+Standards-Version: 3.9.3
 Vcs-Svn: svn://svn.debian.org/svn/python-apps/packages/cycle/
 Vcs-Browser: http://svn.debian.org/viewsvn/python-apps/packages/cycle/trunk/
 Homepage: http://cycle.sourceforge.net/
 
 Package: cycle
 Architecture: all
-Depends: ${python:Depends}, python-wxgtk2.6
+Depends: python (>= 2.3), ${misc:Depends}, python-wxgtk2.8
 Description: calendar program for women
  Cycle is a calendar for women. Given a cycle length or statistics for
  several periods, it can calculate the days until menstruation, the days
@@ -25,7 +25,7 @@
      on statistics of previous periods.
    - Calculate days of "safe" sex, fertile period and day to ovulations.
    - Definition of D.O.B. (Date Of Birth) of a child
-   - Allows to write notes.
+   - Allows one to write notes.
    - Helps to supervise reception of hormonal contraceptive tablets.
    - Multiple users allowed. Data is protected by a password for every 
      user.

Modified: packages/cycle/trunk/debian/copyright
===================================================================
--- packages/cycle/trunk/debian/copyright	2013-04-02 16:47:19 UTC (rev 9517)
+++ packages/cycle/trunk/debian/copyright	2013-04-04 23:21:41 UTC (rev 9518)
@@ -69,5 +69,6 @@
 On Debian GNU/Linux systems, the complete text of the GNU General
 Public License can be found in `/usr/share/common-licenses/GPL'.
 
-The Debian packaging is (C) 2005-2006, Miriam Ruiz <little_miry at yahoo.es>
-and Ana Beatriz Guerrero López and is licensed under the GPL, see above.
+The Debian packaging is (C) 2005-2013, Miriam Ruiz <miriam at debian.org>
+and Ana Beatriz Guerrero López and is licensed under the GPL, see above.
+

Modified: packages/cycle/trunk/debian/cycle.1
===================================================================
--- packages/cycle/trunk/debian/cycle.1	2013-04-02 16:47:19 UTC (rev 9517)
+++ packages/cycle/trunk/debian/cycle.1	2013-04-04 23:21:41 UTC (rev 9518)
@@ -76,10 +76,8 @@
 .SH "SEE ALSO"
 .
 You can find cycle's home page at: 
-.URL http://cycle.sourceforge.net/
 http://cycle.sourceforge.net/
 .P
 More information about calendar method are available at:
-.URL http://www.mama.ru/gynecolog/STA/st18.htm
 http://www.mama.ru/gynecolog/STA/st18.htm (in Russian)
 .

Added: packages/cycle/trunk/debian/cycle.desktop
===================================================================
--- packages/cycle/trunk/debian/cycle.desktop	                        (rev 0)
+++ packages/cycle/trunk/debian/cycle.desktop	2013-04-04 23:21:41 UTC (rev 9518)
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Exec='/usr/bin/cycle'
+GenericName=Cycle
+Icon=cycle
+Name=Cycle
+Terminal=false
+Type=Application
+Categories=Education;Science;MedicalSoftware

Added: packages/cycle/trunk/debian/cycle.png
===================================================================
(Binary files differ)


Property changes on: packages/cycle/trunk/debian/cycle.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Modified: packages/cycle/trunk/debian/dirs
===================================================================
--- packages/cycle/trunk/debian/dirs	2013-04-02 16:47:19 UTC (rev 9517)
+++ packages/cycle/trunk/debian/dirs	2013-04-04 23:21:41 UTC (rev 9518)
@@ -1,3 +1,4 @@
 usr/bin
 usr/share/pixmaps
 usr/share/cycle/bitmaps
+usr/share/applications

Added: packages/cycle/trunk/debian/export.png
===================================================================
(Binary files differ)


Property changes on: packages/cycle/trunk/debian/export.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Modified: packages/cycle/trunk/debian/install
===================================================================
--- packages/cycle/trunk/debian/install	2013-04-02 16:47:19 UTC (rev 9517)
+++ packages/cycle/trunk/debian/install	2013-04-04 23:21:41 UTC (rev 9518)
@@ -5,5 +5,9 @@
 save_load.py usr/share/cycle
 set_dir.py usr/share/cycle
 icons/cycle.xpm usr/share/pixmaps
+debian/cycle.png usr/share/pixmaps/
 bitmaps/* usr/share/cycle/bitmaps/
+debian/export.png usr/share/cycle/bitmaps/
 icons/* usr/share/cycle/icons/
+debian/cycle.desktop usr/share/applications/
+

Added: packages/cycle/trunk/debian/manpages
===================================================================
--- packages/cycle/trunk/debian/manpages	                        (rev 0)
+++ packages/cycle/trunk/debian/manpages	2013-04-04 23:21:41 UTC (rev 9518)
@@ -0,0 +1 @@
+debian/cycle.1

Modified: packages/cycle/trunk/debian/msg/ca.po
===================================================================
--- packages/cycle/trunk/debian/msg/ca.po	2013-04-02 16:47:19 UTC (rev 9517)
+++ packages/cycle/trunk/debian/msg/ca.po	2013-04-04 23:21:41 UTC (rev 9518)
@@ -32,7 +32,7 @@
 
 #: cal_year.py:544
 msgid "tablet no. "
-msgstr "píndola N "
+msgstr "píndola núm "
 
 #: cal_year.py:546
 msgid " or pause"
@@ -70,7 +70,7 @@
 #: cal_year.py:603
 #, python-format
 msgid "%s day of period from %s to %s"
-msgstr "%s dia del periode des de %s fins %s"
+msgstr "%s dia del període des de %s fins %s"
 
 #: cal_year.py:604
 #, python-format
@@ -79,7 +79,7 @@
 
 #: cycle.py:100
 msgid "Dec Year"
-msgstr "Any precedent"
+msgstr "Any anterior"
 
 #: cycle.py:103
 msgid "Current Year"
@@ -176,7 +176,7 @@
 
 #: dialogs.py:96
 msgid "Period of cycle is invalid!"
-msgstr "El periode del cicle no és vàlid!"
+msgstr "El període del cicle no és vàlid!"
 
 #: dialogs.py:97
 #: dialogs.py:166
@@ -204,7 +204,7 @@
 
 #: dialogs.py:163
 msgid "Entering password don't match!"
-msgstr "Les contrasenyes introduïdes no coincideixen"
+msgstr "Les contrasenyes introduïdes no coincideixen!"
 
 #: dialogs.py:179
 msgid "Login"
@@ -245,14 +245,14 @@
 "Tampoc pot ajudar a previndre enfermetats de transmissió\n"
 "sexual com el VIH/SIDA.\n"
 "\n"
-"És tan sols un assistent electrònic per portar un\n"
+"És només un assistent electrònic per portar un\n"
 "seguiment d'algunes de les vostres dades mèdiques\n"
 "i extreure conclusions estadístiques d'elles.\n"
-"En cap cas es pot considerar aquest programa com un\n"
+"En cap cas es pot considerar aquest programa com a un\n"
 "substitut del vostre ginecòleg."
 
 #: dialogs.py:308
-msgid "Enter you name:"
+msgid "Enter your name:"
 msgstr "Introduïu el vostre nom:"
 
 #: dialogs.py:308
@@ -283,7 +283,7 @@
 #: dialogs.py:353
 #: dialogs.py:480
 msgid "prognosis of cycle begin"
-msgstr "prognosi del cicle, començament"
+msgstr "pronòstic de l'inici del cicle"
 
 #: dialogs.py:354
 #: dialogs.py:481
@@ -308,7 +308,7 @@
 #: dialogs.py:359
 #: dialogs.py:486
 msgid "tablets no. 22-28 or pause"
-msgstr "píndoles N 22-28 o pausa"
+msgstr "píndoles núm 22-28 o pausa"
 
 #: dialogs.py:408
 msgid "Remove"

Modified: packages/cycle/trunk/debian/msg/cs.po
===================================================================
--- packages/cycle/trunk/debian/msg/cs.po	2013-04-02 16:47:19 UTC (rev 9517)
+++ packages/cycle/trunk/debian/msg/cs.po	2013-04-04 23:21:41 UTC (rev 9518)
@@ -208,7 +208,7 @@
 msgstr "Chybné heslo!"
 
 #: ../dialogs.py:269
-msgid "Enter you name:"
+msgid "Enter your name:"
 msgstr "Zadejte vaše jméno:"
 
 #: ../dialogs.py:269

Modified: packages/cycle/trunk/debian/msg/de.po
===================================================================
--- packages/cycle/trunk/debian/msg/de.po	2013-04-02 16:47:19 UTC (rev 9517)
+++ packages/cycle/trunk/debian/msg/de.po	2013-04-04 23:21:41 UTC (rev 9518)
@@ -208,7 +208,7 @@
 msgstr "Ungültiges Passwort"
 
 #: ../dialogs.py:269
-msgid "Enter you name:"
+msgid "Enter your name:"
 msgstr "Name eingeben:"
 
 #: ../dialogs.py:269
@@ -249,7 +249,7 @@
 
 #: ../dialogs.py:312
 msgid "ovulation, birth"
-msgstr "Geburt"
+msgstr "Eisprung, Geburt"
 
 #: ../dialogs.py:314
 msgid "tablets no. 22-28 or pause"

Modified: packages/cycle/trunk/debian/msg/es.po
===================================================================
--- packages/cycle/trunk/debian/msg/es.po	2013-04-02 16:47:19 UTC (rev 9517)
+++ packages/cycle/trunk/debian/msg/es.po	2013-04-04 23:21:41 UTC (rev 9518)
@@ -254,7 +254,7 @@
 "como un sustituto de tu ginecólogo."
 
 #: dialogs.py:308
-msgid "Enter you name:"
+msgid "Enter your name:"
 msgstr "Introduce tu nombre:"
 
 #: dialogs.py:308

Modified: packages/cycle/trunk/debian/msg/gl.po
===================================================================
--- packages/cycle/trunk/debian/msg/gl.po	2013-04-02 16:47:19 UTC (rev 9517)
+++ packages/cycle/trunk/debian/msg/gl.po	2013-04-04 23:21:41 UTC (rev 9518)
@@ -253,7 +253,7 @@
 "un substituto do teu xinecólogo."
 
 #: dialogs.py:308
-msgid "Enter you name:"
+msgid "Enter your name:"
 msgstr "Introduce o teu nome:"
 
 #: dialogs.py:308

Modified: packages/cycle/trunk/debian/msg/hu.po
===================================================================
--- packages/cycle/trunk/debian/msg/hu.po	2013-04-02 16:47:19 UTC (rev 9517)
+++ packages/cycle/trunk/debian/msg/hu.po	2013-04-04 23:21:41 UTC (rev 9518)
@@ -1,7 +1,7 @@
 # Translation of Cycle to Hungarian
-# Copyright (C) 2005 Hegedûs Hajnalka
+# Copyright (C) 2005 Hegedûs Hajnalka
 # This file is distributed under the same license as the PACKAGE package.
-# Hegedûs Hajnalka <heha at aszt.inf.elte.hu>, 2005.
+# Hegedûs Hajnalka <heha at aszt.inf.elte.hu>, 2005.
 #
 msgid ""
 msgstr ""
@@ -9,19 +9,17 @@
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2005-06-09 14:11+0000\n"
 "PO-Revision-Date: 2005-06-14 16:55+0100\n"
-"Last-Translator: Hegedûs Hajnalka <heha at aszt.inf.elte.hu>\n"
+"Last-Translator: Hegedûs Hajnalka <heha at aszt.inf.elte.hu>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #: cal_year.py:82
 msgid "Beginning of cycle"
 msgstr "A ciklus eleje"
 
-#: cal_year.py:84
-#: dialogs.py:358
-#: dialogs.py:485
+#: cal_year.py:84 dialogs.py:358 dialogs.py:485
 msgid "1-st tablet"
 msgstr "1. tabletta"
 
@@ -41,9 +39,7 @@
 msgid " or pause"
 msgstr "vagy szünet"
 
-#: cal_year.py:548
-#: dialogs.py:360
-#: dialogs.py:487
+#: cal_year.py:548 dialogs.py:360 dialogs.py:487
 msgid "next 1-st tablet"
 msgstr "a következő 1. tabletta"
 
@@ -92,18 +88,15 @@
 msgid "Inc Year"
 msgstr "Következő év"
 
-#: cycle.py:112
-#: dialogs.py:346
+#: cycle.py:112 dialogs.py:346
 msgid "Legend"
 msgstr "Jelmagyarázat"
 
-#: cycle.py:115
-#: dialogs.py:17
+#: cycle.py:115 dialogs.py:17
 msgid "Settings"
 msgstr "Beállítások"
 
-#: cycle.py:118
-#: cycle.py:157
+#: cycle.py:118 cycle.py:157
 msgid "Help"
 msgstr "Segítség"
 
@@ -159,21 +152,12 @@
 msgid "Change password"
 msgstr "A jelszó megváltoztatása"
 
-#: dialogs.py:73
-#: dialogs.py:142
-#: dialogs.py:228
-#: dialogs.py:363
-#: dialogs.py:398
-#: dialogs.py:455
-#: dialogs.py:491
+#: dialogs.py:73 dialogs.py:142 dialogs.py:228 dialogs.py:363 dialogs.py:398
+#: dialogs.py:455 dialogs.py:491
 msgid "Ok"
 msgstr "Ok"
 
-#: dialogs.py:78
-#: dialogs.py:147
-#: dialogs.py:233
-#: dialogs.py:403
-#: dialogs.py:501
+#: dialogs.py:78 dialogs.py:147 dialogs.py:233 dialogs.py:403 dialogs.py:501
 msgid "Cancel"
 msgstr "Mégsem"
 
@@ -181,15 +165,11 @@
 msgid "Period of cycle is invalid!"
 msgstr "A ciklus hossza érvénytelen!"
 
-#: dialogs.py:97
-#: dialogs.py:166
-#: dialogs.py:268
-#: dialogs.py:335
+#: dialogs.py:97 dialogs.py:166 dialogs.py:268 dialogs.py:335
 msgid "Error!"
 msgstr "Hiba!"
 
-#: dialogs.py:122
-#: dialogs.py:257
+#: dialogs.py:122 dialogs.py:257
 msgid "Password"
 msgstr "Jelszó"
 
@@ -254,7 +234,7 @@
 "helyettesíti a nőgyógyászati vizsgálatot / tanácsadást."
 
 #: dialogs.py:308
-msgid "Enter you name:"
+msgid "Enter your name:"
 msgstr "Írja be a nevét:"
 
 #: dialogs.py:308
@@ -277,38 +257,31 @@
 msgid "today"
 msgstr "ma"
 
-#: dialogs.py:352
-#: dialogs.py:479
+#: dialogs.py:352 dialogs.py:479
 msgid "begin of cycle"
 msgstr "a ciklus kezdete"
 
-#: dialogs.py:353
-#: dialogs.py:480
+#: dialogs.py:353 dialogs.py:480
 msgid "prognosis of cycle begin"
 msgstr "a ciklus várható kezdete"
 
-#: dialogs.py:354
-#: dialogs.py:481
+#: dialogs.py:354 dialogs.py:481
 msgid "conception"
 msgstr "fogamzás"
 
-#: dialogs.py:355
-#: dialogs.py:482
+#: dialogs.py:355 dialogs.py:482
 msgid "safe sex"
 msgstr "biztonságos szex"
 
-#: dialogs.py:356
-#: dialogs.py:483
+#: dialogs.py:356 dialogs.py:483
 msgid "fertile"
 msgstr "termékeny"
 
-#: dialogs.py:357
-#: dialogs.py:484
+#: dialogs.py:357 dialogs.py:484
 msgid "ovulation, birth"
 msgstr "ovuláció, szülés"
 
-#: dialogs.py:359
-#: dialogs.py:486
+#: dialogs.py:359 dialogs.py:486
 msgid "tablets no. 22-28 or pause"
 msgstr "22-28. tabletták vagy szünet"
 
@@ -323,4 +296,3 @@
 #: dialogs.py:496
 msgid "By default"
 msgstr "Alapértelmezett"
-

Modified: packages/cycle/trunk/debian/msg/nn.po
===================================================================
--- packages/cycle/trunk/debian/msg/nn.po	2013-04-02 16:47:19 UTC (rev 9517)
+++ packages/cycle/trunk/debian/msg/nn.po	2013-04-04 23:21:41 UTC (rev 9518)
@@ -256,7 +256,7 @@
 "programmet som ei erstatning for gynekologen din."
 
 #: dialogs.py:308
-msgid "Enter you name:"
+msgid "Enter your name:"
 msgstr "Skriv inn namnet ditt: "
 
 #: dialogs.py:308

Modified: packages/cycle/trunk/debian/msg/no.po
===================================================================
--- packages/cycle/trunk/debian/msg/no.po	2013-04-02 16:47:19 UTC (rev 9517)
+++ packages/cycle/trunk/debian/msg/no.po	2013-04-04 23:21:41 UTC (rev 9518)
@@ -256,7 +256,7 @@
 "programmet som en erstatning for gynekologen din."
 
 #: dialogs.py:308
-msgid "Enter you name:"
+msgid "Enter your name:"
 msgstr "Skriv inn navnet ditt: "
 
 #: dialogs.py:308

Modified: packages/cycle/trunk/debian/msg/ru.po
===================================================================
--- packages/cycle/trunk/debian/msg/ru.po	2013-04-02 16:47:19 UTC (rev 9517)
+++ packages/cycle/trunk/debian/msg/ru.po	2013-04-04 23:21:41 UTC (rev 9518)
@@ -248,7 +248,7 @@
 "÷Ù ÎÅ ÍÏÖÅÔÅ ÓÞÉÔÁÔØ ÜÔÕ ÐÒÏÇÒÁÍÍÕ ÚÁÍÅÎÏÊ ×ÁÛÅÍÕ ÇÉÎÅËÏÌÏÇÕ."
 
 #: dialogs.py:308
-msgid "Enter you name:"
+msgid "Enter your name:"
 msgstr "îÁÂÅÒÉÔÅ ÷ÁÛÅ ÉÍÑ"
 
 #: dialogs.py:308

Modified: packages/cycle/trunk/debian/msg/sk.po
===================================================================
--- packages/cycle/trunk/debian/msg/sk.po	2013-04-02 16:47:19 UTC (rev 9517)
+++ packages/cycle/trunk/debian/msg/sk.po	2013-04-04 23:21:41 UTC (rev 9518)
@@ -208,7 +208,7 @@
 msgstr "Chybné heslo!"
 
 #: ../dialogs.py:269
-msgid "Enter you name:"
+msgid "Enter your name:"
 msgstr "Zadejte vaše meno:"
 
 #: ../dialogs.py:269

Modified: packages/cycle/trunk/debian/msg/sv.po
===================================================================
--- packages/cycle/trunk/debian/msg/sv.po	2013-04-02 16:47:19 UTC (rev 9517)
+++ packages/cycle/trunk/debian/msg/sv.po	2013-04-04 23:21:41 UTC (rev 9518)
@@ -248,7 +248,7 @@
 "Det är bara ett elektroniskt sätt att hålla reda på några av dina medicinska data och plocka ut vissa statistiska slutsatser från dem. Du kan inte på något sätt tro att detta program fungerar som en ersättare för din gynekolog."
 
 #: dialogs.py:329
-msgid "Enter you name:"
+msgid "Enter your name:"
 msgstr "Ange ditt namn:"
 
 #: dialogs.py:329

Modified: packages/cycle/trunk/debian/patches/01_directories.patch
===================================================================
--- packages/cycle/trunk/debian/patches/01_directories.patch	2013-04-02 16:47:19 UTC (rev 9517)
+++ packages/cycle/trunk/debian/patches/01_directories.patch	2013-04-04 23:21:41 UTC (rev 9518)
@@ -1,6 +1,7 @@
-diff -ruN cycle-0.3.1.orig/set_dir.py cycle-0.3.1.new/set_dir.py
---- cycle-0.3.1.orig/set_dir.py	2005-04-25 11:26:45.000000000 +0200
-+++ cycle-0.3.1.new/set_dir.py	2006-09-23 23:03:09.000000000 +0200
+Index: cycle-0.3.1/set_dir.py
+===================================================================
+--- cycle-0.3.1.orig/set_dir.py	2013-04-04 23:46:44.936865094 +0200
++++ cycle-0.3.1/set_dir.py	2013-04-04 23:46:44.928865093 +0200
 @@ -1,5 +1,5 @@
  
 -msg_dir="msg"

Modified: packages/cycle/trunk/debian/patches/02_dialogs_fix.patch
===================================================================
--- packages/cycle/trunk/debian/patches/02_dialogs_fix.patch	2013-04-02 16:47:19 UTC (rev 9517)
+++ packages/cycle/trunk/debian/patches/02_dialogs_fix.patch	2013-04-04 23:21:41 UTC (rev 9518)
@@ -1,6 +1,7 @@
-diff -ruN cycle-0.3.1.orig/dialogs.py cycle-0.3.1.new/dialogs.py
---- cycle-0.3.1.orig/dialogs.py	2005-09-15 07:31:21.000000000 +0200
-+++ cycle-0.3.1.new/dialogs.py	2006-09-23 23:03:09.000000000 +0200
+Index: cycle-0.3.1/dialogs.py
+===================================================================
+--- cycle-0.3.1.orig/dialogs.py	2013-04-04 23:46:51.280865084 +0200
++++ cycle-0.3.1/dialogs.py	2013-04-04 23:46:51.268865087 +0200
 @@ -181,20 +181,20 @@
      users=[] #array of (user, file) name
      p, f_name=get_f_name()

Modified: packages/cycle/trunk/debian/patches/03a_dialogs_message.patch
===================================================================
--- packages/cycle/trunk/debian/patches/03a_dialogs_message.patch	2013-04-02 16:47:19 UTC (rev 9517)
+++ packages/cycle/trunk/debian/patches/03a_dialogs_message.patch	2013-04-04 23:21:41 UTC (rev 9518)
@@ -1,7 +1,8 @@
-diff -ruN cycle-0.3.1.orig/dialogs.py cycle-0.3.1.new/dialogs.py
---- cycle-0.3.1.orig/dialogs.py	2005-09-15 07:31:21.000000000 +0200
-+++ cycle-0.3.1.new/dialogs.py	2006-09-23 23:03:09.000000000 +0200
-@@ -320,12 +320,12 @@
+Index: cycle-0.3.1.orig/dialogs.py
+===================================================================
+--- cycle-0.3.1.orig.orig/dialogs.py	2005-09-15 07:31:21.000000000 +0200
++++ cycle-0.3.1.orig/dialogs.py	2013-04-05 00:04:17.224863730 +0200
+@@ -320,11 +320,11 @@
  def ask_name(parent=None):
      # nobody, it is first login
      wx.MessageBox(
@@ -10,13 +11,11 @@
 -        "like HIV/AIDS.\n\nIt is just an electronic means of keeping track "
 -        "of some of your medical data and extracting some statistical "
 -        "conclusions from them. You cannot consider this program as a "
--        "substitute for your gynecologist in any way."))
 +        _("This program is not a reliable contraceptive method.\n"
 +        "Neither does it help to prevent sexually transmitted diseases\n"
 +        "like HIV/AIDS.\n\nIt is just an electronic means of keeping track\n"
 +        "of some of your medical data and extracting some statistical\n"
 +        "conclusions from them. You cannot consider this program as a\n"
-+        "substitute for your gynecologist in any way."))	
+         "substitute for your gynecologist in any way."))
      dlg = wx.TextEntryDialog(parent, _('Enter you name:'),_('New user'),'',
  	 style=wx.OK | wx.CANCEL)
-     while dlg.ShowModal()==wx.ID_OK:

Modified: packages/cycle/trunk/debian/patches/03b_dialogs_strings.patch
===================================================================
--- packages/cycle/trunk/debian/patches/03b_dialogs_strings.patch	2013-04-02 16:47:19 UTC (rev 9517)
+++ packages/cycle/trunk/debian/patches/03b_dialogs_strings.patch	2013-04-04 23:21:41 UTC (rev 9518)
@@ -1,6 +1,7 @@
-diff -ruN cycle-0.3.1.orig/dialogs.py cycle-0.3.1.new/dialogs.py
---- cycle-0.3.1.orig/dialogs.py	2005-09-15 07:31:21.000000000 +0200
-+++ cycle-0.3.1.new/dialogs.py	2006-09-23 23:03:09.000000000 +0200
+Index: cycle-0.3.1/dialogs.py
+===================================================================
+--- cycle-0.3.1.orig/dialogs.py	2013-04-04 23:46:55.744865079 +0200
++++ cycle-0.3.1/dialogs.py	2013-04-04 23:46:55.740865079 +0200
 @@ -375,9 +375,9 @@
  	self._add(box, _('conception'), cycle.colour_set['conception'])
  	self._add(box, _('safe sex'), cycle.colour_set['safe sex'])

Modified: packages/cycle/trunk/debian/patches/04_cal_year_strings.patch
===================================================================
--- packages/cycle/trunk/debian/patches/04_cal_year_strings.patch	2013-04-02 16:47:19 UTC (rev 9517)
+++ packages/cycle/trunk/debian/patches/04_cal_year_strings.patch	2013-04-04 23:21:41 UTC (rev 9518)
@@ -1,6 +1,7 @@
-diff -ruN cycle-0.3.1.orig/cal_year.py cycle-0.3.1.new/cal_year.py
---- cycle-0.3.1.orig/cal_year.py	2005-09-15 05:11:33.000000000 +0200
-+++ cycle-0.3.1.new/cal_year.py	2006-09-23 23:03:09.000000000 +0200
+Index: cycle-0.3.1/cal_year.py
+===================================================================
+--- cycle-0.3.1.orig/cal_year.py	2013-04-04 23:46:57.696865078 +0200
++++ cycle-0.3.1/cal_year.py	2013-04-04 23:46:57.688865078 +0200
 @@ -70,7 +70,7 @@
  	    menu = wx.Menu()
  	    menu.Append(1, d.Format('%d %B'))

Modified: packages/cycle/trunk/debian/patches/05a_report_year_ical.patch
===================================================================
--- packages/cycle/trunk/debian/patches/05a_report_year_ical.patch	2013-04-02 16:47:19 UTC (rev 9517)
+++ packages/cycle/trunk/debian/patches/05a_report_year_ical.patch	2013-04-04 23:21:41 UTC (rev 9518)
@@ -1,7 +1,8 @@
-diff -ruN cycle-0.3.1.orig/cal_year.py cycle-0.3.1.new/cal_year.py
---- cycle-0.3.1.orig/cal_year.py	2005-09-15 05:11:33.000000000 +0200
-+++ cycle-0.3.1.new/cal_year.py	2006-09-23 23:03:09.000000000 +0200
-@@ -631,6 +630,52 @@
+Index: cycle-0.3.1/cal_year.py
+===================================================================
+--- cycle-0.3.1.orig/cal_year.py	2013-04-04 23:46:59.672865074 +0200
++++ cycle-0.3.1/cal_year.py	2013-04-04 23:46:59.668865074 +0200
+@@ -630,6 +630,52 @@
      print s
      return s
  

Modified: packages/cycle/trunk/debian/patches/05b_export_to_ical.patch
===================================================================
--- packages/cycle/trunk/debian/patches/05b_export_to_ical.patch	2013-04-02 16:47:19 UTC (rev 9517)
+++ packages/cycle/trunk/debian/patches/05b_export_to_ical.patch	2013-04-04 23:21:41 UTC (rev 9518)
@@ -1,6 +1,7 @@
-diff -ruN cycle-0.3.1.orig/cycle.py cycle-0.3.1.new/cycle.py
---- cycle-0.3.1.orig/cycle.py	2005-09-15 05:23:46.000000000 +0200
-+++ cycle-0.3.1.new/cycle.py	2006-09-23 23:03:09.000000000 +0200
+Index: cycle-0.3.1/cycle.py
+===================================================================
+--- cycle-0.3.1.orig/cycle.py	2013-04-04 23:47:01.600865073 +0200
++++ cycle-0.3.1/cycle.py	2013-04-04 23:47:01.592865073 +0200
 @@ -104,10 +104,13 @@
  
  	tb.SetToolSeparation(50)

Added: packages/cycle/trunk/debian/patches/06a_save_load.patch
===================================================================
--- packages/cycle/trunk/debian/patches/06a_save_load.patch	                        (rev 0)
+++ packages/cycle/trunk/debian/patches/06a_save_load.patch	2013-04-04 23:21:41 UTC (rev 9518)
@@ -0,0 +1,31 @@
+Index: cycle-0.3.1/save_load.py
+===================================================================
+--- cycle-0.3.1.orig/save_load.py	2013-04-04 23:47:03.544865069 +0200
++++ cycle-0.3.1/save_load.py	2013-04-04 23:47:03.536865069 +0200
+@@ -12,7 +12,7 @@
+                         message='.*rotor module', module=__name__)
+ 
+ import wx
+-import os, os.path , cPickle, md5
++import os, os.path , cPickle, hashlib
+ import cal_year
+ try:
+     import rotor
+@@ -23,7 +23,7 @@
+     """ Save the contents of our document to disk.
+     """
+     objSave=[]
+-    m=md5.new()
++    m=hashlib.md5()
+     m.update(passwd)
+     rt=rotor.newrotor(m.digest())
+     objSave.append(['period', cal_year.cycle.period])
+@@ -59,7 +59,7 @@
+     
+     p, f_name=get_f_name(file)
+     if os.path.isfile(f_name):
+-	m=md5.new()
++	m=hashlib.md5()
+ 	m.update(passwd)
+ 	rt=rotor.newrotor(m.digest())
+ 	f=open(f_name,"rb")

Modified: packages/cycle/trunk/debian/patches/series
===================================================================
--- packages/cycle/trunk/debian/patches/series	2013-04-02 16:47:19 UTC (rev 9517)
+++ packages/cycle/trunk/debian/patches/series	2013-04-04 23:21:41 UTC (rev 9518)
@@ -1,7 +1,9 @@
-01_directories.patch -p1
-02_dialogs_fix.patch -p1
-03a_dialogs_message.patch -p1
-03b_dialogs_strings.patch -p1
-04_cal_year_strings.patch -p1
-05a_report_year_ical.patch -p1
-05b_export_to_ical.patch -p1
+01_directories.patch
+02_dialogs_fix.patch
+03a_dialogs_message.patch
+03b_dialogs_strings.patch
+04_cal_year_strings.patch
+05a_report_year_ical.patch
+05b_export_to_ical.patch
+06a_save_load.patch
+

Modified: packages/cycle/trunk/debian/rules
===================================================================
--- packages/cycle/trunk/debian/rules	2013-04-02 16:47:19 UTC (rev 9517)
+++ packages/cycle/trunk/debian/rules	2013-04-04 23:21:41 UTC (rev 9518)
@@ -3,21 +3,22 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-build: build-stamp
+build-indep: build-stamp
 
 build-stamp:
 	dh_testdir
-	$(MAKE) -f /usr/share/quilt/quilt.make patch
 	python setup.py build
 	cd debian/msg; make
 	touch build-stamp
 
+build-arch:
+
+build: build-indep build-arch
+
 clean:
 	dh_testdir
 	dh_testroot
 	cd debian/msg; make clean
-	-rm debian/cycle/usr/share/cycle/bitmaps/export.png
-	$(MAKE) -f /usr/share/quilt/quilt.make unpatch
 	rm -rf build
 	rm -f build-stamp
 	dh_clean
@@ -25,26 +26,24 @@
 install: build 
 	dh_testdir
 	dh_testroot
-	dh_clean -k 
-	dh_installdirs	
+	dh_prep
+	dh_installdirs
 	cd debian/msg; make install DESTDIR=../cycle/usr/share/locale/
-	uudecode -o debian/cycle/usr/share/cycle/bitmaps/export.png debian/export.png.txt
 	
 binary-indep: build install
 	dh_testdir
 	dh_testroot
-	dh_install
 	dh_installchangelogs CHANGELOG
 	dh_installdocs
+	dh_installexamples
+	dh_install
 	dh_installmenu
-	dh_installman debian/cycle.1
+	dh_installman
 	dh_link
-	dh_strip
 	dh_compress
 	dh_fixperms
-	dh_pysupport
+	[ ! -e /usr/bin/dh_buildinfo ] || dh_buildinfo
 	dh_installdeb
-	dh_shlibdeps
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb
@@ -53,3 +52,4 @@
 
 binary: binary-indep 
 .PHONY: build clean binary-indep binary install
+

Modified: packages/cycle/trunk/debian/source/format
===================================================================
--- packages/cycle/trunk/debian/source/format	2013-04-02 16:47:19 UTC (rev 9517)
+++ packages/cycle/trunk/debian/source/format	2013-04-04 23:21:41 UTC (rev 9518)
@@ -1 +1 @@
-1.0
+3.0 (quilt)

Added: packages/cycle/trunk/debian/source/include-binaries
===================================================================
--- packages/cycle/trunk/debian/source/include-binaries	                        (rev 0)
+++ packages/cycle/trunk/debian/source/include-binaries	2013-04-04 23:21:41 UTC (rev 9518)
@@ -0,0 +1,2 @@
+debian/export.png
+debian/cycle.png

Added: packages/cycle/trunk/debian/source/options
===================================================================
--- packages/cycle/trunk/debian/source/options	                        (rev 0)
+++ packages/cycle/trunk/debian/source/options	2013-04-04 23:21:41 UTC (rev 9518)
@@ -0,0 +1,5 @@
+# Bzip2 compression for debian.tar
+compression = "bzip2"
+compression-level = 7
+# Do not generate diff for changes in config.(sub|guess)
+extend-diff-ignore = "(^|/)config.(sub|guess)$"

More information about the Python-apps-commits mailing list