--- Begin Message ---
Package: manpages-es
Severity: wishlist
Tags: patch
Hi Javier,
Here is another patch to migrate to new package format[*].
Notes:
- There were many 01-* numbered patches. To make apply order
apparent, all patches were renumbered sequentially: N, N + increment ...
- Files PROYECTO copyright were not in original sources so they
were moved to patch 03.
Otherwise moving to 3.0 was straight forward. Let me know if there is
anything that needs adjusting.
Thanks,
Jari
[*] The dpatch patch management system has been deprecated for some time. The
Lintian currently flags use of dpatch packages as an error. The new 3.0
packaging format is an improved version which, among other things, contains
patch management built-in. For more information, see:
<http://wiki.debian.org/Projects/DebSrc3.0>.
>From 4efd0e20446111c3d0c9622f911523e44e53944e Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aa...@cante.net>
Date: Thu, 26 Apr 2012 09:51:17 +0300
Subject: [PATCH] format-3.0
Organization: Private
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit
Signed-off-by: Jari Aalto <jari.aa...@cante.net>
---
PROYECTO | 194 --------------------
copyright | 2 -
debian/changelog | 14 ++
debian/compat | 2 +-
debian/control | 4 +-
debian/patches/00list | 17 --
debian/patches/01_getenv.3.dpatch | 16 --
debian/patches/01_putenv.3.dpatch | 16 --
debian/patches/01_setenv.3.dpatch | 17 --
...ve_passwd.5.dpatch => 05-remove-passwd.5.patch} | 8 +-
.../{01_bdflush.2.dpatch => 10-bdflush.2.patch} | 8 +-
.../{01_umask.2.dpatch => 15-umask.2.patch} | 8 +-
.../{01_crypt.3.dpatch => 20-crypt.3.patch} | 8 +-
debian/patches/25-getenv.3.patch | 16 ++
debian/patches/30-putenv.3.patch | 16 ++
debian/patches/35-setenv.3.patch | 17 ++
.../{01_charsets.4.dpatch => 40-charsets.4.patch} | 8 +-
.../{01_fstab.5.dpatch => 45-fstab.5.patch} | 8 +-
.../{01_nsswitch.5.dpatch => 50-nsswitch.5.patch} | 8 +-
.../{01_environ.7.dpatch => 55-environ.7.patch} | 8 +-
...documented.7.dpatch => 60-undocumented.7.patch} | 8 +-
.../{01_Makefile.dpatch => 65-Makefile.patch} | 8 +-
.../{01_PROYECTO.dpatch => 70-PROYECTO.patch} | 8 +-
...-2.7.utf8.dpatch => 75-iso-8859-2.7.utf8.patch} | 8 +-
.../{10_map.2.utf8.dpatch => 80-map.2.utf8.patch} | 8 +-
..._not_install.dpatch => 85-do-not-install.patch} | 8 +-
debian/patches/series | 18 ++
debian/rules | 11 +-
debian/source/format | 1 +
29 files changed, 120 insertions(+), 353 deletions(-)
delete mode 100644 PROYECTO
delete mode 100644 copyright
delete mode 100644 debian/patches/00list
delete mode 100644 debian/patches/01_getenv.3.dpatch
delete mode 100644 debian/patches/01_putenv.3.dpatch
delete mode 100644 debian/patches/01_setenv.3.dpatch
rename debian/patches/{01_remove_passwd.5.dpatch => 05-remove-passwd.5.patch} (96%)
rename debian/patches/{01_bdflush.2.dpatch => 10-bdflush.2.patch} (86%)
rename debian/patches/{01_umask.2.dpatch => 15-umask.2.patch} (73%)
rename debian/patches/{01_crypt.3.dpatch => 20-crypt.3.patch} (76%)
create mode 100644 debian/patches/25-getenv.3.patch
create mode 100644 debian/patches/30-putenv.3.patch
create mode 100644 debian/patches/35-setenv.3.patch
rename debian/patches/{01_charsets.4.dpatch => 40-charsets.4.patch} (97%)
rename debian/patches/{01_fstab.5.dpatch => 45-fstab.5.patch} (96%)
rename debian/patches/{01_nsswitch.5.dpatch => 50-nsswitch.5.patch} (97%)
rename debian/patches/{01_environ.7.dpatch => 55-environ.7.patch} (96%)
rename debian/patches/{01_undocumented.7.dpatch => 60-undocumented.7.patch} (93%)
rename debian/patches/{01_Makefile.dpatch => 65-Makefile.patch} (65%)
rename debian/patches/{01_PROYECTO.dpatch => 70-PROYECTO.patch} (95%)
rename debian/patches/{10_iso_8859-2.7.utf8.dpatch => 75-iso-8859-2.7.utf8.patch} (95%)
rename debian/patches/{10_map.2.utf8.dpatch => 80-map.2.utf8.patch} (96%)
rename debian/patches/{20_do_not_install.dpatch => 85-do-not-install.patch} (62%)
create mode 100644 debian/patches/series
create mode 100644 debian/source/format
diff --git a/PROYECTO b/PROYECTO
deleted file mode 100644
index fb82277..0000000
--- a/PROYECTO
+++ /dev/null
@@ -1,194 +0,0 @@
- P A G I N A S D E M A N U A L E N E S P A Ñ O L
- P A R A L I N U X (P R O Y E C T O P A M E L I)
- ---------------------------------------------------
-
-
- Coordinador: Juan Piernas Cánovas (pier...@dif.um.es)
- University of Murcia, Murcia (SPAIN)
-
- Traductores de la versión 0.2a:
- Miguel Angel Sepúlveda (España)
- Diego Novillo (Argentina)
- Sebastián Desimone (Argentina)
- Ismael Laviana Corte (España)
- Iñaki Martínez Díez (España)
- Ignacio Arenaza (Suiza)
- Jesús Eugenio Sánchez (EE.UU.)
-
- Traductores de la versión 0.3a:
- Gerardo Aburruzaga García (España)
- Vicente Pastor Gómez (España)
- Urko Lusa (España)
- José Manuel Laveda (España)
- José Miguel Gurpegui (España)
- Carlos Costa Portela (España)
- Julio González Durán (España)
- David González Dorta (España)
- Miguel Gil (España)
- Juan Piernas Cánovas (España)
-
- Traductores de la versión 0.4a:
- Gerardo Aburruzaga García (España)
- Vicente Pastor Gómez (España)
- Urko Lusa (España)
- José Manuel Laveda (España)
- José Miguel Gurpegui (España)
- Carlos Costa Portela (España)
- Julio González Durán (España)
- David González Dorta (España)
- Juan Piernas Cánovas (España)
- Rafael Godínez Pérez (España)
- Carlos Gómez Romero (España)
-
- Objetivos del
- Proyecto: Traducción y mantenimiento de las
- páginas del usuario y del programador
- para el sistema operativo Linux.
-
- Objetivos
- Secundarios: Recopilación de un vocabulario técnico adecuado
- y común a los usuarios de la lengua hispana.
- Dicho vocabulario debería ser simple, concreto,
- uniforme y reconocible para la mayoría de los
- usuarios del mundo UNIX castellano.
-
- En un futuro no muy lejano esperamos crear
- una distribución completamente autóctona al
- usuario hispano-hablante.
-
- Filosofía de la
- Traducción: Reconocemos la necesidad de modernizar el
- castellano, al menos en el ámbito técnico-informático.
- Intentaremos castellanizar tantas palabras técnicas
- en la traducción como sea posible. El uso cotidiano
- de términos ingleses en el ámbito de computación
- hace difícil cambiar pautas de conductas ya
- creadas. Palabras como "spool" y "buffer" resultan
- difíciles de traducir ya que son aceptadas y
- usadas cotidianamente. Algunos de estos términos
- serán aceptados como parte integral de la
- traducción y otros no. No obstante, siempre que
- usemos una castellanización que no sea del
- dominio general haremos un gran esfuerzo por
- indicar la palabra inglesa de origen. Claridad
- es más importante que purismo para esta traducción.
-
- Otro problema que enfrentan los traductores de
- este proyecto es la diversidad de dialectos
- existentes en el mundo castellano. ¿Cuál es la
- versión correcta? Creemos que ninguna, sin
- embargo en la práctica tenemos que expresarnos
- de una forma concreta e inevitablemente
- terminamos usando un dialecto en particular.
- Nuestro proyecto, en comparación con el spanish-GNU,
- cuenta con un enorme porcentaje de latinoamericanos
- y por ello creemos en armonizar todas las formas
- del idioma en un vocabulario técnico que sea
- único para todos. Intentaremos evitar
- "afectaciones" que sean particulares de un solo
- país. El LEEME que acompañará la distribución
- indicará en concreto dichos casos.
-
- Procuraremos no aceptar ningún
- barbarismo, tal como "aplicar" en vez de
- "solicitar", "setear" en vez de "asignar".
-
-
-
- P A G I N A S D E M A N U A L E N E S P A Ñ O L
- P A R A L I N U X (P R O Y E C T O P A M E L I)
- ---------------------------------------------------
-
-
- Coordinador: Juan Piernas Cánovas (pier...@dif.um.es)
- University of Murcia, Murcia (SPAIN)
-
- Traductores de la versión 0.2a:
- Miguel Angel Sepúlveda (España)
- Diego Novillo (Argentina)
- Sebastián Desimone (Argentina)
- Ismael Laviana Corte (España)
- Iñaki Martínez Díez (España)
- Ignacio Arenaza (Suiza)
- Jesús Eugenio Sánchez (EE.UU.)
-
- Traductores de la versión 0.3a:
- Gerardo Aburruzaga García (España)
- Vicente Pastor Gómez (España)
- Urko Lusa (España)
- José Manuel Laveda (España)
- José Miguel Gurpegui (España)
- Carlos Costa Portela (España)
- Julio González Durán (España)
- David González Dorta (España)
- Miguel Gil (España)
- Juan Piernas Cánovas (España)
-
- Traductores de la versión 0.4a:
- Gerardo Aburruzaga García (España)
- Vicente Pastor Gómez (España)
- Urko Lusa (España)
- José Manuel Laveda (España)
- José Miguel Gurpegui (España)
- Carlos Costa Portela (España)
- Julio González Durán (España)
- David González Dorta (España)
- Juan Piernas Cánovas (España)
- Rafael Godínez Pérez (España)
- Carlos Gómez Romero (España)
-
- Objetivos del
- Proyecto: Traducción y mantenimiento de las
- páginas del usuario y del programador
- para el sistema operativo Linux.
-
- Objetivos
- Secundarios: Recopilación de un vocabulario técnico adecuado
- y común a los usuarios de la lengua hispana.
- Dicho vocabulario debería ser simple, concreto,
- uniforme y reconocible para la mayoría de los
- usuarios del mundo UNIX castellano.
-
- En un futuro no muy lejano esperamos crear
- una distribución completamente autóctona al
- usuario hispano-hablante.
-
- Filosofía de la
- Traducción: Reconocemos la necesidad de modernizar el
- castellano, al menos en el ámbito técnico-informático.
- Intentaremos castellanizar tantas palabras técnicas
- en la traducción como sea posible. El uso cotidiano
- de términos ingleses en el ámbito de computación
- hace difícil cambiar pautas de conductas ya
- creadas. Palabras como "spool" y "buffer" resultan
- difíciles de traducir ya que son aceptadas y
- usadas cotidianamente. Algunos de estos términos
- serán aceptados como parte integral de la
- traducción y otros no. No obstante, siempre que
- usemos una castellanización que no sea del
- dominio general haremos un gran esfuerzo por
- indicar la palabra inglesa de origen. Claridad
- es más importante que purismo para esta traducción.
-
- Otro problema que enfrentan los traductores de
- este proyecto es la diversidad de dialectos
- existentes en el mundo castellano. ¿Cuál es la
- versión correcta? Creemos que ninguna, sin
- embargo en la práctica tenemos que expresarnos
- de una forma concreta e inevitablemente
- terminamos usando un dialecto en particular.
- Nuestro proyecto, en comparación con el spanish-GNU,
- cuenta con un enorme porcentaje de latinoamericanos
- y por ello creemos en armonizar todas las formas
- del idioma en un vocabulario técnico que sea
- único para todos. Intentaremos evitar
- "afectaciones" que sean particulares de un solo
- país. El LEEME que acompañará la distribución
- indicará en concreto dichos casos.
-
- Procuraremos no aceptar ningún
- barbarismo, tal como "aplicar" en vez de
- "solicitar", "setear" en vez de "asignar".
-
-
-
diff --git a/copyright b/copyright
deleted file mode 100644
index 93876eb..0000000
--- a/copyright
+++ /dev/null
@@ -1,2 +0,0 @@
-These manual pages were written and improved by different people.
-All of them can be freely distributed if the nroff source is also distributed.
diff --git a/debian/changelog b/debian/changelog
index 0cdd639..d692906 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+manpages-es (1.55-11) unstable; urgency=low
+
+ [Jari Aalto]
+ * Non-maintainer upload.
+ * Remove deprecated dpatch and upgrade to packaging format "3.0 quilt".
+ * Update to Standards-Version to 3.9.3 and debhelper to 9.
+ * Add required build-arch and build-indep targets to rules file.
+ * Patches:
+ - Renumber patches according to their apply order.
+ - 03: New; in-line changes to original sources.
+ - 25, 30, 35: update with "quilt refresh" to make them apply cleanly.
+
+ -- Jari Aalto <jari.aa...@cante.net> Thu, 26 Apr 2012 09:50:47 +0300
+
manpages-es (1.55-10) unstable; urgency=low
* Remove the template message as it is not necessary and has not been
diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index 1b60273..405e9e6 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,8 @@ Section: doc
Priority: optional
Maintainer: Javier Fernández-Sanguino Peña <j...@debian.org>
Uploaders: Rubén Porras Campo <naho...@gmail.com>
-Build-Depends: debhelper (>= 7), dpatch, po-debconf
-Standards-Version: 3.7.3
+Build-Depends: debhelper (>= 9), po-debconf
+Standards-Version: 3.9.3
Homepage: http://ditec.um.es/~piernas/manpages-es/
Package: manpages-es
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 1bbba30..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,17 +0,0 @@
-01_remove_passwd.5
-01_bdflush.2
-01_umask.2
-01_crypt.3
-01_getenv.3
-01_putenv.3
-01_setenv.3
-01_charsets.4
-01_fstab.5
-01_nsswitch.5
-01_environ.7
-01_undocumented.7
-01_Makefile
-01_PROYECTO
-10_iso_8859-2.7.utf8
-10_map.2.utf8
-20_do_not_install.dpatch
diff --git a/debian/patches/01_getenv.3.dpatch b/debian/patches/01_getenv.3.dpatch
deleted file mode 100644
index 5293d6a..0000000
--- a/debian/patches/01_getenv.3.dpatch
+++ /dev/null
@@ -1,16 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_getenv.3.dpatch by Rubén Porras Campo <na...@inicia.es>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: New patch generated from manpages-es 1.28-13 diff.gz
-
-@DPATCH@
-
---- manpages-es-1.28.orig/man3/getenv.3
-+++ manpages-es-1.28/man3/getenv.3
-@@ -51,4 +51,4 @@
- .BR putenv (3),
- .BR setenv (3),
- .BR unsetenv (3),
--.BR environ (5)
-+.BR environ (7)
diff --git a/debian/patches/01_putenv.3.dpatch b/debian/patches/01_putenv.3.dpatch
deleted file mode 100644
index daf1bf6..0000000
--- a/debian/patches/01_putenv.3.dpatch
+++ /dev/null
@@ -1,16 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_putenv.3.dpatch by Rubén Porras Campo <na...@inicia.es>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: New patch generated from manpages-es 1.28-13 diff.gz
-
-@DPATCH@
-
---- manpages-es-1.28.orig/man3/putenv.3
-+++ manpages-es-1.28/man3/putenv.3
-@@ -88,4 +88,4 @@
- .BR getenv (3),
- .BR setenv (3),
- .BR unsetenv (3),
--.BR environ (5)
-+.BR environ (7)
diff --git a/debian/patches/01_setenv.3.dpatch b/debian/patches/01_setenv.3.dpatch
deleted file mode 100644
index 2ae89ae..0000000
--- a/debian/patches/01_setenv.3.dpatch
+++ /dev/null
@@ -1,17 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_setenv.3.dpatch by Rubén Porras Campo <na...@inicia.es>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: New patch generated from manpages-es 1.28-13 diff.gz
-
-@DPATCH@
-
---- manpages-es-1.28.orig/man3/setenv.3
-+++ manpages-es-1.28/man3/setenv.3
-@@ -56,5 +56,5 @@
- .SH "VÉASE TAMBIÉN"
- .BR getenv (3),
- .BR putenv (3),
--.BR environ (5)
-+.BR environ (7)
-
diff --git a/debian/patches/01_remove_passwd.5.dpatch b/debian/patches/05-remove-passwd.5.patch
similarity index 96%
rename from debian/patches/01_remove_passwd.5.dpatch
rename to debian/patches/05-remove-passwd.5.patch
index 3bcff49..9833f7d 100644
--- a/debian/patches/01_remove_passwd.5.dpatch
+++ b/debian/patches/05-remove-passwd.5.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_remove_passwd.5.dpatch by <bennett@localhost.localdomain>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Remove passwd(5) from the package
+From: <bennett@localhost.localdomain>
+Subject: Remove passwd(5) from the package
-@DPATCH@
diff -urNad manpages-es-1.55~/man5/passwd.5 manpages-es-1.55/man5/passwd.5
--- manpages-es-1.55~/man5/passwd.5 2005-09-13 15:09:02.000000000 +0200
+++ manpages-es-1.55/man5/passwd.5 1970-01-01 01:00:00.000000000 +0100
diff --git a/debian/patches/01_bdflush.2.dpatch b/debian/patches/10-bdflush.2.patch
similarity index 86%
rename from debian/patches/01_bdflush.2.dpatch
rename to debian/patches/10-bdflush.2.patch
index 042fbf1..d46b800 100644
--- a/debian/patches/01_bdflush.2.dpatch
+++ b/debian/patches/10-bdflush.2.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_bdflush.2.dpatch.dpatch by <j...@computer.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Bdflush: change 'duende' to 'demonio'
+From: Javier Fernandez-Sanguino <j...@computer.org>
+Subject: Bdflush: change 'duende' to 'demonio'
-@DPATCH@
diff -Nru man-pages-es-1.55.orig/man2/bdflush.2 manpages-es-1.55/man2/bdflush.2
--- man-pages-es-1.55.orig/man2/bdflush.2 2004-07-14 13:21:40.000000000 +0200
diff --git a/debian/patches/01_umask.2.dpatch b/debian/patches/15-umask.2.patch
similarity index 73%
rename from debian/patches/01_umask.2.dpatch
rename to debian/patches/15-umask.2.patch
index b1c75dc..7449383 100644
--- a/debian/patches/01_umask.2.dpatch
+++ b/debian/patches/15-umask.2.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_umask.2.dpatch.dpatch by <j...@computer.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Umask patch: incorrect translation of the mode in the example
+From: Javier Fernandez-Sanguino <j...@computer.org>
+Subject: Umask patch: incorrect translation of the mode in the example
-@DPATCH@
diff -Nru man-pages-es-1.55.orig/man2/umask.2 manpages-es-1.55/man2/umask.2
--- man-pages-es-1.55.orig/man2/umask.2 2004-07-14 13:21:41.000000000 +0200
diff --git a/debian/patches/01_crypt.3.dpatch b/debian/patches/20-crypt.3.patch
similarity index 76%
rename from debian/patches/01_crypt.3.dpatch
rename to debian/patches/20-crypt.3.patch
index 54f4380..57500c1 100644
--- a/debian/patches/01_crypt.3.dpatch
+++ b/debian/patches/20-crypt.3.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_crypt.3.dpatch.dpatch by <j...@computer.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Crypt3 patch: incorrect translation of 'the lower 7 bits'
+From: Javier Fernandez-Sanguino <j...@computer.org>
+Subject: Crypt3 patch: incorrect translation of 'the lower 7 bits'
-@DPATCH@
diff -Nru man-pages-es-1.55.orig/man2/umask.2 manpages-es-1.55/man2/umask.2
diff -Nru man-pages-es-1.55.orig/man3/crypt.3 manpages-es-1.55/man3/crypt.3
diff --git a/debian/patches/25-getenv.3.patch b/debian/patches/25-getenv.3.patch
new file mode 100644
index 0000000..165d5be
--- /dev/null
+++ b/debian/patches/25-getenv.3.patch
@@ -0,0 +1,16 @@
+From: Rubén Porras Campo <na...@inicia.es>
+Subject: New patch generated from manpages-es 1.28-13 diff.gz
+
+
+---
+ man3/getenv.3 | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/man3/getenv.3
++++ b/man3/getenv.3
+@@ -52,4 +52,4 @@
+ .BR setenv (3),
+ .BR clearenv (3),
+ .BR unsetenv (3),
+-.BR environ (5)
++.BR environ (7)
diff --git a/debian/patches/30-putenv.3.patch b/debian/patches/30-putenv.3.patch
new file mode 100644
index 0000000..7414ced
--- /dev/null
+++ b/debian/patches/30-putenv.3.patch
@@ -0,0 +1,16 @@
+From: Rubén Porras Campo <na...@inicia.es>
+Subject: New patch generated from manpages-es 1.28-13 diff.gz
+
+
+---
+ man3/putenv.3 | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/man3/putenv.3
++++ b/man3/putenv.3
+@@ -95,4 +95,4 @@
+ .BR setenv (3),
+ .BR clearenv (3),
+ .BR unsetenv (3),
+-.BR environ (5)
++.BR environ (7)
diff --git a/debian/patches/35-setenv.3.patch b/debian/patches/35-setenv.3.patch
new file mode 100644
index 0000000..7290083
--- /dev/null
+++ b/debian/patches/35-setenv.3.patch
@@ -0,0 +1,17 @@
+From: Rubén Porras Campo <na...@inicia.es>
+Subject: New patch generated from manpages-es 1.28-13 diff.gz
+
+
+---
+ man3/setenv.3 | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/man3/setenv.3
++++ b/man3/setenv.3
+@@ -57,5 +57,5 @@
+ .BR clearenv (3),
+ .BR getenv (3),
+ .BR putenv (3),
+-.BR environ (5)
++.BR environ (7)
+
diff --git a/debian/patches/01_charsets.4.dpatch b/debian/patches/40-charsets.4.patch
similarity index 97%
rename from debian/patches/01_charsets.4.dpatch
rename to debian/patches/40-charsets.4.patch
index 35d6cc2..185b87f 100644
--- a/debian/patches/01_charsets.4.dpatch
+++ b/debian/patches/40-charsets.4.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_charsets.4.dpatch by Rubén Porras Campo <na...@inicia.es>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: New patch generated from manpages-es 1.28-13 diff.gz
+From: Rubén Porras Campo <na...@inicia.es>
+Subject: New patch generated from manpages-es 1.28-13 diff.gz
-@DPATCH@
--- manpages-es-1.28.orig/man4/charsets.4
+++ manpages-es-1.28/man4/charsets.4
diff --git a/debian/patches/01_fstab.5.dpatch b/debian/patches/45-fstab.5.patch
similarity index 96%
rename from debian/patches/01_fstab.5.dpatch
rename to debian/patches/45-fstab.5.patch
index e30ddab..b9f9bd0 100644
--- a/debian/patches/01_fstab.5.dpatch
+++ b/debian/patches/45-fstab.5.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_fstab.5.dpatch by Rubén Porras Campo <na...@inicia.es>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: New patch generated from manpages-es 1.28-13 diff.gz
+From: Rubén Porras Campo <na...@inicia.es>
+Subject: New patch generated from manpages-es 1.28-13 diff.gz
-@DPATCH@
--- manpages-es-1.28.orig/man5/fstab.5
+++ manpages-es-1.28/man5/fstab.5
diff --git a/debian/patches/01_nsswitch.5.dpatch b/debian/patches/50-nsswitch.5.patch
similarity index 97%
rename from debian/patches/01_nsswitch.5.dpatch
rename to debian/patches/50-nsswitch.5.patch
index de82136..3f8eb33 100644
--- a/debian/patches/01_nsswitch.5.dpatch
+++ b/debian/patches/50-nsswitch.5.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_nsswitch.5.dpatch by Rubén Porras Campo <na...@inicia.es>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: New patch generated from manpages-es 1.28-13 diff.gz
+From: Rubén Porras Campo <na...@inicia.es>
+Subject: New patch generated from manpages-es 1.28-13 diff.gz
-@DPATCH@
--- manpages-es-1.28.orig/man5/nsswitch.5
+++ manpages-es-1.28/man5/nsswitch.5
diff --git a/debian/patches/01_environ.7.dpatch b/debian/patches/55-environ.7.patch
similarity index 96%
rename from debian/patches/01_environ.7.dpatch
rename to debian/patches/55-environ.7.patch
index d7c6d24..3bb0d41 100644
--- a/debian/patches/01_environ.7.dpatch
+++ b/debian/patches/55-environ.7.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_environ.7.dpatch by Rubén Porras Campo <na...@inicia.es>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: New patch generated from manpages-es 1.28-13 diff.gz
+From: Rubén Porras Campo <na...@inicia.es>
+Subject: New patch generated from manpages-es 1.28-13 diff.gz
-@DPATCH@
--- manpages-es-1.28.orig/man7/environ.7
+++ manpages-es-1.28/man7/environ.7
diff --git a/debian/patches/01_undocumented.7.dpatch b/debian/patches/60-undocumented.7.patch
similarity index 93%
rename from debian/patches/01_undocumented.7.dpatch
rename to debian/patches/60-undocumented.7.patch
index 7605d0d..1b89328 100644
--- a/debian/patches/01_undocumented.7.dpatch
+++ b/debian/patches/60-undocumented.7.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_undocumented.7.dpatch by Rubén Porras Campo <na...@inicia.es>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: New patch generated from manpages-es 1.28-13 diff.gz
+From: Rubén Porras Campo <na...@inicia.es>
+Subject: New patch generated from manpages-es 1.28-13 diff.gz
-@DPATCH@
--- manpages-es-1.28.orig/man7/undocumented.7
+++ manpages-es-1.28/man7/undocumented.7
diff --git a/debian/patches/01_Makefile.dpatch b/debian/patches/65-Makefile.patch
similarity index 65%
rename from debian/patches/01_Makefile.dpatch
rename to debian/patches/65-Makefile.patch
index 01a34fa..afc1aca 100644
--- a/debian/patches/01_Makefile.dpatch
+++ b/debian/patches/65-Makefile.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_Makefile.dpatch.dpatch by <j...@computer.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Makefile patch
+From: Javier Fernandez-Sanguino <j...@computer.org>
+Subject: Makefile patch
-@DPATCH@
--- man-pages-es-1.55.orig/Makefile.orig 2005-06-21 10:23:38.000000000 +0200
+++ manpages-es-1.55/Makefile 2005-06-21 10:24:18.000000000 +0200
diff --git a/debian/patches/01_PROYECTO.dpatch b/debian/patches/70-PROYECTO.patch
similarity index 95%
rename from debian/patches/01_PROYECTO.dpatch
rename to debian/patches/70-PROYECTO.patch
index ad3eb25..3862a8d 100644
--- a/debian/patches/01_PROYECTO.dpatch
+++ b/debian/patches/70-PROYECTO.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_PROYECTO.dpatch by Rubén Porras Campo <na...@inicia.es>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: New patch generated from manpages-es 1.28-13 diff.gz
+From: Rubén Porras Campo <na...@inicia.es>
+Subject: New patch generated from manpages-es 1.28-13 diff.gz
-@DPATCH@
--- manpages-es-1.28.orig/PROYECTO
+++ manpages-es-1.28/PROYECTO
diff --git a/debian/patches/10_iso_8859-2.7.utf8.dpatch b/debian/patches/75-iso-8859-2.7.utf8.patch
similarity index 95%
rename from debian/patches/10_iso_8859-2.7.utf8.dpatch
rename to debian/patches/75-iso-8859-2.7.utf8.patch
index b2a8f7f..feb916f 100644
--- a/debian/patches/10_iso_8859-2.7.utf8.dpatch
+++ b/debian/patches/75-iso-8859-2.7.utf8.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 10_iso_8859-2.7.utf8.dpatch by <benn...@tecra.thekeening.homeunix.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Convert iso_8859(7) to utf8.
+From: <benn...@tecra.thekeening.homeunix.org>
+Subject: Convert iso_8859(7) to utf8.
-@DPATCH@
diff -urNad manpages-es-1.55~/man7/iso_8859-2.7 manpages-es-1.55/man7/iso_8859-2.7
--- manpages-es-1.55~/man7/iso_8859-2.7 2007-09-19 22:09:08.000000000 +0200
+++ manpages-es-1.55/man7/iso_8859-2.7 2007-09-19 22:21:42.000000000 +0200
diff --git a/debian/patches/10_map.2.utf8.dpatch b/debian/patches/80-map.2.utf8.patch
similarity index 96%
rename from debian/patches/10_map.2.utf8.dpatch
rename to debian/patches/80-map.2.utf8.patch
index dbb4f8e..f4925a4 100644
--- a/debian/patches/10_map.2.utf8.dpatch
+++ b/debian/patches/80-map.2.utf8.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 10_mmpa.2.utf8.dpatch by <benn...@tecra.thekeening.homeunix.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Convert mmap(2) to utf8.
+From: <benn...@tecra.thekeening.homeunix.org>
+Subject: Convert mmap(2) to utf8.
-@DPATCH@
diff -urNad manpages-es-1.55~/man2/mmap.2 manpages-es-1.55/man2/mmap.2
--- manpages-es-1.55~/man2/mmap.2 2005-03-09 16:29:20.000000000 +0100
+++ manpages-es-1.55/man2/mmap.2 2008-02-14 19:01:48.000000000 +0100
diff --git a/debian/patches/20_do_not_install.dpatch b/debian/patches/85-do-not-install.patch
similarity index 62%
rename from debian/patches/20_do_not_install.dpatch
rename to debian/patches/85-do-not-install.patch
index 2e6b10d..c225025 100644
--- a/debian/patches/20_do_not_install.dpatch
+++ b/debian/patches/85-do-not-install.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 20_do_not_install.dpatch by <bennett@marzo>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Remove outdated manpages that we don't want to install.
+From: <benn...@tecra.thekeening.homeunix.org>
+Subject: Remove outdated manpages that we don't want to install.
-@DPATCH@
diff -urNad manpages-es-1.55~/Makefile manpages-es-1.55/Makefile
--- manpages-es-1.55~/Makefile 2009-03-15 11:43:23.000000000 +0100
+++ manpages-es-1.55/Makefile 2009-03-15 11:53:27.482005540 +0100
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..10a2dbc
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,18 @@
+03-debian-local-changes.patch
+05-remove-passwd.5.patch
+10-bdflush.2.patch
+15-umask.2.patch
+20-crypt.3.patch
+25-getenv.3.patch
+30-putenv.3.patch
+35-setenv.3.patch
+40-charsets.4.patch
+45-fstab.5.patch
+50-nsswitch.5.patch
+55-environ.7.patch
+60-undocumented.7.patch
+65-Makefile.patch
+70-PROYECTO.patch
+75-iso-8859-2.7.utf8.patch
+80-map.2.utf8.patch
+85-do-not-install.patch
diff --git a/debian/rules b/debian/rules
index 71e94c2..65056f9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,13 +1,16 @@
#! /usr/bin/make -f
PACKAGE = manpages-es
-include /usr/share/dpatch/dpatch.make
-build: patch
+
+build-arch: build
+build-indep: build
+
+build:
# Builds the binary package.
# empty
-clean: unpatch
+clean:
# Undoes the effect of `make -f debian/rules build'.
dh_testdir
dh_clean
@@ -36,4 +39,4 @@ binary-indep: build
binary: binary-indep binary-arch
-.PHONY: binary binary-arch binary-indep clean build patch unpatch
+.PHONY: binary binary-arch binary-indep clean build
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
--
1.7.10
--- End Message ---
