[subversion-commit] SVN tetex-base commit + diffs: r1071 - in
tetex-base/trunk/debian: . sarge
Frank Küster
frank at costa.debian.org
Thu Mar 16 17:22:41 UTC 2006
Author: frank
Date: 2006-03-16 17:22:39 +0000 (Thu, 16 Mar 2006)
New Revision: 1071
Added:
tetex-base/trunk/debian/sarge/changelog.sed.in
Modified:
tetex-base/trunk/debian/changelog
tetex-base/trunk/debian/common.variables
tetex-base/trunk/debian/rules
tetex-base/trunk/debian/rules.in
Log:
Backports: Changed infrastructure to generate headers for uploads to
backports.org. [frank]
Modified: tetex-base/trunk/debian/changelog
===================================================================
--- tetex-base/trunk/debian/changelog 2006-03-16 16:38:33 UTC (rev 1070)
+++ tetex-base/trunk/debian/changelog 2006-03-16 17:22:39 UTC (rev 1071)
@@ -6,8 +6,10 @@
the functions exported from reportbug do not work (eg getkey). [preining]
* Add a couple of tfm files for the concmath fonts that were only in
tetex-src [frank]
+ * Backports: Changed infrastructure to generate headers for uploads to
+ backports.org. [frank]
- -- Frank Küster <frank at debian.org> Wed, 15 Mar 2006 20:32:05 +0100
+ -- Frank Küster <frank at debian.org> Thu, 16 Mar 2006 17:23:48 +0100
tetex-base (3.0-15) unstable; urgency=high
Modified: tetex-base/trunk/debian/common.variables
===================================================================
--- tetex-base/trunk/debian/common.variables 2006-03-16 16:38:33 UTC (rev 1070)
+++ tetex-base/trunk/debian/common.variables 2006-03-16 17:22:39 UTC (rev 1071)
@@ -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":>//
Modified: tetex-base/trunk/debian/rules
===================================================================
--- tetex-base/trunk/debian/rules 2006-03-16 16:38:33 UTC (rev 1070)
+++ tetex-base/trunk/debian/rules 2006-03-16 17:22:39 UTC (rev 1071)
@@ -20,9 +20,10 @@
debian/tetex-extra.postinst debian/tetex-extra.preinst \
debian/tetex-extra.postrm debian/tetex-extra.dirs \
debian/setup-conflinks \
- debian/common.functions
+ debian/common.functions debian/sarge/changelog.sed
eperl_sourcefiles=debian/variables debian/COPYRIGHT.scripts \
debian/common.variables debian/common.functions
+eperl_pwd = $(shell pwd)/debian
tex_common_dir = ../../tex-common/tex-common
real_common_variables=$(tex_common_dir)/debian/common.variables
real_common_functions_in=$(tex_common_dir)/debian/common.functions.in
@@ -57,7 +58,7 @@
# Eperl is simply great: thanks, Davide!
% :: %.in $(eperl_sourcefiles)
- eperl -P -o $@ $<
+ eperl -I $(eperl_pwd) -P -o $@ $<
-head -1 $@ | grep '^#!/' >/dev/null && chmod a+x $@
# Override this rule for debian/rules, which needs an additional command
@@ -228,18 +229,31 @@
# targets to compile for sarge
####################################################################
-debian/sarge-stamp:
- cp debian/changelog debian/sarge/changelog.sid
- sed -e s/3.0-15.1/3.0-14sarge15.1/ debian/sarge/changelog.sid \
- > debian/changelog && rm debian/sid-stamp
+CHANGED_FILES_SARGE = debian/changelog
+
+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
+
# need to remake rules
touch debian/rules.in
+
+ 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
+
# need to remake rules
touch debian/rules.in
+
+ rm debian/sarge-stamp
echo "dummy content for dpkg-source" > debian/sid-stamp
.PHONY: build clean binary-indep binary-arch binary install sarge sid
Modified: tetex-base/trunk/debian/rules.in
===================================================================
--- tetex-base/trunk/debian/rules.in 2006-03-16 16:38:33 UTC (rev 1070)
+++ tetex-base/trunk/debian/rules.in 2006-03-16 17:22:39 UTC (rev 1071)
@@ -25,9 +25,10 @@
debian/tetex-extra.postinst debian/tetex-extra.preinst \
debian/tetex-extra.postrm debian/tetex-extra.dirs \
debian/setup-conflinks \
- debian/common.functions
+ debian/common.functions debian/sarge/changelog.sed
eperl_sourcefiles=debian/variables debian/COPYRIGHT.scripts \
debian/common.variables debian/common.functions
+eperl_pwd = $(shell pwd)/debian
tex_common_dir = ../../tex-common/tex-common
real_common_variables=$(tex_common_dir)/debian/common.variables
real_common_functions_in=$(tex_common_dir)/debian/common.functions.in
@@ -62,7 +63,7 @@
# Eperl is simply great: thanks, Davide!
% :: %.in $(eperl_sourcefiles)
- eperl -P -o $@ $<
+ eperl -I $(eperl_pwd) -P -o $@ $<
-head -1 $@ | grep '^#!/' >/dev/null && chmod a+x $@
# Override this rule for debian/rules, which needs an additional command
@@ -233,18 +234,31 @@
# targets to compile for sarge
####################################################################
-debian/sarge-stamp:
- cp debian/changelog debian/sarge/changelog.sid
- sed -e s/<:=$VERSION:>/<:=$SARGEVERSION:>/ debian/sarge/changelog.sid \
- > debian/changelog && rm debian/sid-stamp
+CHANGED_FILES_SARGE = debian/changelog
+
+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
+
# need to remake rules
touch debian/rules.in
+
+ 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
+
# need to remake rules
touch debian/rules.in
+
+ rm debian/sarge-stamp
echo "dummy content for dpkg-source" > debian/sid-stamp
.PHONY: build clean binary-indep binary-arch binary install sarge sid
Added: tetex-base/trunk/debian/sarge/changelog.sed.in
===================================================================
--- tetex-base/trunk/debian/sarge/changelog.sed.in 2006-03-16 16:38:33 UTC (rev 1070)
+++ tetex-base/trunk/debian/sarge/changelog.sed.in 2006-03-16 17:22:39 UTC (rev 1071)
@@ -0,0 +1,7 @@
+#include "variables"
+s/<:=$VERSION:>/<:=$SARGEVERSION:>/
+1 s/unstable/sarge-backports/
+1 a \
+\
+ * recompiled for sarge. \
+ * No source changes.
More information about the Pkg-tetex-commits
mailing list