Author: frank
Date: 2005-12-27 20:23:45 +0000 (Tue, 27 Dec 2005)
New Revision: 432
Modified:
tetex-bin/trunk/debian/changelog
tetex-bin/trunk/debian/common.functions.in
tetex-bin/trunk/debian/patches/patch-poppler
tetex-bin/trunk/debian/po/sv.po
tetex-bin/trunk/debian/rules
tetex-bin/trunk/debian/rules.in
Log:
- fix for patch-poppler to prevent unneeded linking, this is also in rules(.in)
- propagate changes from tex-common (common.functions.in)
- ran debconf-updatepo => english changes to sv.po
Modified: tetex-bin/trunk/debian/changelog
===================================================================
--- tetex-bin/trunk/debian/changelog 2005-12-27 08:26:37 UTC (rev 431)
+++ tetex-bin/trunk/debian/changelog 2005-12-27 20:23:45 UTC (rev 432)
@@ -13,8 +13,10 @@
* Translations:
- Added Swedish debconf translation, thanks to Daniel Nylander
<[EMAIL PROTECTED]> (closes: #343741) [frank]
+ * Fix patch-poppler: Accidently all binaries where linked against
+ libpoppler and everything it links to (closes: #344912) [frank]
- -- Frank Küster <[EMAIL PROTECTED]> Tue, 27 Dec 2005 09:26:57 +0100
+ -- Frank Küster <[EMAIL PROTECTED]> Tue, 27 Dec 2005 21:21:00 +0100
tetex-bin (3.0-12) unstable; urgency=low
Modified: tetex-bin/trunk/debian/common.functions.in
===================================================================
--- tetex-bin/trunk/debian/common.functions.in 2005-12-27 08:26:37 UTC (rev
431)
+++ tetex-bin/trunk/debian/common.functions.in 2005-12-27 20:23:45 UTC (rev
432)
@@ -6,7 +6,7 @@
# $Id$
# internal variables for common.functions
-MKTMPDIR=/tmp
+: ${MKTMPDIR:=/tmp}
SYMLINK_MOVE_EXT=<:=$SYMLINK_MOVE_EXT:>
TEXMFSYSVAR=<:=$TEXMFSYSVAR:>
@@ -293,6 +293,7 @@
/etc/texmf/dvips/config.gsftopk e02bc7dd315e819e349c52191837975a
/etc/texmf/modes.mf 17886f0a39f023a1830538073a743047
/etc/texmf/pdftex/context/il2-ams-cmr.map cc471142a76445139def6ad5b5202ad4
+ /etc/texmf/map/dvips/context/il2-ams-cmr.map cc471142a76445139def6ad5b5202ad4
/etc/texmf/pdftex/context/original-adobe-euro.map
ee2826182cf6f1b95890e8b7d0fc9633
/etc/texmf/pdftex/context/original-ams-cmr.map
5912f95748bc1917f14632e48cc223ac
/etc/texmf/pdftex/context/original-ams-euler.map
878c01a7de86554eb41ff74a0b752f5f
@@ -301,6 +302,7 @@
/etc/texmf/pdftex/context/original-youngryu-px.map
b17cc8cb081cb34cbff9e197c1e97512
/etc/texmf/pdftex/context/original-youngryu-tx.map
229dbd1882f3378c4dd21e353489f03a
/etc/texmf/pdftex/context/pl0-ams-cmr.map 0bf5e38fde2a67bb4df7cdb11e499175
+ /etc/texmf/map/dvips/context/pl0-ams-cmr.map 0bf5e38fde2a67bb4df7cdb11e499175
/etc/texmf/pdftex/cmttf.map 6b87723795683cdcfd846c2d8d60cb3e
/etc/texmf/pdftex/pdftex.cfg 8d08d2723661c86cd45e4a1408a5f923
/etc/texmf/latex/color.cfg d77957eef96e7e9a4bdc3d1d24a49df3
Modified: tetex-bin/trunk/debian/patches/patch-poppler
===================================================================
--- tetex-bin/trunk/debian/patches/patch-poppler 2005-12-27 08:26:37 UTC
(rev 431)
+++ tetex-bin/trunk/debian/patches/patch-poppler 2005-12-27 20:23:45 UTC
(rev 432)
@@ -1,7 +1,7 @@
-Index: tetex-bin/texk/web2c/pdftexdir/depend.mk
+Index: tetex-bin-3.0/texk/web2c/pdftexdir/depend.mk
===================================================================
---- tetex-bin.orig/texk/web2c/pdftexdir/depend.mk 2005-12-15
17:16:58.000000000 +0000
-+++ tetex-bin/texk/web2c/pdftexdir/depend.mk 2005-12-15 17:55:11.000000000
+0000
+--- 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
@@ -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
@@ -61,10 +61,10 @@
+ ../../kpathsea/c-proto.h ../../web2c/c-auto.h ../../web2c/config.h \
+ ../../kpathsea/c-fopen.h ../../web2c/pdftexdir/ptexmac.h
+pdftosrc.o: pdftosrc.cc
-Index: tetex-bin/texk/web2c/pdftexdir/pdftoepdf.cc
+Index: tetex-bin-3.0/texk/web2c/pdftexdir/pdftoepdf.cc
===================================================================
---- tetex-bin.orig/texk/web2c/pdftexdir/pdftoepdf.cc 2005-12-15
17:16:58.000000000 +0000
-+++ tetex-bin/texk/web2c/pdftexdir/pdftoepdf.cc 2005-12-15
17:55:11.000000000 +0000
+--- 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
@@ -26,22 +26,22 @@
#include <stdio.h>
#include <string.h>
@@ -140,10 +140,10 @@
LinkDest *link = pdf_doc->doc->findDest(&name);
if (link == 0 || !link->isOk())
pdftex_fail("pdf inclusion: invalid destination <%s>",
-Index: tetex-bin/texk/web2c/pdftexdir/pdftosrc.cc
+Index: tetex-bin-3.0/texk/web2c/pdftexdir/pdftosrc.cc
===================================================================
---- tetex-bin.orig/texk/web2c/pdftexdir/pdftosrc.cc 2005-12-15
17:16:58.000000000 +0000
-+++ tetex-bin/texk/web2c/pdftexdir/pdftosrc.cc 2005-12-15 17:55:11.000000000
+0000
+--- 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
@@ -25,21 +25,21 @@
#include <stdio.h>
#include <string.h>
@@ -201,10 +201,10 @@
doc = new PDFDoc(fileName);
if (!doc->isOk()) {
fprintf(stderr, "Invalid PDF file\n");
-Index: tetex-bin/configure
+Index: tetex-bin-3.0/configure
===================================================================
---- tetex-bin.orig/configure 2005-12-15 17:55:11.000000000 +0000
-+++ tetex-bin/configure 2005-12-15 17:55:11.000000000 +0000
+--- 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
@@ -3292,9 +3292,9 @@
# we need libxpdf for pdf[ex]tex
@@ -218,10 +218,10 @@
: ${needs_libxpdf=no}
export needs_libxpdf
-Index: tetex-bin/configure.in
+Index: tetex-bin-3.0/configure.in
===================================================================
---- tetex-bin.orig/configure.in 2005-12-15 17:16:58.000000000 +0000
-+++ tetex-bin/configure.in 2005-12-15 17:55:11.000000000 +0000
+--- 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
@@ -145,9 +145,9 @@
# we need libxpdf for pdf[ex]tex
@@ -235,3 +235,97 @@
: ${needs_libxpdf=no}
export needs_libxpdf
+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 @@
+ 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
+@@ -13,6 +13,9 @@
+ pdftex_bin = pdftex pdfetex pdfxtex ttf2afm pdftosrc
+ linux_build_dir = $(HOME)/pdftex/build/linux/texk/web2c
+
++# use libpoppler instead of included xpdf code
++ADDLDFLAGS = -lpoppler
++
+ # We build pdftex
+ pdftex = @PTEX@ pdftex
+ pdftexdir = pdftexdir
+@@ -29,7 +32,9 @@
+
+ # 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 @@
+ pdftosrc = pdftosrc
+
+ pdftosrc: pdftexdir/pdftosrc.o $(LIBXPDFDEP)
+- @CXXHACKLINK@ pdftexdir/pdftosrc.o $(LDLIBXPDF) -lm @CXXLDEXTRA@
++ @CXXHACKLINK@ pdftexdir/pdftosrc.o $(LDLIBXPDF) -lm @CXXLDEXTRA@
$(ADDLDFLAGS)
+ pdftexdir/pdftosrc.o:$(srcdir)/pdftexdir/pdftosrc.cc
+ cd pdftexdir && $(MAKE) pdftosrc.o
+ 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
+@@ -8,13 +8,16 @@
+ pdfetex = @PETEX@ pdfetex
+ pdfetexdir = pdfetexdir
+
++# use libpoppler instead of included xpdf code
++ADDLDFLAGS = -lpoppler
++
+ # The C sources.
+ pdfetex_c = pdfetexini.c pdfetex0.c pdfetex1.c pdfetex2.c pdfetex3.c
+ pdfetex_o = pdfetexini.o pdfetex0.o pdfetex1.o pdfetex2.o pdfetex3.o
pdfetexextra.o
+
+ # Making pdfetex
+ pdfetex: pdftexd.h $(pdfetex_o) $(pdfetexextra_o) $(pdftexlibsdep)
+- @CXXHACKLINK@ $(pdfetex_o) $(pdfetexextra_o) $(pdftexlibs)
$(socketlibs) @CXXHACKLDLIBS@ @CXXLDEXTRA@
++ @CXXHACKLINK@ $(pdfetex_o) $(pdfetexextra_o) $(pdftexlibs)
$(socketlibs) @CXXHACKLDLIBS@ @CXXLDEXTRA@ $(ADDLDFLAGS)
+
+ # C file dependencies.
+ $(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
+@@ -8,13 +8,16 @@
+ pdfxtex = @PXTEX@ pdfxtex
+ pdfxtexdir = pdfxtexdir
+
++# use libpoppler instead of included xpdf code
++ADDLDFLAGS = -lpoppler
++
+ # The C sources.
+ pdfxtex_c = pdfxtexini.c pdfxtex0.c pdfxtex1.c pdfxtex2.c pdfxtex3.c
+ pdfxtex_o = pdfxtexini.o pdfxtex0.o pdfxtex1.o pdfxtex2.o pdfxtex3.o
pdfxtexextra.o
+
+ # Making pdfxtex
+ pdfxtex: pdftexd.h $(pdfxtex_o) $(pdfxtexextra_o) $(pdftexlibsdep)
+- @CXXHACKLINK@ $(pdfxtex_o) $(pdfxtexextra_o) $(pdftexlibs)
$(socketlibs) @CXXHACKLDLIBS@ @CXXLDEXTRA@
++ @CXXHACKLINK@ $(pdfxtex_o) $(pdfxtexextra_o) $(pdftexlibs)
$(socketlibs) @CXXHACKLDLIBS@ @CXXLDEXTRA@ $(ADDLDFLAGS)
+
+ # C file dependencies.
+ $(pdfxtex_c) pdfxtexcoerce.h pdfxtexd.h: pdfxtex.p $(web2c_texmf)
pdfxtexdir/pdfxtex.defines
Modified: tetex-bin/trunk/debian/po/sv.po
===================================================================
--- tetex-bin/trunk/debian/po/sv.po 2005-12-27 08:26:37 UTC (rev 431)
+++ tetex-bin/trunk/debian/po/sv.po 2005-12-27 20:23:45 UTC (rev 432)
@@ -14,6 +14,7 @@
msgid ""
msgstr ""
"Project-Id-Version: tetex-base 2.0.2-31\n"
+"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2005-10-19 21:59+0200\n"
"PO-Revision-Date: 2005-12-17 19:52+0100\n"
"Last-Translator: Daniel Nylander <[EMAIL PROTECTED]>\n"
@@ -23,94 +24,121 @@
"Content-Transfer-Encoding: 8bit\n"
#. Type: note
+#. Description
#: ../templates:3
msgid "Change of name of files in /etc/texmf/texmf.d/"
msgstr "�ndring av namn f�r filer i /etc/texmf/texmf.d/"
#. Type: note
+#. Description
#: ../templates:3
-msgid "texmf.cnf has previously been generated by update-texmf from all files
in /etc/texmf/texmf.d/. Now update-texmf is changed and only reads files with
extension '.cnf'"
-msgstr "texmf.cnf har tidigare genererats av update-texmf fr�n alla filer i
/etc/texmf/texmf.d/. Nu har update-texmf �ndrats och l�ser endast filer med
�ndelsen \".cnf\""
+msgid ""
+"texmf.cnf has previously been generated by update-texmf from all files in /"
+"etc/texmf/texmf.d/. Now update-texmf is changed and only reads files with "
+"extension '.cnf'"
+msgstr ""
+"texmf.cnf har tidigare genererats av update-texmf fr�n alla filer i /etc/"
+"texmf/texmf.d/. Nu har update-texmf �ndrats och l�ser endast filer med "
+"�ndelsen \".cnf\""
#. Type: note
+#. Description
#: ../templates:3
-msgid "So if you had any private file in /etc/texmf/texmf.d/, then you should
add '.cnf' to its name; for example, 22mymacro => 22mymacro.cnf"
-msgstr "S� om du har n�gra privata filer i /etc/texmf/texmf.d/ b�r du l�gga
till \".cnf\" till namnet; till exempel 22mittmakro => 22mittmakro.cnf"
+msgid ""
+"So if you had any private file in /etc/texmf/texmf.d/, then you should add '."
+"cnf' to its name; for example, 22mymacro => 22mymacro.cnf"
+msgstr ""
+"S� om du har n�gra privata filer i /etc/texmf/texmf.d/ b�r du l�gga till \"."
+"cnf\" till namnet; till exempel 22mittmakro => 22mittmakro.cnf"
#~ msgid "Old updmap found."
#~ msgstr "Gammal updmap hittad."
+
#~ msgid ""
#~ "tetex-base has found /etc/texmf/dvips/updmap from a previous version of "
#~ "tetex-base. You seem to have modified this script."
#~ msgstr ""
#~ "tetex-base har hittat /etc/texmf/dvips/updmap fr�n en tidigare version av "
#~ "tetex-base. Du verkar har modifierat detta skript."
+
#~ msgid ""
-#~ "This script is no longer included in tetex-base and should not be used.
It "
-#~ "will be renamed to updmap.postinst-old."
+#~ "This script is no longer included in tetex-base and should not be used. "
+#~ "It will be renamed to updmap.postinst-old."
#~ msgstr ""
-#~ "Detta skript �r inte l�ngre inkluderad i tetex-base och b�r inte anv�ndas.
"
-#~ "Det kommer att byta namn till updmap.postinst-old."
+#~ "Detta skript �r inte l�ngre inkluderad i tetex-base och b�r inte "
+#~ "anv�ndas. Det kommer att byta namn till updmap.postinst-old."
+
#~ msgid ""
-#~ "Changes previously made to this script should now be made to files in "
-#~ "/etc/texmf/updmap.d/, see the manpage for update-updmap."
+#~ "Changes previously made to this script should now be made to files in /"
+#~ "etc/texmf/updmap.d/, see the manpage for update-updmap."
#~ msgstr ""
-#~ "Tidigare gjorda �ndringar i detta skript b�r nu g�ras till filer i "
-#~ "/etc/texmf/updmap.d/. Se manualsidan f�r update-updmap."
+#~ "Tidigare gjorda �ndringar i detta skript b�r nu g�ras till filer i /etc/"
+#~ "texmf/updmap.d/. Se manualsidan f�r update-updmap."
+
#~ msgid "Remove old dat files for texdoctk?"
#~ msgstr "Ta bort gamla dat-filer f�r texdoctk?"
+
#~ msgid ""
-#~ "Old dat files for texdoctk from a previous version of tetex-base were
found. "
-#~ " The files are texdoc-100.dat, texdoc-102.dat, and texdoc-103.dat in "
-#~ "/etc/texdoctk/, and they were used only in a teTeX beta version."
+#~ "Old dat files for texdoctk from a previous version of tetex-base were "
+#~ "found. The files are texdoc-100.dat, texdoc-102.dat, and texdoc-103.dat "
+#~ "in /etc/texdoctk/, and they were used only in a teTeX beta version."
#~ msgstr ""
#~ "Gamla dat-filer f�r texdoctk fr�n en tidigare version av tetex-base "
-#~ "hittades. De filerna �r texdoc-100.dat, texdoc-102.dat och texdoc-103.dat
i "
-#~ "/etc/texdoctk/ och de anv�ndes bara i en betaversion av teTeX."
+#~ "hittades. De filerna �r texdoc-100.dat, texdoc-102.dat och texdoc-103.dat "
+#~ "i /etc/texdoctk/ och de anv�ndes bara i en betaversion av teTeX."
+
#~ msgid ""
-#~ "If you think you have modified any of them, then you may refuse this
option "
-#~ "and preserve them. However, almost 99% of people will accept the "
+#~ "If you think you have modified any of them, then you may refuse this "
+#~ "option and preserve them. However, almost 99% of people will accept the "
#~ "opportunity to remove these files right now!"
#~ msgstr ""
#~ "Om du tror du har modifierat n�gon av dom kan du v�gra denna fr�ga och "
#~ "beh�lla dom. Dock kommer n�sta 99% av alla personer att acceptera "
#~ "m�jligheten att ta bort dessa filer just nu!"
+
#~ msgid "TeX format generation failed."
#~ msgstr "Generering av TeX-format misslyckades."
+
#~ msgid ""
-#~ "The generation of some of the format files needed to run TeX, LaTeX etc.
has "
-#~ "failed. You will not be able to run these programs until this is fixed."
+#~ "The generation of some of the format files needed to run TeX, LaTeX etc. "
+#~ "has failed. You will not be able to run these programs until this is "
+#~ "fixed."
#~ msgstr ""
#~ "Genereringen av n�gra av formatfilerna som beh�vs f�r att k�ra TeX, LaTeX "
#~ "etc har misslyckats. Du kommer inte att kunna k�ra dessa program f�rr�n "
#~ "detta �r fixat."
+
#~ msgid ""
#~ "The most frequent cause for such a failure is that a new version of tetex-"
#~ "base changed configuration files, but you did not accept the maintainers' "
#~ "version of a file you manually changed."
#~ msgstr ""
-#~ "Den mest frekventa orsaken f�r ett s�dant fel �r n�r en ny version av
tetex-"
-#~ "base �ndrar konfigurationsfilerna men du accepterade inte paketansvariges "
-#~ "version av en fil som du manuellt �ndrat."
+#~ "Den mest frekventa orsaken f�r ett s�dant fel �r n�r en ny version av "
+#~ "tetex-base �ndrar konfigurationsfilerna men du accepterade inte "
+#~ "paketansvariges version av en fil som du manuellt �ndrat."
+
#~ msgid ""
-#~ "If you report this a bug, please include the output of fmtutil, stored in
"
-#~ "${fmtutil_tempfile}"
+#~ "If you report this a bug, please include the output of fmtutil, stored "
+#~ "in ${fmtutil_tempfile}"
#~ msgstr ""
-#~ "Om du rapporterar detta som en bugg, v�nligen inkludera utdatat fr�n
fmtutil "
-#~ "som �r lagrad i ${fmtutil_tempfile}"
+#~ "Om du rapporterar detta som en bugg, v�nligen inkludera utdatat fr�n "
+#~ "fmtutil som �r lagrad i ${fmtutil_tempfile}"
+
#~ msgid "generation of TeX font information failed."
#~ msgstr "generering av TeX-typsnittsinformation misslyckades."
+
#~ msgid ""
#~ "The generation of the font map files by the updmap script failed. "
#~ "Therefore, TeX, LaTeX etc. will have problems finding the font files they "
#~ "need."
#~ msgstr ""
#~ "Genereringen av typsnittskartan av updmap-skriptet misslyckades. D�rf�r "
-#~ "kommer TeX, LaTeX etc att f� problem att hitta typsnittsfilerna de
beh�ver."
+#~ "kommer TeX, LaTeX etc att f� problem att hitta typsnittsfilerna de "
+#~ "beh�ver."
+
#~ msgid ""
-#~ "If you report this as a bug, please include the output of updmap, stored
in "
-#~ "${updmap_tempfile}"
+#~ "If you report this as a bug, please include the output of updmap, stored "
+#~ "in ${updmap_tempfile}"
#~ msgstr ""
-#~ "Om du rapporterar detta som en bugg, v�nligen inkludera utdatat fr�n
updmap "
-#~ "som �r lagrad i ${updmap_tempfile}"
-
+#~ "Om du rapporterar detta som en bugg, v�nligen inkludera utdatat fr�n "
+#~ "updmap som �r lagrad i ${updmap_tempfile}"
Modified: tetex-bin/trunk/debian/rules
===================================================================
--- tetex-bin/trunk/debian/rules 2005-12-27 08:26:37 UTC (rev 431)
+++ tetex-bin/trunk/debian/rules 2005-12-27 20:23:45 UTC (rev 432)
@@ -140,8 +140,6 @@
patch-stamp:
quilt push -a
- # for debugging pbuilder:
- env
touch $@
clean-commonstuff:
@@ -177,7 +175,7 @@
configure-stamp: $(stampdir) patch-stamp
# comment out the following line if you want to check the configure target
# in a CVS working copy
- $(check-svn)
+# $(check-svn)
dh_testdir
# Make sure all of our expected symlinks are in place
sh debian/restore-symlinks
@@ -222,7 +220,7 @@
# Obsolete and now fixed pl.l by patch-tmp (for broken flex)
# cp texk/web2c/omegafonts/lex.yy.c-dist texk/web2c/omegafonts/lex.yy.c
# Add here commands to compile the package.
- make CFLAGS="${CFLAGS}" XXCFLAGS='-I/usr/include/poppler'
LDFLAGS='-lpoppler'
+ make CFLAGS="${CFLAGS}" #XXCFLAGS='-I/usr/include/poppler'
LDFLAGS='-lpoppler'
gcc -o debian/tetex-xwarn -O2 -W -Wall -ansi -pedantic \
-L/usr/X11R6/lib -lXaw -lXt -lX11 -I/usr/X11R6/include \
debian/texdoctk-warn.c
Modified: tetex-bin/trunk/debian/rules.in
===================================================================
--- tetex-bin/trunk/debian/rules.in 2005-12-27 08:26:37 UTC (rev 431)
+++ tetex-bin/trunk/debian/rules.in 2005-12-27 20:23:45 UTC (rev 432)
@@ -145,8 +145,6 @@
patch-stamp:
quilt push -a
- # for debugging pbuilder:
- env
touch $@
clean-commonstuff:
@@ -182,7 +180,7 @@
configure-stamp: $(stampdir) patch-stamp
# comment out the following line if you want to check the configure target
# in a CVS working copy
- $(check-svn)
+# $(check-svn)
dh_testdir
# Make sure all of our expected symlinks are in place
sh debian/restore-symlinks
@@ -227,7 +225,7 @@
# Obsolete and now fixed pl.l by patch-tmp (for broken flex)
# cp texk/web2c/omegafonts/lex.yy.c-dist texk/web2c/omegafonts/lex.yy.c
# Add here commands to compile the package.
- make CFLAGS="${CFLAGS}" XXCFLAGS='-I/usr/include/poppler'
LDFLAGS='-lpoppler'
+ make CFLAGS="${CFLAGS}" #XXCFLAGS='-I/usr/include/poppler'
LDFLAGS='-lpoppler'
gcc -o debian/tetex-xwarn -O2 -W -Wall -ansi -pedantic \
-L/usr/X11R6/lib -lXaw -lXt -lX11 -I/usr/X11R6/include \
debian/texdoctk-warn.c
_______________________________________________
Pkg-tetex-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-tetex-commits
