[subversion-commit] SVN tetex commit + diffs: r434 - tetex-bin/trunk/debian/patches

Frank Küster frank at costa.debian.org
Wed Dec 28 09:31:04 UTC 2005 

Author: frank
Date: 2005-12-28 09:31:02 +0000 (Wed, 28 Dec 2005)
New Revision: 434

Modified:
   tetex-bin/trunk/debian/patches/patch-poppler
Log:
remove unneeded parts from patch-poppler

Modified: tetex-bin/trunk/debian/patches/patch-poppler
===================================================================
--- tetex-bin/trunk/debian/patches/patch-poppler	2005-12-27 20:25:57 UTC (rev 433)
+++ tetex-bin/trunk/debian/patches/patch-poppler	2005-12-28 09:31:02 UTC (rev 434)
@@ -1,7 +1,7 @@
 Index: tetex-bin-3.0/texk/web2c/pdftexdir/depend.mk
 ===================================================================
---- tetex-bin-3.0.orig/texk/web2c/pdftexdir/depend.mk	2005-12-27 21:02:46.003155592 +0100
-+++ tetex-bin-3.0/texk/web2c/pdftexdir/depend.mk	2005-12-27 21:12:25.167109288 +0100
+--- tetex-bin-3.0.orig/texk/web2c/pdftexdir/depend.mk	2005-12-28 10:27:18.079779192 +0100
++++ tetex-bin-3.0/texk/web2c/pdftexdir/depend.mk	2005-12-28 10:29:17.691595432 +0100
 @@ -1,54 +1,4 @@
 -epdf.o: epdf.c ptexlib.h ../pdftexd.h ../texmfmp.h ../cpascal.h \
 - ../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h ptexmac.h
@@ -63,8 +63,8 @@
 +pdftosrc.o: pdftosrc.cc
 Index: tetex-bin-3.0/texk/web2c/pdftexdir/pdftoepdf.cc
 ===================================================================
---- tetex-bin-3.0.orig/texk/web2c/pdftexdir/pdftoepdf.cc	2005-12-27 21:02:46.004155440 +0100
-+++ tetex-bin-3.0/texk/web2c/pdftexdir/pdftoepdf.cc	2005-12-27 21:12:25.169108984 +0100
+--- tetex-bin-3.0.orig/texk/web2c/pdftexdir/pdftoepdf.cc	2005-12-28 10:27:18.079779192 +0100
++++ tetex-bin-3.0/texk/web2c/pdftexdir/pdftoepdf.cc	2005-12-28 10:29:17.692595280 +0100
 @@ -26,22 +26,22 @@
  #include <stdio.h>
  #include <string.h>
@@ -142,8 +142,8 @@
              pdftex_fail("pdf inclusion: invalid destination <%s>",
 Index: tetex-bin-3.0/texk/web2c/pdftexdir/pdftosrc.cc
 ===================================================================
---- tetex-bin-3.0.orig/texk/web2c/pdftexdir/pdftosrc.cc	2005-12-27 21:02:46.004155440 +0100
-+++ tetex-bin-3.0/texk/web2c/pdftexdir/pdftosrc.cc	2005-12-27 21:12:25.169108984 +0100
+--- tetex-bin-3.0.orig/texk/web2c/pdftexdir/pdftosrc.cc	2005-12-28 10:27:18.079779192 +0100
++++ tetex-bin-3.0/texk/web2c/pdftexdir/pdftosrc.cc	2005-12-28 10:29:17.692595280 +0100
 @@ -25,21 +25,21 @@
  #include <stdio.h>
  #include <string.h>
@@ -203,8 +203,8 @@
          fprintf(stderr, "Invalid PDF file\n");
 Index: tetex-bin-3.0/configure
 ===================================================================
---- tetex-bin-3.0.orig/configure	2005-12-27 21:12:25.127115368 +0100
-+++ tetex-bin-3.0/configure	2005-12-27 21:12:25.174108224 +0100
+--- tetex-bin-3.0.orig/configure	2005-12-28 10:29:17.611607592 +0100
++++ tetex-bin-3.0/configure	2005-12-28 10:29:17.694594976 +0100
 @@ -3292,9 +3292,9 @@
  
  # we need libxpdf for pdf[ex]tex
@@ -220,8 +220,8 @@
  
 Index: tetex-bin-3.0/configure.in
 ===================================================================
---- tetex-bin-3.0.orig/configure.in	2005-12-27 21:02:46.005155288 +0100
-+++ tetex-bin-3.0/configure.in	2005-12-27 21:12:25.174108224 +0100
+--- tetex-bin-3.0.orig/configure.in	2005-12-28 10:27:18.080779040 +0100
++++ tetex-bin-3.0/configure.in	2005-12-28 10:29:17.694594976 +0100
 @@ -145,9 +145,9 @@
  
  # we need libxpdf for pdf[ex]tex
@@ -237,24 +237,21 @@
  
 Index: tetex-bin-3.0/texk/web2c/pdftexdir/Makefile.in
 ===================================================================
---- tetex-bin-3.0.orig/texk/web2c/pdftexdir/Makefile.in	2005-12-27 21:02:46.004155440 +0100
-+++ tetex-bin-3.0/texk/web2c/pdftexdir/Makefile.in	2005-12-27 21:12:25.175108072 +0100
-@@ -8,8 +8,10 @@
+--- tetex-bin-3.0.orig/texk/web2c/pdftexdir/Makefile.in	2005-12-28 10:27:18.079779192 +0100
++++ tetex-bin-3.0/texk/web2c/pdftexdir/Makefile.in	2005-12-28 10:29:17.694594976 +0100
+@@ -8,7 +8,7 @@
  kpathsea_srcdir_parent = $(srcdir)/../..
  kpathsea_dir_parent = ../..
  
 -ALL_CXXFLAGS = @CXXFLAGS@ @DEFS@ $(XXCFLAGS) -I. -I$(srcdir) -I$(kpathsea_dir_parent) -I$(kpathsea_srcdir_parent) @LIBXPDFCPPFLAGS@
-+#ALL_CXXFLAGS = @CXXFLAGS@ @DEFS@ $(XXCFLAGS) -I. -I$(srcdir) -I$(kpathsea_dir_parent) -I$(kpathsea_srcdir_parent) @LIBXPDFCPPFLAGS@
 +ALL_CXXFLAGS = @CXXFLAGS@ @DEFS@ $(XXCFLAGS) -I. -I$(srcdir) -I$(kpathsea_dir_parent) -I$(kpathsea_srcdir_parent) -I/usr/include/poppler
  CXX = @CXX@
-+LDFLAGS = -lpoppler
  
  .SUFFIXES: .cc .o
- .cc.o:
 Index: tetex-bin-3.0/texk/web2c/pdftexdir/pdftex.mk
 ===================================================================
---- tetex-bin-3.0.orig/texk/web2c/pdftexdir/pdftex.mk	2005-12-27 21:02:46.004155440 +0100
-+++ tetex-bin-3.0/texk/web2c/pdftexdir/pdftex.mk	2005-12-27 21:12:25.175108072 +0100
+--- tetex-bin-3.0.orig/texk/web2c/pdftexdir/pdftex.mk	2005-12-28 10:27:18.079779192 +0100
++++ tetex-bin-3.0/texk/web2c/pdftexdir/pdftex.mk	2005-12-28 10:29:30.065714280 +0100
 @@ -13,6 +13,9 @@
  pdftex_bin = pdftex pdfetex pdfxtex ttf2afm pdftosrc
  linux_build_dir = $(HOME)/pdftex/build/linux/texk/web2c
@@ -265,18 +262,16 @@
  # We build pdftex
  pdftex = @PTEX@ pdftex
  pdftexdir = pdftexdir
-@@ -29,7 +32,9 @@
+@@ -29,7 +32,7 @@
  
  # Making pdftex
  pdftex: $(pdftex_o) $(pdftexextra_o) $(pdftexlibsdep)
 -	@CXXHACKLINK@ $(pdftex_o) $(pdftexextra_o) $(pdftexlibs) $(socketlibs) @CXXHACKLDLIBS@ @CXXLDEXTRA@
-+	echo $(ADDLDFLAGS)
-+	echo jezt: $(ADDLDFLAGS) @CXXHACKLINK@ $(pdftex_o) $(pdftexextra_o) $(pdftexlibs) $(socketlibs) @CXXHACKLDLIBS@ @CXXLDEXTRA@
 +	@CXXHACKLINK@ $(pdftex_o) $(pdftexextra_o) $(pdftexlibs) $(socketlibs) @CXXHACKLDLIBS@ @CXXLDEXTRA@ $(ADDLDFLAGS)
  
  # C file dependencies.
  $(pdftex_c) pdftexcoerce.h pdftexd.h: pdftex.p $(web2c_texmf)
-@@ -153,7 +158,7 @@
+@@ -153,7 +156,7 @@
  pdftosrc = pdftosrc
  
  pdftosrc: pdftexdir/pdftosrc.o $(LIBXPDFDEP)
@@ -287,8 +282,8 @@
  check: pdftosrc-check
 Index: tetex-bin-3.0/texk/web2c/pdfetexdir/pdfetex.mk
 ===================================================================
---- tetex-bin-3.0.orig/texk/web2c/pdfetexdir/pdfetex.mk	2005-12-27 21:02:46.004155440 +0100
-+++ tetex-bin-3.0/texk/web2c/pdfetexdir/pdfetex.mk	2005-12-27 21:12:25.178107616 +0100
+--- tetex-bin-3.0.orig/texk/web2c/pdfetexdir/pdfetex.mk	2005-12-28 10:27:18.079779192 +0100
++++ tetex-bin-3.0/texk/web2c/pdfetexdir/pdfetex.mk	2005-12-28 10:29:17.695594824 +0100
 @@ -8,13 +8,16 @@
  pdfetex = @PETEX@ pdfetex
  pdfetexdir = pdfetexdir
@@ -309,8 +304,8 @@
  $(pdfetex_c) pdfetexcoerce.h pdfetexd.h: pdfetex.p $(web2c_texmf)
 Index: tetex-bin-3.0/texk/web2c/pdfxtexdir/pdfxtex.mk
 ===================================================================
---- tetex-bin-3.0.orig/texk/web2c/pdfxtexdir/pdfxtex.mk	2005-07-20 12:28:14.000000000 +0200
-+++ tetex-bin-3.0/texk/web2c/pdfxtexdir/pdfxtex.mk	2005-12-27 21:13:50.313165120 +0100
+--- tetex-bin-3.0.orig/texk/web2c/pdfxtexdir/pdfxtex.mk	2005-12-28 10:27:18.079779192 +0100
++++ tetex-bin-3.0/texk/web2c/pdfxtexdir/pdfxtex.mk	2005-12-28 10:29:17.695594824 +0100
 @@ -8,13 +8,16 @@
  pdfxtex = @PXTEX@ pdfxtex
  pdfxtexdir = pdfxtexdir

More information about the Pkg-tetex-commits mailing list