Bug#562394: gprolog: NMU diff for 1.3.0-6.1

2010-03-25 Thread jari . aalto

Dear maintainer,

Here is the NMU diff according to DevRef 5.11.1[1][2] for RC bug: #562394.
See the debian/patches directory for the important fixes. Feel free to
contact if you have any questions.

Thank you for maintaining the package,
Jari Aalto

[1] http://www.debian.org/doc/developers-reference/pkgs.html#nmu
[2] http://dep.debian.net/deps/dep1.html

lsdiff(1) of changes:

a/debian/changelog
b/debian/patches/10-latex-fix.patch
b/debian/patches/series
b/debian/source/format

 debian/changelog  |   15 
 debian/patches/10-latex-fix.patch |   68 +
 debian/patches/series |1 +
 debian/source/format  |1 +
 4 files changed, 85 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c0195bb..d740f48 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+gprolog (1.3.0-6.1) unstable; urgency=low
+
+  [Jari Aalto]
+  * Non-maintainer upload.
+- Move to packaging format 3.0 (quilt) due to patch.
+  * debian/patches
+- (Number 10): Add patch to fix latex error. Patch thanks to Ilya
+  Barygin bary...@gmail.com
+  https://launchpad.net/ubuntu/+source/gprolog/1.3.0-6ubuntu1
+  (RC bug FTBFS serious; Closes: #562394).
+  * debian/source/format
+- New file.
+
+ -- Jari Aalto jari.aa...@cante.net  Wed, 17 Mar 2010 00:53:43 +0200
+
 gprolog (1.3.0-6) unstable; urgency=low
 
   * revert to regular gcc: 4.2 (closes: #463289)
diff --git a/debian/patches/10-latex-fix.patch b/debian/patches/10-latex-fix.patch
new file mode 100644
index 000..1215e0d
--- /dev/null
+++ b/debian/patches/10-latex-fix.patch
@@ -0,0 +1,68 @@
+From 2e6e123c3289f55370072c7fe3f9e11402fe0006 Mon Sep 17 00:00:00 2001
+From: Jari Aalto jari.aa...@cante.net
+Date: Wed, 17 Mar 2010 00:55:58 +0200
+Subject: [PATCH] rename 'pdf' variable to 'pdfgprolog' by Ilya Barygin bary...@gmail.com
+Organization: Private
+Content-Type: text/plain; charset=utf-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Jari Aalto jari.aa...@cante.net
+---
+ doc/macros.tex   |4 ++--
+ doc/packages.tex |   10 +-
+ 2 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/doc/macros.tex b/doc/macros.tex
+index ebf774f..3fa342d 100644
+--- a/doc/macros.tex
 b/doc/macros.tex
+@@ -81,7 +81,7 @@
+ 
+ % Url in LaTeX output
+ 
+-\ifpdf
++\ifpdfgprolog
+ \newcommand{\Tilde}[1]{~#1}
+ \newcommand{\MyUrl}[2]{\href{#1}{#2}}
+ \newcommand{\MyUrlHtml}[2]{\href{#1}{#2}}
+@@ -237,7 +237,7 @@
+ 
+ 
+% |textbf does not seem to work with hyperref (pdflatex)... remove it
+-\ifpdf
++\ifpdfgprolog
+ 	\newcommand{\IndexBold}[1]{\index{#1}}
+ \else
+ 	\newcommand{\IndexBold}[1]{\index{#1|textbf}}
+diff --git a/doc/packages.tex b/doc/packages.tex
+index 749cd32..96c01f1 100644
+--- a/doc/packages.tex
 b/doc/packages.tex
+@@ -1,11 +1,11 @@
+-\newif\ifpdf
++\newif\ifpdfgprolog
+ \ifx\pdfoutput\undefined
+-   \pdffalse % we are not running PDFLaTeX
++   \pdfgprologfalse % we are not running PDFLaTeX
+ \else 
+\ifnum\pdfoutput=0
+-  \pdffalse  % we are not running PDFLaTeX
++  \pdfgprologfalse  % we are not running PDFLaTeX
+\else
+-  \pdfoutput=1 \pdftrue  % we are running PDFLaTeX
++  \pdfoutput=1 \pdfgprologtrue  % we are running PDFLaTeX
+\fi
+ \fi
+ 
+@@ -19,7 +19,7 @@
+ \usepackage{makeidx}
+ \usepackage{ifthen}
+ \usepackage{fancyhdr}
+-\ifpdf
++\ifpdfgprolog
+ 	\usepackage[pdftex]{graphicx}
+ 	\usepackage[pdftex=true]{hyperref}
+ 	\hypersetup{%
+-- 
+1.7.0
+
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 000..4407379
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+10-latex-fix.patch
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)


Bug#562394: gprolog: NMU diff for 1.3.0-6.1

2010-03-25 Thread Salvador Abreu
thanks a lot; I'll use it in the next release.

regards
Salvador

On Mar 25, 2010, at 18:12, jari.aa...@cante.net wrote:

 
 Dear maintainer,
 
 Here is the NMU diff according to DevRef 5.11.1[1][2] for RC bug: #562394.
 See the debian/patches directory for the important fixes. Feel free to
 contact if you have any questions.
 
 Thank you for maintaining the package,
 Jari Aalto
 
 [1] http://www.debian.org/doc/developers-reference/pkgs.html#nmu
 [2] http://dep.debian.net/deps/dep1.html
 
 lsdiff(1) of changes:
 
a/debian/changelog
b/debian/patches/10-latex-fix.patch
b/debian/patches/series
b/debian/source/format
 
 debian/changelog  |   15 
 debian/patches/10-latex-fix.patch |   68 +
 debian/patches/series |1 +
 debian/source/format  |1 +
 4 files changed, 85 insertions(+), 0 deletions(-)
 
 diff --git a/debian/changelog b/debian/changelog
 index c0195bb..d740f48 100644
 --- a/debian/changelog
 +++ b/debian/changelog
 @@ -1,3 +1,18 @@
 +gprolog (1.3.0-6.1) unstable; urgency=low
 +
 +  [Jari Aalto]
 +  * Non-maintainer upload.
 +- Move to packaging format 3.0 (quilt) due to patch.
 +  * debian/patches
 +- (Number 10): Add patch to fix latex error. Patch thanks to Ilya
 +  Barygin bary...@gmail.com
 +  https://launchpad.net/ubuntu/+source/gprolog/1.3.0-6ubuntu1
 +  (RC bug FTBFS serious; Closes: #562394).
 +  * debian/source/format
 +- New file.
 +
 + -- Jari Aalto jari.aa...@cante.net  Wed, 17 Mar 2010 00:53:43 +0200
 +
 gprolog (1.3.0-6) unstable; urgency=low
 
   * revert to regular gcc: 4.2 (closes: #463289)
 diff --git a/debian/patches/10-latex-fix.patch 
 b/debian/patches/10-latex-fix.patch
 new file mode 100644
 index 000..1215e0d
 --- /dev/null
 +++ b/debian/patches/10-latex-fix.patch
 @@ -0,0 +1,68 @@
 +From 2e6e123c3289f55370072c7fe3f9e11402fe0006 Mon Sep 17 00:00:00 2001
 +From: Jari Aalto jari.aa...@cante.net
 +Date: Wed, 17 Mar 2010 00:55:58 +0200
 +Subject: [PATCH] rename 'pdf' variable to 'pdfgprolog' by Ilya Barygin 
 bary...@gmail.com
 +Organization: Private
 +Content-Type: text/plain; charset=utf-8
 +Content-Transfer-Encoding: 8bit
 +
 +Signed-off-by: Jari Aalto jari.aa...@cante.net
 +---
 + doc/macros.tex   |4 ++--
 + doc/packages.tex |   10 +-
 + 2 files changed, 7 insertions(+), 7 deletions(-)
 +
 +diff --git a/doc/macros.tex b/doc/macros.tex
 +index ebf774f..3fa342d 100644
 +--- a/doc/macros.tex
  b/doc/macros.tex
 +@@ -81,7 +81,7 @@
 + 
 + % Url in LaTeX output
 + 
 +-\ifpdf
 ++\ifpdfgprolog
 + \newcommand{\Tilde}[1]{~#1}
 + \newcommand{\MyUrl}[2]{\href{#1}{#2}}
 + \newcommand{\MyUrlHtml}[2]{\href{#1}{#2}}
 +@@ -237,7 +237,7 @@
 + 
 + 
 +% |textbf does not seem to work with hyperref (pdflatex)... remove it
 +-\ifpdf
 ++\ifpdfgprolog
 + \newcommand{\IndexBold}[1]{\index{#1}}
 + \else
 + \newcommand{\IndexBold}[1]{\index{#1|textbf}}
 +diff --git a/doc/packages.tex b/doc/packages.tex
 +index 749cd32..96c01f1 100644
 +--- a/doc/packages.tex
  b/doc/packages.tex
 +@@ -1,11 +1,11 @@
 +-\newif\ifpdf
 ++\newif\ifpdfgprolog
 + \ifx\pdfoutput\undefined
 +-   \pdffalse % we are not running PDFLaTeX
 ++   \pdfgprologfalse % we are not running PDFLaTeX
 + \else 
 +\ifnum\pdfoutput=0
 +-  \pdffalse  % we are not running PDFLaTeX
 ++  \pdfgprologfalse  % we are not running PDFLaTeX
 +\else
 +-  \pdfoutput=1 \pdftrue  % we are running PDFLaTeX
 ++  \pdfoutput=1 \pdfgprologtrue  % we are running PDFLaTeX
 +\fi
 + \fi
 + 
 +@@ -19,7 +19,7 @@
 + \usepackage{makeidx}
 + \usepackage{ifthen}
 + \usepackage{fancyhdr}
 +-\ifpdf
 ++\ifpdfgprolog
 + \usepackage[pdftex]{graphicx}
 + \usepackage[pdftex=true]{hyperref}
 + \hypersetup{%
 +-- 
 +1.7.0
 +
 diff --git a/debian/patches/series b/debian/patches/series
 new file mode 100644
 index 000..4407379
 --- /dev/null
 +++ b/debian/patches/series
 @@ -0,0 +1 @@
 +10-latex-fix.patch
 diff --git a/debian/source/format b/debian/source/format
 new file mode 100644
 index 000..163aaf8
 --- /dev/null
 +++ b/debian/source/format
 @@ -0,0 +1 @@
 +3.0 (quilt)

--
Salvador Abreu
s...@debian.org





--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org