tag 713496 + patch pending
thanks
On Tue, Jun 25, 2013 at 05:30:23PM +0200, Agustin Martin wrote:
> 2013/6/22 Lucas Nussbaum <lu...@lucas-nussbaum.net>:
> >> Transcript written on larm0900.log.
> >> mktextfm: /tmp/texfonts/tfm/lh/lh-t2a/larm0900.tfm: successfully generated.
> >> make[3]: *** [alphabets-doc.pdf] Error 1
> >
> > The full build log is available from:
> >
> > http://aws-logs.debian.net/ftbfs-logs/2013/06/20/xindy_2.4-1.1_unstable.log
> >
>
> I have done some preliminary checks and this seems caused by missing
> no longer automatically pulled texlive-lang-greek Build-Dependency.
> Will test further and if everything works will upload a NMU with this
> change unless maintainer speaks first.
>
> Since I also prepared previous NMU, if I do not hear from maintainer I
> may look at some of the other lintian warnings. There is also the use
> of obsolete dpatch, but I'd really prefer hearing from maintainer
> first about this particular issue.
Seems things are working. If no one complains, I plan to upload a 0-day
NMU tomorrow. git commits to my personal repo are attached.
Regards,
--
Agustin
>From cd5a5087620225fe66fd9bdec4f963e18b6b4ad4 Mon Sep 17 00:00:00 2001
From: Agustin Martin Domingo <agmar...@debian.org>
Date: Tue, 25 Jun 2013 17:42:12 +0200
Subject: [PATCH 1/7] control: Add texlive-lang-greek build-dep. (#713496).
Seems no longer pulled automatically by TeXLive (Closes: #713496).
---
debian/changelog | 9 +++++++++
debian/control | 3 ++-
2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index 917351d..2b86eb7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+xindy (2.4-1.2) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * debian/control:
+ - Add texlive-lang-greek build dependency. Seems no longer
+ pulled automatically by TeXLive (Closes: #713496).
+
+ -- Agustin Martin Domingo <agmar...@debian.org> Tue, 25 Jun 2013 17:35:32 +0200
+
xindy (2.4-1.1) unstable; urgency=low
* Non-maintainer upload.
diff --git a/debian/control b/debian/control
index da68522..5d91982 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,8 @@ Source: xindy
Section: text
Priority: optional
Maintainer: Jörg Sommer <jo...@alea.gnuu.de>
-Build-Depends-Indep: texlive-latex-base, texlive-lang-cyrillic,
+Build-Depends-Indep: texlive-latex-base,
+ texlive-lang-cyrillic, texlive-lang-greek,
texlive-latex-recommended, cm-super
Build-Depends: debhelper (>= 5), dpatch, autotools-dev, flex, clisp (>> 0.49)
Standards-Version: 3.9.1
--
1.8.3.1
>From 09078404f549871a07b59baed70e81180ebfd837 Mon Sep 17 00:00:00 2001
From: Agustin Martin Domingo <agmar...@debian.org>
Date: Tue, 25 Jun 2013 17:58:26 +0200
Subject: [PATCH 2/7] debian/control: Bump Standards Version. No changes
needed.
---
debian/changelog | 1 +
debian/control | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index 2b86eb7..4230165 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ xindy (2.4-1.2) unstable; urgency=low
* debian/control:
- Add texlive-lang-greek build dependency. Seems no longer
pulled automatically by TeXLive (Closes: #713496).
+ - Bump Standards Version. No changes needed.
-- Agustin Martin Domingo <agmar...@debian.org> Tue, 25 Jun 2013 17:35:32 +0200
diff --git a/debian/control b/debian/control
index 5d91982..25863be 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Build-Depends-Indep: texlive-latex-base,
texlive-lang-cyrillic, texlive-lang-greek,
texlive-latex-recommended, cm-super
Build-Depends: debhelper (>= 5), dpatch, autotools-dev, flex, clisp (>> 0.49)
-Standards-Version: 3.9.1
+Standards-Version: 3.9.4
Homepage: http://www.xindy.org/
Vcs-Browser: http://git.debian.org/?p=users/jo-guest/xindy.git
Vcs-Git: git://git.debian.org/~jo-guest/xindy.git
--
1.8.3.1
>From 5d26d4d2b48b99f345ab5890fd8f96a6471b3d83 Mon Sep 17 00:00:00 2001
From: Agustin Martin Domingo <agmar...@debian.org>
Date: Tue, 25 Jun 2013 18:01:30 +0200
Subject: [PATCH 3/7] debian/control: Use recommended URI for git anonymous
access (lintian vcs-git-uses-invalid-user-uri).
---
debian/changelog | 2 ++
debian/control | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index 4230165..57ee796 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ xindy (2.4-1.2) unstable; urgency=low
- Add texlive-lang-greek build dependency. Seems no longer
pulled automatically by TeXLive (Closes: #713496).
- Bump Standards Version. No changes needed.
+ - (lintian vcs-git-uses-invalid-user-uri): Use recommended URI for git
+ anonymous access.
-- Agustin Martin Domingo <agmar...@debian.org> Tue, 25 Jun 2013 17:35:32 +0200
diff --git a/debian/control b/debian/control
index 25863be..99663e3 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 5), dpatch, autotools-dev, flex, clisp (>> 0.49)
Standards-Version: 3.9.4
Homepage: http://www.xindy.org/
Vcs-Browser: http://git.debian.org/?p=users/jo-guest/xindy.git
-Vcs-Git: git://git.debian.org/~jo-guest/xindy.git
+Vcs-Git: git://anonscm.debian.org/users/jo-guest/xindy.git
DM-Upload-Allowed: yes
Package: xindy
--
1.8.3.1
>From 82959d99252ebf18f7183125cf5c5fa57d3665c8 Mon Sep 17 00:00:00 2001
From: Agustin Martin Domingo <agmar...@debian.org>
Date: Wed, 26 Jun 2013 15:24:27 +0200
Subject: [PATCH 4/7] debian/control: Remove obsolete "DM-Upload-Allowed" field
(lintian dm-upload-allowed-is-obsolete).
---
debian/changelog | 3 ++-
debian/control | 1 -
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 57ee796..f6e978f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ xindy (2.4-1.2) unstable; urgency=low
- Bump Standards Version. No changes needed.
- (lintian vcs-git-uses-invalid-user-uri): Use recommended URI for git
anonymous access.
+ - (lintian dm-upload-allowed-is-obsolete): Remove obsolete
+ "DM-Upload-Allowed" field.
-- Agustin Martin Domingo <agmar...@debian.org> Tue, 25 Jun 2013 17:35:32 +0200
@@ -203,4 +205,3 @@ xindy (2.2~beta2-1) unstable; urgency=low
* Upload is sponsored by Norbert Preining
-- Jörg Sommer <jo...@alea.gnuu.de> Tue, 27 Feb 2007 15:06:56 +0100
-
diff --git a/debian/control b/debian/control
index 99663e3..45f240b 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,6 @@ Standards-Version: 3.9.4
Homepage: http://www.xindy.org/
Vcs-Browser: http://git.debian.org/?p=users/jo-guest/xindy.git
Vcs-Git: git://anonscm.debian.org/users/jo-guest/xindy.git
-DM-Upload-Allowed: yes
Package: xindy
Architecture: any
--
1.8.3.1
>From 9ea3410fe99e5d1aedbd8fbb2d6405cdcdaacbb4 Mon Sep 17 00:00:00 2001
From: Agustin Martin Domingo <agmar...@debian.org>
Date: Wed, 26 Jun 2013 17:58:26 +0200
Subject: [PATCH 5/7] debian/xindy-rules.docs: Do not install NEWS. It is
installed as changelog by debian/rules.
---
debian/changelog | 2 ++
debian/xindy-rules.docs | 1 -
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index f6e978f..444dd59 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ xindy (2.4-1.2) unstable; urgency=low
anonymous access.
- (lintian dm-upload-allowed-is-obsolete): Remove obsolete
"DM-Upload-Allowed" field.
+ * debian/xindy-rules.docs: Do not install NEWS. It is installed as
+ changelog by debian/rules.
-- Agustin Martin Domingo <agmar...@debian.org> Tue, 25 Jun 2013 17:35:32 +0200
diff --git a/debian/xindy-rules.docs b/debian/xindy-rules.docs
index 50bd824..e845566 100644
--- a/debian/xindy-rules.docs
+++ b/debian/xindy-rules.docs
@@ -1,2 +1 @@
-NEWS
README
--
1.8.3.1
>From 6216a96583ead0d8de5506a0b1b87e467d5e91d9 Mon Sep 17 00:00:00 2001
From: Agustin Martin Domingo <agmar...@debian.org>
Date: Wed, 26 Jun 2013 18:09:57 +0200
Subject: [PATCH 6/7] debian/rules: Use hardened build-flags.
---
debian/changelog | 1 +
debian/rules | 12 ++++--------
2 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 444dd59..5e3531e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ xindy (2.4-1.2) unstable; urgency=low
"DM-Upload-Allowed" field.
* debian/xindy-rules.docs: Do not install NEWS. It is installed as
changelog by debian/rules.
+ * debian/rules: Use hardened build-flags.
-- Agustin Martin Domingo <agmar...@debian.org> Tue, 25 Jun 2013 17:35:32 +0200
diff --git a/debian/rules b/debian/rules
index 3af806c..e183f21 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,15 +11,11 @@ include /usr/share/dpatch/dpatch.make
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-CFLAGS += -Wall -g
+CPPFLAGS :=$(shell dpkg-buildflags --get CPPFLAGS)
+CFLAGS :=$(shell dpkg-buildflags --get CFLAGS)
+LDFLAGS :=$(shell dpkg-buildflags --get LDFLAGS) -Wl,-z,defs
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O0
-else
- CFLAGS += -O2
-endif
-
-configure_flags = LDFLAGS="$(LDFLAGS) -Wl,-z,defs" CFLAGS="$(CFLAGS)" \
+configure_flags = LDFLAGS="$(LDFLAGS)" CFLAGS="$(CFLAGS)" CPPFLAGS=$(CPPFLAGS)\
--host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr \
--mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info \
--docdir=\$${prefix}/share/doc/xindy-rules
--
1.8.3.1
>From c77fc4c3b7af1de32d6be68a3e62c8f0e2953817 Mon Sep 17 00:00:00 2001
From: Agustin Martin Domingo <agmar...@debian.org>
Date: Wed, 26 Jun 2013 18:25:39 +0200
Subject: [PATCH 7/7] debian/changelog: Mark (LP: #871588) and (LP: #939545) as
fixed in Ubuntu launchpad.
---
debian/changelog | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index 5e3531e..c82603f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,8 +12,11 @@ xindy (2.4-1.2) unstable; urgency=low
* debian/xindy-rules.docs: Do not install NEWS. It is installed as
changelog by debian/rules.
* debian/rules: Use hardened build-flags.
+ * Be kind to Ubuntu launchpad: These were fixed in fixed in 2.4-1.1 NMU
+ - (LP: #871588).
+ - (LP: #939545).
- -- Agustin Martin Domingo <agmar...@debian.org> Tue, 25 Jun 2013 17:35:32 +0200
+ -- Agustin Martin Domingo <agmar...@debian.org> Wed, 26 Jun 2013 18:25:19 +0200
xindy (2.4-1.1) unstable; urgency=low
--
1.8.3.1
