Author: frank
Date: 2006-03-13 16:12:24 +0000 (Mon, 13 Mar 2006)
New Revision: 1027
Added:
tetex-bin/trunk/debian/patches/patch-CAN-2004-0888
tetex-bin/trunk/debian/patches/patch-CAN-2005-0064
tetex-bin/trunk/debian/patches/patch-CVE-2005-3191+2+3
tetex-bin/trunk/debian/sarge/control.sed
tetex-bin/trunk/debian/sarge/rules.sed
tetex-bin/trunk/debian/sarge/series.sarge
Modified:
tetex-bin/trunk/debian/changelog
tetex-bin/trunk/debian/common.variables
tetex-bin/trunk/debian/patches/patch-tmp
tetex-bin/trunk/debian/rules
tetex-bin/trunk/debian/rules.in
tetex-bin/trunk/debian/sarge/README.sarge
tetex-bin/trunk/debian/sarge/recompile.sed.in
Log:
* Backports changes
- Change the included backporting structure to create version numbers
for www.backports.org
- Don't apply patch-poppler for the sarge backports, instead apply the
xpdf patches again
Modified: tetex-bin/trunk/debian/changelog
===================================================================
--- tetex-bin/trunk/debian/changelog 2006-03-13 13:23:43 UTC (rev 1026)
+++ tetex-bin/trunk/debian/changelog 2006-03-13 16:12:24 UTC (rev 1027)
@@ -10,8 +10,13 @@
* Add the temporary directory to TEXFORMATS in fmtutil, to allow
building formats based on latex.fmt without cluttering stdout (closes:
#354604) [frank]
+ * Backports:
+ - Change the included backporting structure to create version numbers
+ for www.backports.org
+ - Don't apply patch-poppler for the sarge backports, instead apply the
+ xpdf patches again [to be implemented!!!!!]
- -- Frank Küster <[EMAIL PROTECTED]> Thu, 2 Mar 2006 12:36:23 +0100
+ -- Frank Küster <[EMAIL PROTECTED]> Fri, 10 Mar 2006 22:26:40 +0100
tetex-bin (3.0-14) unstable; urgency=low
Modified: tetex-bin/trunk/debian/common.variables
===================================================================
--- tetex-bin/trunk/debian/common.variables 2006-03-13 13:23:43 UTC (rev
1026)
+++ tetex-bin/trunk/debian/common.variables 2006-03-13 16:12:24 UTC (rev
1027)
@@ -38,7 +38,7 @@
{$SARGEVERSION = ''}
else {
$sarge_rev=$rev-1;
- ($SARGEVERSION=$VERSION)=~s/(.*-)$rev(.*)/$1${sarge_rev}sarge$rev$2/;
+ ($SARGEVERSION=$VERSION)=~s/(.*-)$rev(.*)/$1${sarge_rev}bpo1/;
# ($SARGEVERSION=$VERSION)=~s/(.*-)$rev(.*)/$1$rev.0.sarge1/;
}:>//
<:$FIRST_BASE_VERSION_WITH_COMMON="3.0-4":>//
Copied: tetex-bin/trunk/debian/patches/patch-CAN-2004-0888 (from rev 1026,
tetex-bin/tags/debian_version_3.0-11/debian/patches/patch-CAN-2004-0888)
Copied: tetex-bin/trunk/debian/patches/patch-CAN-2005-0064 (from rev 1026,
tetex-bin/tags/debian_version_3.0-11/debian/patches/patch-CAN-2005-0064)
Copied: tetex-bin/trunk/debian/patches/patch-CVE-2005-3191+2+3 (from rev 1026,
tetex-bin/tags/debian_version_3.0-11/debian/patches/patch-CVE-2005-3191+2+3)
Modified: tetex-bin/trunk/debian/patches/patch-tmp
===================================================================
--- tetex-bin/trunk/debian/patches/patch-tmp 2006-03-13 13:23:43 UTC (rev
1026)
+++ tetex-bin/trunk/debian/patches/patch-tmp 2006-03-13 16:12:24 UTC (rev
1027)
@@ -7,8 +7,8 @@
Index: tetex-bin-3.0/texk/tetex/epstopdf
===================================================================
---- tetex-bin-3.0.orig/texk/tetex/epstopdf 2006-03-02 14:46:38.000000000
+0100
-+++ tetex-bin-3.0/texk/tetex/epstopdf 2006-03-02 16:10:19.000000000 +0100
+--- tetex-bin-3.0.orig/texk/tetex/epstopdf 2006-03-02 16:13:11.000000000
+0100
++++ tetex-bin-3.0/texk/tetex/epstopdf 2006-03-02 17:16:42.000000000 +0100
@@ -205,7 +205,8 @@
### open output file
if ($::opt_gs) {
@@ -21,8 +21,8 @@
}
Index: tetex-bin-3.0/texk/tetex/epstopdf.man
===================================================================
---- tetex-bin-3.0.orig/texk/tetex/epstopdf.man 2006-03-02 14:46:38.000000000
+0100
-+++ tetex-bin-3.0/texk/tetex/epstopdf.man 2006-03-02 16:10:19.000000000
+0100
+--- tetex-bin-3.0.orig/texk/tetex/epstopdf.man 2006-03-02 16:13:11.000000000
+0100
++++ tetex-bin-3.0/texk/tetex/epstopdf.man 2006-03-02 17:16:42.000000000
+0100
@@ -14,10 +14,12 @@
.P
If the bounding box is not right, of course, you have problems...
@@ -41,8 +41,8 @@
.IP "\fB--\fP[\fBno\fP]\fBcompress\fP"
Index: tetex-bin-3.0/texk/dvipdfm/ebb.c
===================================================================
---- tetex-bin-3.0.orig/texk/dvipdfm/ebb.c 2006-03-02 14:46:38.000000000
+0100
-+++ tetex-bin-3.0/texk/dvipdfm/ebb.c 2006-03-02 16:10:19.000000000 +0100
+--- tetex-bin-3.0.orig/texk/dvipdfm/ebb.c 2006-03-02 16:13:11.000000000
+0100
++++ tetex-bin-3.0/texk/dvipdfm/ebb.c 2006-03-02 17:16:42.000000000 +0100
@@ -49,7 +49,7 @@
fprintf (stderr, "ebb comes with ABSOLUTELY NO WARRANTY.\n");
fprintf (stderr, "This is free software, and you are welcome to
redistribute it\n");
@@ -54,8 +54,8 @@
exit(1);
Index: tetex-bin-3.0/texk/dvipdfm/ebb.1
===================================================================
---- tetex-bin-3.0.orig/texk/dvipdfm/ebb.1 2006-03-02 16:10:19.000000000
+0100
-+++ tetex-bin-3.0/texk/dvipdfm/ebb.1 2006-03-02 16:10:19.000000000 +0100
+--- tetex-bin-3.0.orig/texk/dvipdfm/ebb.1 2006-03-02 17:16:42.000000000
+0100
++++ tetex-bin-3.0/texk/dvipdfm/ebb.1 2006-03-02 17:16:42.000000000 +0100
@@ -18,11 +18,9 @@
.HP
\fB\-v\fR : be verbose
@@ -72,8 +72,8 @@
.PP
Index: tetex-bin-3.0/texk/tetex/fmtutil
===================================================================
---- tetex-bin-3.0.orig/texk/tetex/fmtutil 2006-03-02 16:10:18.000000000
+0100
-+++ tetex-bin-3.0/texk/tetex/fmtutil 2006-03-02 16:10:19.000000000 +0100
+--- tetex-bin-3.0.orig/texk/tetex/fmtutil 2006-03-02 17:16:42.000000000
+0100
++++ tetex-bin-3.0/texk/tetex/fmtutil 2006-03-02 17:16:42.000000000 +0100
@@ -34,6 +34,7 @@
###############################################################################
###############################################################################
Modified: tetex-bin/trunk/debian/rules
===================================================================
--- tetex-bin/trunk/debian/rules 2006-03-13 13:23:43 UTC (rev 1026)
+++ tetex-bin/trunk/debian/rules 2006-03-13 16:12:24 UTC (rev 1027)
@@ -222,7 +222,7 @@
dh_testdir
# just to be sure to not use them
- rm -rf libs/xpdf libs/zlib
+ #rm -rf libs/xpdf libs/zlib
# 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
@@ -275,7 +275,7 @@
dh_testdir
dh_testroot
dh_installdebconf
- dh_installdocs -p$(package) -p$(sublib) debian/NEWS.Debian
debian/README.Developers
+ dh_installdocs -p$(package) -p$(sublib) debian/NEWS.Debian
debian/README.Developers debian/sarge/README.sarge
# Install the HTML version of README.Debian
destdir=debian/$(package)/usr/share/doc/$(package)/README.Debian.html \
@@ -324,18 +324,44 @@
# targets to compile for sarge
####################################################################
+CHANGED_FILES_SARGE = debian/changelog debian/rules.in debian/control
+
+# to avoid the dependency on libpoppler and libcairo, don't
+# apply patch-poppler (and either patch the xpdf sources, or decide
+# that the bugs aren't important)
+EXCHANGED_FILES_SARGE = debian/patches/series
+
debian/sarge-stamp: debian/sarge/recompile.sed
- cp debian/changelog debian/sarge/changelog.sid
+ for file in $(CHANGED_FILES_SARGE); do \
+ cp $${file} debian/sarge/`basename $${file}`.sid; \
+ done
+
sed -f debian/sarge/recompile.sed debian/sarge/changelog.sid \
- > debian/changelog && rm debian/sid-stamp
- # need to remake rules
- touch debian/rules.in
+ > debian/changelog
+ 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; \
+ cp debian/sarge/`basename $${file}`.sarge $${file} ; \
+ done
+
+ rm debian/sid-stamp
echo "dummy content for dpkg-source" > debian/sarge-stamp
debian/sid-stamp:
- mv debian/sarge/changelog.sid debian/changelog && rm debian/sarge-stamp
+ for file in $(CHANGED_FILES_SARGE); do \
+ mv debian/sarge/`basename $${file}`.sid $${file}; \
+ done
+
+ for file in $(EXCHANGED_FILES_SARGE); do \
+ mv debian/sarge/`basename $${file}`.sid $${file} ; \
+ done
+
# need to remake rules
touch debian/rules.in
+
+ rm debian/sarge-stamp
echo "dummy content for dpkg-source" > debian/sid-stamp
.PHONY: binary binary-arch binary-indep clean checkroot clean-patches sarge sid
Modified: tetex-bin/trunk/debian/rules.in
===================================================================
--- tetex-bin/trunk/debian/rules.in 2006-03-13 13:23:43 UTC (rev 1026)
+++ tetex-bin/trunk/debian/rules.in 2006-03-13 16:12:24 UTC (rev 1027)
@@ -329,18 +329,44 @@
# targets to compile for sarge
####################################################################
+CHANGED_FILES_SARGE = debian/changelog debian/rules.in debian/control
+
+# to avoid the dependency on libpoppler and libcairo, don't
+# apply patch-poppler (and either patch the xpdf sources, or decide
+# that the bugs aren't important)
+EXCHANGED_FILES_SARGE = debian/patches/series
+
debian/sarge-stamp: debian/sarge/recompile.sed
- cp debian/changelog debian/sarge/changelog.sid
+ for file in $(CHANGED_FILES_SARGE); do \
+ cp $${file} debian/sarge/`basename $${file}`.sid; \
+ done
+
sed -f debian/sarge/recompile.sed debian/sarge/changelog.sid \
- > debian/changelog && rm debian/sid-stamp
- # need to remake rules
- touch debian/rules.in
+ > debian/changelog
+ 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; \
+ cp debian/sarge/`basename $${file}`.sarge $${file} ; \
+ done
+
+ rm debian/sid-stamp
echo "dummy content for dpkg-source" > debian/sarge-stamp
debian/sid-stamp:
- mv debian/sarge/changelog.sid debian/changelog && rm debian/sarge-stamp
+ for file in $(CHANGED_FILES_SARGE); do \
+ mv debian/sarge/`basename $${file}`.sid $${file}; \
+ done
+
+ for file in $(EXCHANGED_FILES_SARGE); do \
+ mv debian/sarge/`basename $${file}`.sid $${file} ; \
+ done
+
# need to remake rules
touch debian/rules.in
+
+ rm debian/sarge-stamp
echo "dummy content for dpkg-source" > debian/sid-stamp
.PHONY: binary binary-arch binary-indep clean checkroot clean-patches sarge sid
Modified: tetex-bin/trunk/debian/sarge/README.sarge
===================================================================
--- tetex-bin/trunk/debian/sarge/README.sarge 2006-03-13 13:23:43 UTC (rev
1026)
+++ tetex-bin/trunk/debian/sarge/README.sarge 2006-03-13 16:12:24 UTC (rev
1027)
@@ -13,24 +13,19 @@
Bug reports
If you are using backports created by somebody else, please send bug
-reports to this person. If you have created your own backports using
-plain source packages from Debian, you can use the normal Debian
-Bugtracking System to report bugs.
+reports to this person. If you are using backports created by the
+Debian TeX Task force, e.g. the packages uploaded to
+www.backports.org, please use the normal Debian Bugtracking System to
+report bugs.
In this case, please mind that we are primarily developing etch, the
successor release of sarge, and that bug severities affect the
migration into testing and inclusion of the package in the current
candidate for etch. Therefore, severities of bugreports against such
-backports must be lowered:
+backports must be lowered by one or two degrees; bugs reported at
+release-critical severities will be downgraded promptly.
-- normal, minor or wishlist bugs should be reported with severity
- "wishlist",
-- important bugs should be reported with severity "minor", and
-
-- grave, serious or critical bugs should be reported with severity
- "normal".
-
*********************************************
Compiling backports
Added: tetex-bin/trunk/debian/sarge/control.sed
===================================================================
--- tetex-bin/trunk/debian/sarge/control.sed 2006-03-13 13:23:43 UTC (rev
1026)
+++ tetex-bin/trunk/debian/sarge/control.sed 2006-03-13 16:12:24 UTC (rev
1027)
@@ -0,0 +1 @@
+/^Build-Depends:/ [EMAIL PROTECTED], @@
Modified: tetex-bin/trunk/debian/sarge/recompile.sed.in
===================================================================
--- tetex-bin/trunk/debian/sarge/recompile.sed.in 2006-03-13 13:23:43 UTC
(rev 1026)
+++ tetex-bin/trunk/debian/sarge/recompile.sed.in 2006-03-13 16:12:24 UTC
(rev 1027)
@@ -1,7 +1,11 @@
#include "variables"
s/<:=$VERSION:>/<:=$SARGEVERSION:>/
+1 s/unstable/sarge-backports/
1 a \
\
- * 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. \
+ * recompiled for sarge. \
+ * The sarge backports have reverted to statically linking our \
+ copy of the xpdf code, see \
+ http://pkg-tetex.alioth.debian.org/sarge.html. \
+ * The repository on people.debian.org will no longer be maintained. \
+ Instead, backports will be uploaded to www.backports.org. \
Added: tetex-bin/trunk/debian/sarge/rules.sed
===================================================================
--- tetex-bin/trunk/debian/sarge/rules.sed 2006-03-13 13:23:43 UTC (rev
1026)
+++ tetex-bin/trunk/debian/sarge/rules.sed 2006-03-13 16:12:24 UTC (rev
1027)
@@ -0,0 +1 @@
[EMAIL PROTECTED](rm -rf libs/xpdf libs/zlib\)@#\1@
Added: tetex-bin/trunk/debian/sarge/series.sarge
===================================================================
--- tetex-bin/trunk/debian/sarge/series.sarge 2006-03-13 13:23:43 UTC (rev
1026)
+++ tetex-bin/trunk/debian/sarge/series.sarge 2006-03-13 16:12:24 UTC (rev
1027)
@@ -0,0 +1,13 @@
+patch-xdvi-300109
+patch-texmfcnf
+patch-texdoctk
+patch-texdoc
+patch-tds
+patch-src
+patch-libtool
+patch-deb
+patch-lintian
+patch-tmp
+patch-CAN-2005-0064
+patch-CAN-2004-0888
+patch-CVE-2005-3191+2+3
_______________________________________________
Pkg-tetex-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-tetex-commits
