[Reproducible-commits] [texlive-bin] 45/400: pathc for #664074

[Maria Valentina Marin Rodrigues]

This is an automated email from the git hooks/post-receive script.

akira-guest pushed a commit to branch master
in repository texlive-bin.

commit 520f5f4b7038618d2076740cec122d91c0662f94
Author: Hilmar Preusse <hilmar-guest at alioth.debian.org>
Date:   Tue Mar 20 22:31:30 2012 +0000

    pathc for #664074
---
 debian/changelog                   |  2 ++
 debian/patches/60_unneeded_linking | 37 +++++++++++++++++++++++--------------
 debian/patches/series              |  2 +-
 3 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 895d97a..9256036 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ texlive-bin (2011.2012XXXXX-00000) experimental; urgency=low
 
   [ Hilmar Preuße ]
   * Do not declare an versioned B-D for g++ on armel, reapplied
+  * we still need 60_unneeded_linking (new version based on am files)
+    (Closes: #664074)
 
  -- Norbert Preining <preining at debian.org>  Wed, 14 Mar 2012 18:06:53 +0900
 
diff --git a/debian/patches/60_unneeded_linking b/debian/patches/60_unneeded_linking
index a0d129e..e74c486 100644
--- a/debian/patches/60_unneeded_linking
+++ b/debian/patches/60_unneeded_linking
@@ -1,17 +1,26 @@
----
- texk/xdvik/Makefile.in |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: texlive-bin-2011.20120216/texk/xdvik/Makefile.in
-===================================================================
---- texlive-bin-2011.20120216.orig/texk/xdvik/Makefile.in	2012-02-03 00:59:11.000000000 +0900
-+++ texlive-bin-2011.20120216/texk/xdvik/Makefile.in	2012-02-17 10:50:18.606731857 +0900
-@@ -387,7 +387,7 @@
+diff -urN texlive-bin-2011.20120307.orig/texk/web2c/am/texmf.am texlive-bin-2011.20120307/texk/web2c/am/texmf.am
+--- texlive-bin-2011.20120307.orig/texk/web2c/am/texmf.am	2011-10-04 17:41:38.000000000 +0200
++++ texlive-bin-2011.20120307/texk/web2c/am/texmf.am	2012-03-19 23:23:22.839876903 +0100
+@@ -139,7 +139,7 @@
+ # All the x_... and X_... variables will be empty if we aren't supporting X.
+ # Follow the library order used in X11R6 itself:
+ #   -lXaw -lXmu -lXt -lSM -lICE -lXext -lX11 (some may not be present).
+-mf_x_libs = $(X_LIBS) $(x_tool_libs) $(X_PRE_LIBS) $(x_ext_lib) $(wlibs) $(X_EXTRA_LIBS)
++mf_x_libs = $(X_LIBS) $(x_tool_libs) $(wlibs) $(X_EXTRA_LIBS)
+ endif !WIN32
+ 
+ ## mf and mf-nowin compile mfextra.c with different CPPFLAGS.
+diff -urN texlive-bin-2011.20120307.orig/texk/xdvik/common.am texlive-bin-2011.20120307/texk/xdvik/common.am
+--- texlive-bin-2011.20120307.orig/texk/xdvik/common.am	2009-04-27 17:51:44.000000000 +0200
++++ texlive-bin-2011.20120307/texk/xdvik/common.am	2012-03-19 23:25:26.679879578 +0100
+@@ -16,8 +16,8 @@
+ ## libXmu needs to come before Xt and after the toolkit libs.
  x_ldflags = $(X_LIBS) $(x_linker_options) $(iconv_libpath)
  x_extra_libs = $(X_EXTRA_LIBS) $(iconv_libs)
- xdvi_x_libs = $(x_ldflags) $(x_tool_libs) $(x_xmu_lib) -lXt \
--	$(X_PRE_LIBS) $(x_ext_lib) $(x_xpm_libs) -lX11 $(x_extra_libs)
-+	$(x_xpm_libs) -lX11 $(x_extra_libs)
+-xdvi_x_libs = $(x_ldflags) $(x_tool_libs) $(x_xmu_lib) -lXt $(X_PRE_LIBS)
+-xdvi_x_libs += $(x_ext_lib) $(x_xpm_libs) -lX11 $(x_extra_libs)
++xdvi_x_libs = $(x_ldflags) $(x_tool_libs) $(x_xmu_lib) -lXt
++xdvi_x_libs += $(x_xpm_libs) -lX11 $(x_extra_libs)
+ 
  common_ldadd = $(KPATHSEA_LIBS) $(T1LIB_LIBS) $(xdvi_x_libs)
- common_dependencies = $(KPATHSEA_DEPEND) $(T1LIB_DEPEND)
- libxdvi_dependencies = ${top_srcdir}/*.[ch] ${top_srcdir}/gui/*.[ch] ${top_builddir}/psheader.c
+ 
diff --git a/debian/patches/series b/debian/patches/series
index e336743..ec1448a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -25,7 +25,6 @@
 57_texconfig_papersizes_for_upstream
 58_texconfig_papersizes_use_ucf
 set-e-in-various-scripts
-#replaced by --as-needed for dh_autoreconf#60_unneeded_linking
 #2011# disabled - do we need to fix that???# libpoppler-0.12
 #2011# disabled not applicable, still necessary? # icu-xetex_hurd.diff
 #2011# upstream included # fix-mpost-segfault
@@ -42,3 +41,4 @@ xdvik-22.84.16-open-mode.patch
 #2011# not necessary anymore, different fix upstream # unstymie-xetex-with-zlib-1.2.6.patch
 debian-no-linked-scripts
 build-wovp2ovf
+60_unneeded_linking

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/texlive-bin.git