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

[Frank Küster]

Author: frank
Date: 2006-09-19 08:05:25 +0000 (Tue, 19 Sep 2006)
New Revision: 1619

Modified:
   tetex-bin/trunk/debian/common.variables
   tetex-bin/trunk/debian/control
   tetex-bin/trunk/debian/rules
Log:
- Change common.variables to use ~ in backports versions
- some description tweaking


Modified: tetex-bin/trunk/debian/common.variables
===================================================================
--- tetex-bin/trunk/debian/common.variables	2006-09-19 08:03:53 UTC (rev 1618)
+++ tetex-bin/trunk/debian/common.variables	2006-09-19 08:05:25 UTC (rev 1619)
@@ -44,8 +44,7 @@
   # if the debian revision is 0 or 0.x, don't make a backport
     $SARGEVERSION = '';
 } else {
-    $sarge_rev = $rev-1;
-    ($SARGEVERSION=$VERSION) =~ s/^(.*-)$rev([^\-]*)$/$1${sarge_rev}${2}bpo1/;
+    ($SARGEVERSION=$VERSION) =~ s/^(.*)$/$1~bpo.1/;
 #   ($SARGEVERSION=$VERSION)=~s/(.*-)$rev(.*)/$1$rev.0.sarge1/;
 }
 $FIRST_BASE_VERSION_WITH_COMMON="3.0-4";

Modified: tetex-bin/trunk/debian/control
===================================================================
--- tetex-bin/trunk/debian/control	2006-09-19 08:03:53 UTC (rev 1618)
+++ tetex-bin/trunk/debian/control	2006-09-19 08:05:25 UTC (rev 1619)
@@ -16,8 +16,8 @@
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}, tetex-base (>= 3.0-4), ed, debianutils (>= 1.13.1), mime-support, sed (>= 4.0.5), ucf (>= 1.02), dialog | whiptail
 Suggests: gs-gpl | gs-esp | gs-afpl, gv | postscript-viewer, xpdf-reader | pdf-viewer, tetex-extra, texinfo, texi2html, dvipng, chktex | lacheck, rubber, sam2p, xbase-clients
 Recommends: psutils, perl-tk, libxml-parser-perl
-Description: The teTeX binary files
- This is the binary part of teTeX. This package contains all the
+Description: The teTeX programs
+ This is the compiled part of teTeX. This package contains all the
  programs belonging to teTeX, i.e. the TeX compiler itself, and
  variants for formats like e-TeX, pdfTeX, LaTeX, pdfLaTeX, etc.
  .

Modified: tetex-bin/trunk/debian/rules
===================================================================
--- tetex-bin/trunk/debian/rules	2006-09-19 08:03:53 UTC (rev 1618)
+++ tetex-bin/trunk/debian/rules	2006-09-19 08:05:25 UTC (rev 1619)
@@ -323,17 +323,19 @@
 ####################################################################
 
 CHANGED_FILES_SARGE = debian/changelog debian/control
-EXCHANGED_FILES_SARGE = 
+EXCHANGED_FILES_SARGE =
 
 debian/sarge-stamp: debian/sarge/changelog.sed
 	for file in $(CHANGED_FILES_SARGE); do \
 	    cp $${file} debian/sarge/`basename $${file}`.sid; \
 	done
 
-	sed -f debian/sarge/changelog.sed debian/sarge/changelog.sid \
-	  > debian/changelog
+	# needs devscripts in etch or from backports.org
+	debchange -b --newversion 3.0-18.1~bpo.1 "Recompiled for sarge."
+	debchange --append \
+	  "Add a Build-Depends on sarge's xlibs-dev to prevent linking against XOrg"
+	sed -f debian/sarge/control.sed debian/sarge/control.sid > debian/control
 # 	sed -f debian/sarge/rules.sed debian/sarge/rules.in.sid > debian/rules.in
-	sed -f debian/sarge/control.sed debian/sarge/control.sid > debian/control
 
 	for file in $(EXCHANGED_FILES_SARGE); do \
 	    mv $${file} debian/sarge/`basename $${file}`.sid; \