diff -u texlive-bin-2007.dfsg.2/debian/changelog texlive-bin-2007.dfsg.2/debian/changelog
--- texlive-bin-2007.dfsg.2/debian/changelog
+++ texlive-bin-2007.dfsg.2/debian/changelog
@@ -1,3 +1,12 @@
+texlive-bin (2007.dfsg.2-6ubuntu3) karmic; urgency=low
+
+  * rebuild for new libpoppler, fixes various crashes (LP: #410242)
+  * debian/patches/65_fix_getline_glibc2.10.patch: fix FTBFS by renaming
+    included getline-functions to not conflict with glibc provided getline.
+  * debian/fix-manpages.sh: quote special chars in sed command
+
+ -- Andreas Moog <amoog@ubuntu.com>  Mon, 10 Aug 2009 16:23:59 +0200
+
 texlive-bin (2007.dfsg.2-6ubuntu2) karmic; urgency=low
 
   * debian/patches/ubuntu_libpoppler-0.11: fix a FTBFS because of unuseful
diff -u texlive-bin-2007.dfsg.2/debian/fix-manpages.sh texlive-bin-2007.dfsg.2/debian/fix-manpages.sh
--- texlive-bin-2007.dfsg.2/debian/fix-manpages.sh
+++ texlive-bin-2007.dfsg.2/debian/fix-manpages.sh
@@ -66,12 +66,12 @@
 		cat $tmpfile > $i
 		;;
 	esac
-	cat $i | sed 	-e "s/ó/\\['o]/g" 		\
-			-e "s/é/\\['e]/g"		\
-			-e 's/ü/\\[:u]/g'		\
-			-e 's/ä/\\[:a]/g'		\
-			-e 's/ö/\\[:o]/g'		\
-			-e 's/©/\\[co]/g'		\
+	cat $i | sed 	-e "s/\ó/\\['o]/g" 		\
+			-e "s/\é/\\['e]/g"		\
+			-e 's/\ü/\\[:u]/g'		\
+			-e 's/\ä/\\[:a]/g'		\
+			-e 's/\ö/\\[:o]/g'		\
+			-e 's/\©/\\[co]/g'		\
 				> $tmpfile
 	cat $tmpfile > $i
 done
diff -u texlive-bin-2007.dfsg.2/debian/patches/series texlive-bin-2007.dfsg.2/debian/patches/series
--- texlive-bin-2007.dfsg.2/debian/patches/series
+++ texlive-bin-2007.dfsg.2/debian/patches/series
@@ -39,6 +39,7 @@
 62_dvips_absolutepath_doc
 63_texmf.cnf_for_comparison_temp
 64_fix_makempx_installation
+65_fix_getline_glibc2.10.patch
 xetex-0996-patch1
 config.ps-update
 dviljk-security-fixes
only in patch2:
unchanged:
--- texlive-bin-2007.dfsg.2.orig/debian/patches/65_fix_getline_glibc2.10.patch
+++ texlive-bin-2007.dfsg.2/debian/patches/65_fix_getline_glibc2.10.patch
@@ -0,0 +1,154 @@
+Description: Fix build with glibc2.10 by renaming internal getline functions
+Origin: Partially http://tug.org/pipermail/tlbuild/2009q2/000715.html
+        The remaining bits are changed by Andreas Moog <amoog@ubuntu.com>
+
+Index: texlive-bin-2007.dfsg.2/build/source/texk/afm2pl/afm2pl.c
+===================================================================
+--- texlive-bin-2007.dfsg.2.orig/build/source/texk/afm2pl/afm2pl.c	2009-08-10 16:22:16.817045454 +0200
++++ texlive-bin-2007.dfsg.2/build/source/texk/afm2pl/afm2pl.c	2009-08-10 16:22:20.457046881 +0200
+@@ -345,7 +345,7 @@
+ 
+ /* read a line from infile into buffer and obuffer */
+ int
+-  getline
++  afm_getline
+ P1H (void)
+ {
+   register char *p;
+@@ -781,7 +781,7 @@
+     afmencoding->vec[i] = ".notdef";
+   afmencoding->name = "Unspecified";
+ 
+-  while (getline ()) {
++  while (afm_getline ()) {
+     switch (interest (paramstring ())) {
+     case FontName:
+       fontname = paramnewstring ();
+@@ -963,7 +963,7 @@
+ 
+   while (1) {
+     while (param == 0 || *param == 0) {
+-      if (getline () == 0)
++      if (afm_getline () == 0)
+         error ("! premature end in encoding file");
+     }
+     if (param[0] == '%') {
+@@ -1540,7 +1540,7 @@
+     encfilename =
+       openin (encfilename, kpse_enc_format, ".enc");
+     for (lig_it = 0; lig_it < 2; lig_it++) {
+-      while (getline ()) {
++      while (afm_getline ()) {
+         /* search for (ligkern) comment in line */
+         for (p = buffer; *p; p++)
+           if (*p == '%') {
+@@ -1576,7 +1576,7 @@
+     for (i = 0; i < ligfilenames->n; i++) {
+       ligfilename = openin (ligfilenames->names[i],
+                             kpse_lig_format, ".lig");
+-      while (getline ())
++      while (afm_getline ())
+         checkligkern (buffer, 0);       /* 2nd param 0: lig file */
+       fclose (infile);
+     }
+@@ -1607,7 +1607,7 @@
+   for (i = 0; i < Ligfilenames->n; i++) {
+     ligfilename = openin (Ligfilenames->names[i],
+                           kpse_lig_format, ".lig");
+-    while (getline ())
++    while (afm_getline ())
+       checkligkern (buffer, 0);       /* 2nd param 0: lig file */
+     fclose (infile);
+   }
+Index: texlive-bin-2007.dfsg.2/build/source/texk/web2c/cpascal.h
+===================================================================
+--- texlive-bin-2007.dfsg.2.orig/build/source/texk/web2c/cpascal.h	2009-08-10 16:22:16.957048526 +0200
++++ texlive-bin-2007.dfsg.2/build/source/texk/web2c/cpascal.h	2009-08-10 16:22:20.457046881 +0200
+@@ -245,6 +245,11 @@
+ #define getname vms_getname
+ #endif
+ 
++#ifdef getline
++#undef getline
++#endif
++#define getline web2c_getline
++
+ /* Declarations for the routines we provide ourselves in lib/.  */
+ 
+ extern string basenamechangesuffix P3H(const_string,const_string,const_string);
+Index: texlive-bin-2007.dfsg.2/build/source/texk/web2c/mpware/mpto.c
+===================================================================
+--- texlive-bin-2007.dfsg.2.orig/build/source/texk/web2c/mpware/mpto.c	2009-08-10 16:22:16.841041729 +0200
++++ texlive-bin-2007.dfsg.2/build/source/texk/web2c/mpware/mpto.c	2009-08-10 16:22:20.457046881 +0200
+@@ -99,7 +99,7 @@
+ }
+ 
+ char *
+-getline(void)
++mpt_getline(void)
+ {				/* returns NULL on EOF or error, otherwise buf */
+     int c;
+     unsigned loc = 0;
+@@ -304,11 +304,11 @@
+     while (*aa == ' ' || *aa == '\t')
+ 	aa++;
+     if (*aa == 0)
+-	if ((aa = getline()) == NULL)
++	if ((aa = mpt_getline()) == NULL)
+ 	    err("btex section does not end");
+     do {
+ 	if (*aa == 0)
+-	    if ((aa = getline()) == NULL)
++	    if ((aa = mpt_getline()) == NULL)
+ 		err("btex section does not end");
+ 	    else
+ 		printf("\n");
+@@ -465,7 +465,7 @@
+ 	postverb = troff_postverb;
+     }
+     printf("%s", predoc);
+-    while (getline() != NULL)
++    while (mpt_getline() != NULL)
+ 	do_line();
+     printf("%s", postdoc);
+     exit(0);
+Index: texlive-bin-2007.dfsg.2/build/source/texk/dvipsk/afm2tfm.c
+===================================================================
+--- texlive-bin-2007.dfsg.2.orig/build/source/texk/dvipsk/afm2tfm.c	2009-08-10 16:22:43.865047578 +0200
++++ texlive-bin-2007.dfsg.2/build/source/texk/dvipsk/afm2tfm.c	2009-08-10 16:23:31.709045809 +0200
+@@ -257,7 +257,7 @@
+ }
+ 
+ int
+-getline P1H(void) {
++afm_getline P1H(void) {
+    register char *p ;
+    register int c ;
+ 
+@@ -612,7 +612,7 @@
+    ai = newchar() ;
+    ai->adobenum = -1 ;
+    ai->adobename = "||" ; /* boundary character name */
+-   while (getline()) {
++   while (afm_getline()) {
+       switch(interest(paramstring())) {
+ case FontName:
+          fontname = paramnewstring() ;
+@@ -1888,7 +1888,7 @@
+ 
+    while (1) {
+       while (param == 0 || *param == 0) {
+-         if (getline() == 0)
++         if (afm_getline() == 0)
+             error("! premature end in encoding file") ;
+          for (p=buffer; *p; p++)
+             if (*p == '%') {
+@@ -1979,7 +1979,7 @@
+       p = gettoken() ;
+       if (strcmp(p, "]"))
+          error("! token 258 in encoding must be make-array (])") ;
+-      while (getline()) {
++      while (afm_getline()) {
+          for (p=buffer; *p; p++)
+             if (*p == '%') {
+                if (ignoreligkern == 0)