[subversion-commit] SVN tetex commit + diffs: r404 - in tetex-bin/trunk/debian: . sarge

[Frank Küster]

Author: frank
Date: 2005-12-13 15:21:53 +0000 (Tue, 13 Dec 2005)
New Revision: 404

Modified:
   tetex-bin/trunk/debian/changelog
   tetex-bin/trunk/debian/common.variables
   tetex-bin/trunk/debian/sarge/recompile.sed.in
Log:
changelog entries for -12, and some changes for sarge backport

Modified: tetex-bin/trunk/debian/changelog
===================================================================
--- tetex-bin/trunk/debian/changelog	2005-12-13 10:16:37 UTC (rev 403)
+++ tetex-bin/trunk/debian/changelog	2005-12-13 15:21:53 UTC (rev 404)
@@ -1,8 +1,8 @@
-tetex-bin (3.0-11.1) unstable; urgency=low
+tetex-bin (3.0-12) unstable; urgency=low
 
   * Because of the frequent security issues with xpdf, we do no longer use
     the included xpdf code, but libpoppler instead. Many thanks to Martin Pitt
-    <martin.pitt at canonical.com> for the patch [frank]
+    <martin.pitt at canonical.com> for the patch (closes: #316546) [frank]
   * Add debian/patches/patch-poppler to build the two files that require xpdf
     (texk/web2c/pdftexdir/{pdftosrc.cc,pdftoepdf.cc}) against poppler:
     - Adapt include file paths.
@@ -22,7 +22,7 @@
     - Clean debian/latex.info on clean to be able to build the
       source package after building binaries.
 
- -- Frank Küster <frank at debian.org>  Thu,  8 Dec 2005 13:13:45 +0100
+ -- Frank Küster <frank at debian.org>  Tue, 13 Dec 2005 13:42:53 +0100
 
 tetex-bin (3.0-11) unstable; urgency=high
 

Modified: tetex-bin/trunk/debian/common.variables
===================================================================
--- tetex-bin/trunk/debian/common.variables	2005-12-13 10:16:37 UTC (rev 403)
+++ tetex-bin/trunk/debian/common.variables	2005-12-13 15:21:53 UTC (rev 404)
@@ -37,10 +37,9 @@
   # if the debian revision is 0 or 0.x, don't make a backport
   {$SARGEVERSION = ''}
 else {
-  # currently, we only need to recompile: binary-only-NMU version number
-  # $sarge_rev=$rev-1;
-  # ($SARGEVERSION=$VERSION)=~s/(.*-)$rev(.*)/$1$sarge_rev.sarge$2/;
-  ($SARGEVERSION=$VERSION)=~s/(.*-)$rev(.*)/$1$rev.0.sarge1/;
+  $sarge_rev=$rev-1;
+  ($SARGEVERSION=$VERSION)=~s/(.*-)$rev(.*)/$1${sarge_rev}sarge$rev$2/;
+#   ($SARGEVERSION=$VERSION)=~s/(.*-)$rev(.*)/$1$rev.0.sarge1/;
 }:>//
 <:$FIRST_BASE_VERSION_WITH_COMMON="3.0-4":>//
 <:$README_sarge=''; $README_sarge='debian/sarge/README.sarge' if -e 'sarge-stamp':>//

Modified: tetex-bin/trunk/debian/sarge/recompile.sed.in
===================================================================
--- tetex-bin/trunk/debian/sarge/recompile.sed.in	2005-12-13 10:16:37 UTC (rev 403)
+++ tetex-bin/trunk/debian/sarge/recompile.sed.in	2005-12-13 15:21:53 UTC (rev 404)
@@ -2,4 +2,6 @@
 s/<:=$VERSION:>/<:=$SARGEVERSION:>/
 1 a \
 \
-  * recompiled for sarge
+  * recompiled for sarge.  The new dependencies, libcairo and \
+    libpoppler, are also available from the teTeX-3.0 repository \
+    for the moment.  This may change in the future. \