[Debian-tex-commits] SVN tetex-base commit + diffs: r1846 - tetex-base/trunk/debian

[Frank Küster]

Author: frank
Date: 2006-10-18 06:47:45 +0000 (Wed, 18 Oct 2006)
New Revision: 1846

Modified:
   tetex-base/trunk/debian/changelog
   tetex-base/trunk/debian/control
   tetex-base/trunk/debian/rules
Log:
* Add a conflict on the sarge version of jadetex, in order to prevent an
  upgrade failure when jadetex is held back (closes: # 393345) [frank]
* Final version number


Modified: tetex-base/trunk/debian/changelog
===================================================================
--- tetex-base/trunk/debian/changelog	2006-10-17 09:47:04 UTC (rev 1845)
+++ tetex-base/trunk/debian/changelog	2006-10-18 06:47:45 UTC (rev 1846)
@@ -1,4 +1,4 @@
-tetex-base (3.0.dfsg.3-1~1) UNRELEASED; urgency=medium
+tetex-base (3.0.dfsg.3-1) unstable; urgency=medium
 
   * New repackaged upstream tarball:  Removed documentation for
     shapepar.sty as well [frank]
@@ -16,8 +16,10 @@
     #380643) [frank]
   * Update cmap.sty from CTAN, it was non-functional (closes: #336213)
     [frank] 
+  * Add a conflict on the sarge version of jadetex, in order to prevent an
+    upgrade failure when jadetex is held back (closes: # 393345) [frank]
 
- -- Frank Küster <frank at debian.org>  Mon, 16 Oct 2006 22:19:40 +0200
+ -- Frank Küster <frank at debian.org>  Wed, 18 Oct 2006 08:41:01 +0200
 
 tetex-base (3.0.dfsg.2-2) unstable; urgency=low
 

Modified: tetex-base/trunk/debian/control
===================================================================
--- tetex-base/trunk/debian/control	2006-10-17 09:47:04 UTC (rev 1845)
+++ tetex-base/trunk/debian/control	2006-10-18 06:47:45 UTC (rev 1846)
@@ -11,7 +11,7 @@
 Architecture: all
 Depends: ${misc:Depends}, ucf (>= 1.02), tex-common (>= 0.12)
 Replaces: texidoc, bibtex, texpsfnt, mfbasfnt, xdvik, dvipsk, mfnfss, latex, texlib, mflib, textfm, kpathsea, latex2e-doc, ltxgraph, csplain, cslatex, cstexfonts, tetex-extra (<< 2.0.2a-1), tetex-doc (<< 1.0.2+20011128), tetex-nonfree, pxfonts, txfonts, mfpic, texdoctk, tetex-bin (<< 2.99)
-Conflicts: texidoc, bibtex, texpsfnt, mfbasfnt, xdvik, mfnfss, texlib, mflib, textfm, kpathsea, latex2e-doc, ltxgraph, csplain, cslatex, cstexfonts, xbase (<< 3.3.2.3a-2), tetex-nonfree (<< 1.0.2+20000804-2), pxfonts, txfonts, mfpic, cspsfonts, arabtex (<= 3.10-5)
+Conflicts: texidoc, bibtex, texpsfnt, mfbasfnt, xdvik, mfnfss, texlib, mflib, textfm, kpathsea, latex2e-doc, ltxgraph, csplain, cslatex, cstexfonts, xbase (<< 3.3.2.3a-2), tetex-nonfree (<< 1.0.2+20000804-2), pxfonts, txfonts, mfpic, cspsfonts, arabtex (<= 3.10-5), jadetex (<=3.13-6)
 Recommends: tetex-doc (>> 2.0)
 Suggests: tetex-extra
 Description: Basic TeX input files of teTeX

Modified: tetex-base/trunk/debian/rules
===================================================================
--- tetex-base/trunk/debian/rules	2006-10-17 09:47:04 UTC (rev 1845)
+++ tetex-base/trunk/debian/rules	2006-10-18 06:47:45 UTC (rev 1846)
@@ -255,7 +255,7 @@
 	done
 
 	# needs devscripts in etch or from backports.org
-	debchange --distribution sarge-backports -b --newversion 3.0.dfsg.2-2~bpo.1 "Recompiled for sarge."
+	debchange --distribution sarge-backports -b --newversion 3.0.dfsg.3-1~1~bpo.1 "Recompiled for sarge."
 	debchange --append "No source changes."
 
 	# need to remake rules