On Wed, Sep 18, 2024 at 07:42:00PM +0200, Agustin Martin wrote:
> Control: tags -1 + patch
> 
> On Mon, Jul 29, 2024 at 07:42:04AM +0200, Lucas Nussbaum wrote:
> > Source: fortunes-es
> > Version: 1.36
> > Severity: serious
> > Justification: FTBFS
> > Tags: trixie sid ftbfs
> > User: lu...@debian.org
> > Usertags: ftbfs-20240728 ftbfs-trixie
> > 
> > Hi,
> > 
> > During a rebuild of all packages in sid, your package failed to build
> > Relevant part (hopefully):
> > > gcc -O2 -DFORTDIR="\"/usr/share/games/fortunes\"" 
> > > -DOFFDIR="\"/usr/share/games/fortunes/off\"" 
> > > -DLOCFORTDIR="\"/usr/local/share/games/fortunes\"" 
> > > -DLOCOFFDIR="\"/usr/local/share/games/fortunes/off\"" -Wall 
> > > -fomit-frame-pointer -pipe -fsigned-char -Wdate-time -D_FORTIFY_SOURCE=2  
> > > -c -o rot.o rot.c
> > > rot.c: In function ‘main’:
> > > rot.c:23:5: error: implicit declaration of function ‘exit’ 
> > > [-Wimplicit-function-declaration]
> > >    23 |     exit(0);
> > >       |     ^~~~
> > > rot.c:8:1: note: include ‘<stdlib.h>’ or provide a declaration of ‘exit’
> > >     7 | #include <ctype.h>
> > >   +++ |+#include <stdlib.h>
> ...
> 
> Hi, Javi,
> 
> Attached patch makes package build here.

Hi, Javi,

I am preparing a NMU for this, together with making package look more like
current packages look and fixing some lintian stuff.

This includes a (still empty) salsa git repo for the package.

Attached is git diff -w output.

If you do not object I will NMU shortly.

Regards,

-- 
Agustin
diff --git a/debian/changelog b/debian/changelog
index 153bec1..39f6a30 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,22 @@
+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.
+    - Add VCS entries.
+    - 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>  Thu, 17 Oct 2024 16:36:04 +0200
+
 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..5db6df6 100644
--- a/debian/control
+++ b/debian/control
@@ -2,13 +2,17 @@ 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
+Rules-Requires-Root: no
+Vcs-Browser: https://salsa.debian.org/debian/fortunes-es
+Vcs-Git: https://salsa.debian.org/debian/fortunes-es.git
+Standards-Version: 4.7.0
 
 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 +21,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..980c5e1 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,44 +1,31 @@
 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: fortunes-es
-Source: ftp://ftp.debian.org/dists/unstable/main/source/
+Source: https://salsa.debian.org/debian/fortunes-es
 
 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)
 {

Reply via email to