On Thu, Oct 17, 2024 at 06:20:00PM +0200, Javier Fernandez-Sanguino wrote:
> Hi Agustin,
>
> I'm fine with the NMU upload. Regarding Salsa: I would like to upload a Git
> repo with all the history so this package can be comaintained easily. Would
> you mind not pushing this to Salsa yet?
Hi, Javi,
I have just uploaded an NMU that does not include any salsa reference.
diffs (with and without -w) are attached.
Regards,
--
Agustin
diff --git a/debian/changelog b/debian/changelog
index 153bec1..774a29d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,21 @@
+fortunes-es (1.36+nmu1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix FTBFS: rot.c:23:5: error: implicit declaration of function
+ ‘exit’ (Closes: #1077423).
+ * debian/control:
+ - Use versioned debhelper prerequisite.
+ - Add debhelper misc:depends where needed.
+ - Bump Standards-Version.
+ - Add "Rules-Requires-Root: no"
+ * debian/copyright:
+ - Fix my email.
+ - Add missing continuation dots.
+ - Reorganize for clarity.
+ * debian/fortunes-es-off.preinst: Use explicit "set -e".
+
+ -- Agustin Martin Domingo <agmar...@debian.org> Sun, 26 Jan 2025 21:56:32 +0100
+
fortunes-es (1.36) unstable; urgency=medium
* Use debhelper compatibility version 13
diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index b1bd38b..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-13
diff --git a/debian/control b/debian/control
index 5d26975..78388a9 100644
--- a/debian/control
+++ b/debian/control
@@ -2,13 +2,15 @@ Source: fortunes-es
Section: games
Priority: optional
Maintainer: Javier Fernández-Sanguino Peña <j...@debian.org>
-Build-Depends: debhelper (>=9)
+Build-Depends: debhelper-compat (=13)
Build-Depends-Indep: fortune-mod, recode
-Standards-Version: 3.9.8
+Standards-Version: 4.7.0
+Rules-Requires-Root: no
Package: fortunes-es
Architecture: all
-Depends: fortune-mod
+Depends: ${misc:Depends},
+ fortune-mod
Provides: fortune-cookie-db
Description: Spanish fortune database
A collection of Spanish fortune cookies, taken from various sources
@@ -17,7 +19,9 @@ Description: Spanish fortune database
Package: fortunes-es-off
Architecture: all
-Depends: fortune-mod, fortunes-es
+Depends: ${misc:Depends},
+ fortune-mod,
+ fortunes-es
Provides: fortune-cookie-db
Replaces: fortunes-es-pic
Description: Spanish fortune cookies (Offensive section)
diff --git a/debian/copyright b/debian/copyright
index f563998..78aed56 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,42 +3,29 @@ Upstream-Name: fortunes-es
Source: ftp://ftp.debian.org/dists/unstable/main/source/
Files: *
-Copyright: 1999 Agustín Martín Domingo <agmar...@aq.upm.es>
+Copyright: 1999 Agustín Martín Domingo <agmar...@debian.org>
2000 Javier Fernandez-Sanguino Peña <j...@debian.org>
License: GPL-2+
+
+Files: datfiles/*
+Copyright: 1999 Roly Canteros
+ 1999 Urko Lusa
+License: PD-FORTUNES-ES
+
+License: PD-FORTUNES-ES
All fortunes' text and quotes are presumed to be in the public domain. However
if any non-free fortune is present, please notify it to the package maintainer
to remove it.
-
+ .
This package includes mainly fortunes recopiled at "Frases y Proverbios"
by Roly Canteros:
http://www.cantervill.com.ar/fyp
-
+ .
with recopilator consent, and from fortunes previously used for Urko Lusa
program 'chorrada', available at:
http://www.arrakis.es/~ulusa/linux/chorrada.html
[Note: URL no longer available]
- The programs developed in order to recopilate this compendium of software
- are GPL. The following license applies to the code only (not to the fortunes,
- see above)
-
- 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 1, 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.
-
- See file /usr/share/common-licenses/GPL in your debian system for more
- information.
-
-
-Files: debian/*
-Copyright: 2000 Javier Fernández-Sanguino Peña <j...@debian.org>
License: GPL-2+
This package is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -55,5 +42,3 @@ License: GPL-2+
.
On Debian systems, the complete text of the GNU General
Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
-
-
diff --git a/debian/fortunes-es-off.preinst b/debian/fortunes-es-off.preinst
index 631ee4a..450d78a 100644
--- a/debian/fortunes-es-off.preinst
+++ b/debian/fortunes-es-off.preinst
@@ -1,4 +1,6 @@
-#!/bin/sh -e
+#!/bin/sh
+
+set -e
# TODO: Move to i18n messages
#msg_found_obsolete_dir="Eliminando directorio obsoleto"
diff --git a/util/rot.c b/util/rot.c
index 3064193..c9d5a95 100644
--- a/util/rot.c
+++ b/util/rot.c
@@ -5,6 +5,7 @@
#include <stdio.h>
#include <ctype.h>
+#include <stdlib.h>
int main(void)
{
diff --git a/debian/changelog b/debian/changelog
index 153bec1..774a29d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,27 @@
+fortunes-es (1.36+nmu1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix FTBFS: rot.c:23:5: error: implicit declaration of function
+ ‘exit’ (Closes: #1077423).
+ * debian/control:
+ - Use versioned debhelper prerequisite.
+ - Add debhelper misc:depends where needed.
+ - Bump Standards-Version.
+ - Add "Rules-Requires-Root: no"
+ * debian/copyright:
+ - Fix my email.
+ - Add missing continuation dots.
+ - Reorganize for clarity.
+ * debian/fortunes-es-off.preinst: Use explicit "set -e".
+
+ -- Agustin Martin Domingo <agmar...@debian.org> Sun, 26 Jan 2025 21:56:32 +0100
+
fortunes-es (1.36) unstable; urgency=medium
- * Use debhelper compatibility version 13
+ * Use debhelper compatibility version 13
* Rename datfiles/ofensivas/unrotated/feministas.fortunes to
"hembrismo.fortunes" (Closes: #900646)
- * Fix datfiles/famosos.fortunes as proposed by
+ * Fix datfiles/famosos.fortunes as proposed by
Adrián Croce (it was using DOS line endings instead of UNIX).
Additionally also translate one cookie from Steve Jobs into Spanish as it
was in English. (Closes: #966290)
@@ -16,14 +34,14 @@ fortunes-es (1.35) unstable; urgency=medium
* datfiles/ciencia.fortunes, sabiduria.fortunes: Add quotes of in memory of
one of the most brilliant minds of our time: Stephen Hawking, who passed
- away yesterday, on Pi day.
+ away yesterday, on Pi day.
* datfiles/sabiduria.fortunes: Correct quote assigned to Umberto Eco which
- actually corresponds to Raymond Smullyan (who was quoted in the
+ actually corresponds to Raymond Smullyan (who was quoted in the
opening statements of Foucault's Pendulum) as I reported myself,
and forgot (!), 4 yeas ago (Closes: #749486)
- * datfiles/ofensivas/varios.fortunes: Remove extra '%' in file
+ * datfiles/ofensivas/varios.fortunes: Remove extra '%' in file
(Closes: #881495)
- * fortunes-es-off.preinst: Fix typo in variable name which prevented messag
+ * fortunes-es-off.preinst: Fix typo in variable name which prevented messag
from showing, with patch provided by Chris Lamb (Closes: #838719)
-- Javier Fernández-Sanguino Peña <j...@debian.org> Thu, 15 Mar 2018 08:14:15 +0100
@@ -39,9 +57,9 @@ fortunes-es (1.34) unstable; urgency=medium
fortunes-es (1.33) unstable; urgency=medium
- * debian/rules: Move to debhelper format, this fixes FTBFS as the
+ * debian/rules: Move to debhelper format, this fixes FTBFS as the
package now conforms to the proper Debian standards (Closes: #831971)
- * debian/control:
+ * debian/control:
- Update standards version
- Fix encoding of maintainer's name
- Change dependency to debhelper 9
@@ -49,13 +67,13 @@ fortunes-es (1.33) unstable; urgency=medium
* source/format: Create
* debian/compat: Update to 9
* debian/copyright: Use the new standard file format
- * debian/fortunes-es{,off}.install:
+ * debian/fortunes-es{,off}.install:
- Create so that the fortunes are now installed using dh_install instead
of dh_movefiles
- - Move fortunes to the 'es' subdirectory so they are presented to users
+ - Move fortunes to the 'es' subdirectory so they are presented to users
that have 'es' as their LANG (Closes: #587188)
- * dattfiles/{several}:
+ * dattfiles/{several}:
- Update death years for some quote authors that passed away (Umberto
Eco, Arthur Clarke...) basically searching for this regexp '(19..-)' and
reviewing the Wikipedia articles
@@ -77,7 +95,7 @@ fortunes-es (1.31) unstable; urgency=low
[ The "Steve Jobs" release, in honor of the co-founder of Apple
and Genius. Who passed away the 5th of October 2011 ]
* datfiles/famosos.fortunes: Add famous Steve Jobs' quotes collected from the
- web and translated into Spanish
+ web and translated into Spanish
* Use Debhelper compatibility version 5
* Fix typos in debian/README.Debian
* Change maintainer's email address
@@ -192,7 +210,7 @@ fortunes-es (1.18) unstable; urgency=low
* Install fortunes with UTF-8 support including the encoding hints
for the Debian binary (Closes: #232193, #237078)
* Wrapped some of arte.fortunes lines to 76 characters, this is a very
- cumbersome/tiresome task and it should be automated. If anyone wants to do
+ cumbersome/tiresome task and it should be automated. If anyone wants to do
it (and close bug 227345), be my guest.
-- Javier Fernandez-Sanguino Pen~a <j...@computer.org> Sun, 27 Jun 2004 13:21:07 +0200
@@ -219,19 +237,19 @@ fortunes-es (1.15) unstable; urgency=low
* Removed spanish text from description of fortunes-es-off
* Expanded extended description of fortunes-es (Closes: #209530)
* Removed 'Papa' (Pope) from the cookies of Alfonso X (Spanish king)
- * Added fortune files for Nietzsche, Lao-Tse and Schopenhauer
+ * Added fortune files for Nietzsche, Lao-Tse and Schopenhauer
after fixing some typos (begin question and exclamations marks missing)
(Closes: #176174)
* Removed useless debian/README file and merge spanish translations
of the README.Debian into a single 'LEAME.Debian' file
* Added code to add UTF-8 encoded cookies on installation, this is related
- to #213477 but notice that the bug resides in fortunes-mod. I'm not
+ to #213477 but notice that the bug resides in fortunes-mod. I'm not
enabling this, however, since it breaks offensive cookies
* Added more old sayings (refranes.fortunes) from some web sources
(gone from ~800 to over 5000)
* Removed offensive fortune from proverbios.fortunes even if nobody
reported this as a "bug"
- (see http://lists.debian.org/debian-devel-spanish/2003/debian-devel-spanish-200308/msg00061.html)
+ (see http://lists.debian.org/debian-devel-spanish/2003/debian-devel-spanish-200308/msg00061.html)
-- Javier Fernandez-Sanguino Pen~a <j...@computer.org> Sun, 5 Oct 2003 10:16:23 +0200
@@ -256,7 +274,7 @@ fortunes-es (1.12) unstable; urgency=low
fortunes-es (1.11) unstable; urgency=low
* Changed from 'extra' priority to optional
- * Moved dh_installmanpages to dh_installman to avoid installing
+ * Moved dh_installmanpages to dh_installman to avoid installing
conflicting manpages (Closes: #149419, #149514)
-- Javier Fernandez-Sanguino Pen~a <j...@computer.org> Mon, 10 Jun 2002 14:10:44 +0200
@@ -296,11 +314,11 @@ fortunes-es (1.7) unstable; urgency=low
fortunes-es (1.6-pre7) unstable; urgency=low
* New section, offensive/machosno (a better name is wished)
- * Added mail from drizzt for some taglines added
- * Added mail from 'fyp'
+ * Added mail from drizzt for some taglines added
+ * Added mail from 'fyp'
(Frases y proverbios, http://www.cantervill.com.ar/fyp)
* Improved mechanism for doc link. Check for obsolete dirs.
- * Since all docs are currently in fortunes-es, fortunes-es-off now
+ * Since all docs are currently in fortunes-es, fortunes-es-off now
depends on fortunes-es.
-- Javier Fernandez-Sanguino Pen~a <j...@computer.org> Wed, 9 Feb 2000 11:09:25 +0100
@@ -319,7 +337,7 @@ fortunes-es (1.5a) unstable; urgency=low
* fortunes-es-off: wrong destination. Fixed
-- Javier Fernandez-Sanguino Pen~a <j...@computer.org> Thu, 3 Feb 2000 19:17:18 +0100
-
+
fortunes-es (1.5) unstable; urgency=low
* New maintainer
diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index b1bd38b..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-13
diff --git a/debian/control b/debian/control
index 5d26975..78388a9 100644
--- a/debian/control
+++ b/debian/control
@@ -2,22 +2,26 @@ Source: fortunes-es
Section: games
Priority: optional
Maintainer: Javier Fernández-Sanguino Peña <j...@debian.org>
-Build-Depends: debhelper (>=9)
+Build-Depends: debhelper-compat (=13)
Build-Depends-Indep: fortune-mod, recode
-Standards-Version: 3.9.8
+Standards-Version: 4.7.0
+Rules-Requires-Root: no
Package: fortunes-es
Architecture: all
-Depends: fortune-mod
+Depends: ${misc:Depends},
+ fortune-mod
Provides: fortune-cookie-db
-Description: Spanish fortune database
+Description: Spanish fortune database
A collection of Spanish fortune cookies, taken from various sources
- including the 'chorrada' program (from FIDOnet) and the
+ including the 'chorrada' program (from FIDOnet) and the
'Frases y Proverbios' webpage.
Package: fortunes-es-off
Architecture: all
-Depends: fortune-mod, fortunes-es
+Depends: ${misc:Depends},
+ fortune-mod,
+ fortunes-es
Provides: fortune-cookie-db
Replaces: fortunes-es-pic
Description: Spanish fortune cookies (Offensive section)
diff --git a/debian/copyright b/debian/copyright
index f563998..78aed56 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,42 +3,29 @@ Upstream-Name: fortunes-es
Source: ftp://ftp.debian.org/dists/unstable/main/source/
Files: *
-Copyright: 1999 Agustín Martín Domingo <agmar...@aq.upm.es>
+Copyright: 1999 Agustín Martín Domingo <agmar...@debian.org>
2000 Javier Fernandez-Sanguino Peña <j...@debian.org>
License: GPL-2+
+
+Files: datfiles/*
+Copyright: 1999 Roly Canteros
+ 1999 Urko Lusa
+License: PD-FORTUNES-ES
+
+License: PD-FORTUNES-ES
All fortunes' text and quotes are presumed to be in the public domain. However
if any non-free fortune is present, please notify it to the package maintainer
to remove it.
-
- This package includes mainly fortunes recopiled at "Frases y Proverbios"
+ .
+ This package includes mainly fortunes recopiled at "Frases y Proverbios"
by Roly Canteros:
http://www.cantervill.com.ar/fyp
-
- with recopilator consent, and from fortunes previously used for Urko Lusa
+ .
+ with recopilator consent, and from fortunes previously used for Urko Lusa
program 'chorrada', available at:
http://www.arrakis.es/~ulusa/linux/chorrada.html
[Note: URL no longer available]
- The programs developed in order to recopilate this compendium of software
- are GPL. The following license applies to the code only (not to the fortunes,
- see above)
-
- 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 1, 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.
-
- See file /usr/share/common-licenses/GPL in your debian system for more
- information.
-
-
-Files: debian/*
-Copyright: 2000 Javier Fernández-Sanguino Peña <j...@debian.org>
License: GPL-2+
This package is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -55,5 +42,3 @@ License: GPL-2+
.
On Debian systems, the complete text of the GNU General
Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
-
-
diff --git a/debian/fortunes-es-off.preinst b/debian/fortunes-es-off.preinst
index 631ee4a..450d78a 100644
--- a/debian/fortunes-es-off.preinst
+++ b/debian/fortunes-es-off.preinst
@@ -1,4 +1,6 @@
-#!/bin/sh -e
+#!/bin/sh
+
+set -e
# TODO: Move to i18n messages
#msg_found_obsolete_dir="Eliminando directorio obsoleto"
diff --git a/debian/rules b/debian/rules
index dff0ca8..b56fdca 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,7 +15,7 @@
%:
- dh $@
+ dh $@
override_dh_auto_install:
dh_auto_install -- install-utf8 prefix=`pwd`/debian/tmp
@@ -24,5 +24,5 @@ override_dh_auto_install:
# TODO (from previous rules):
# ./docjoinlink fortunes-es-off fortunes-es
# ( cd debian/fortunes-es-off/usr/share/doc ; test -d fortunes-es-off && rm -rf fortunes-es-off )
-# install -d debian/fortunes-es-off/usr/share/doc
+# install -d debian/fortunes-es-off/usr/share/doc
# ln -s fortunes-es debian/fortunes-es-off/usr/share/doc/fortunes-es-off
diff --git a/util/rot.c b/util/rot.c
index 3064193..c9d5a95 100644
--- a/util/rot.c
+++ b/util/rot.c
@@ -5,6 +5,7 @@
#include <stdio.h>
#include <ctype.h>
+#include <stdlib.h>
int main(void)
{
