Author: frank
Date: 2006-08-02 15:49:18 +0000 (Wed, 02 Aug 2006)
New Revision: 1542
Removed:
tetex-bin/trunk/debian/sarge/changelog.sed.in
Modified:
tetex-bin/trunk/debian/changelog
tetex-bin/trunk/debian/rules
tetex-bin/trunk/debian/rules.in
tetex-bin/trunk/debian/sarge/control.sed
Log:
Backports:
- Add a Build-Depends on sarge's xlibs-dev to prevent linking against
XOrg
- Use debchange with the new -b option instead of sed to update the
changelog. I hope this will make the backports people happy.
Modified: tetex-bin/trunk/debian/changelog
===================================================================
--- tetex-bin/trunk/debian/changelog 2006-08-01 23:01:01 UTC (rev 1541)
+++ tetex-bin/trunk/debian/changelog 2006-08-02 15:49:18 UTC (rev 1542)
@@ -7,8 +7,13 @@
* Apply the patch to fix a possible texdoctk crash. (closes: #351559)
Thanks to Niko Tyni <[EMAIL PROTECTED]> for investigation! [hilmar-guest]
* Update changelog for 3.0-14. We forgot to close two bugs. [hilmar-guest]
+ * Backports: [frank]
+ - Add a Build-Depends on sarge's xlibs-dev to prevent linking against
+ XOrg
+ - Use debchange with the new -b option instead of sed to update the
+ changelog. I hope this will make the backports people happy.
- -- Frank Küster <[EMAIL PROTECTED]> Tue, 25 Jul 2006 11:04:47 +0200
+ -- Frank Küster <[EMAIL PROTECTED]> Wed, 2 Aug 2006 17:44:28 +0200
tetex-bin (3.0-18) unstable; urgency=low
Modified: tetex-bin/trunk/debian/rules
===================================================================
--- tetex-bin/trunk/debian/rules 2006-08-01 23:01:01 UTC (rev 1541)
+++ tetex-bin/trunk/debian/rules 2006-08-02 15:49:18 UTC (rev 1542)
@@ -322,8 +322,8 @@
# targets to compile for sarge
####################################################################
-CHANGED_FILES_SARGE = debian/changelog
-EXCHANGED_FILES_SARGE =
+CHANGED_FILES_SARGE = debian/changelog debian/control
+EXCHANGED_FILES_SARGE =
debian/sarge-stamp: debian/sarge/changelog.sed
for file in $(CHANGED_FILES_SARGE); do \
@@ -333,7 +333,7 @@
sed -f debian/sarge/changelog.sed debian/sarge/changelog.sid \
> 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
+ 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; \
Modified: tetex-bin/trunk/debian/rules.in
===================================================================
--- tetex-bin/trunk/debian/rules.in 2006-08-01 23:01:01 UTC (rev 1541)
+++ tetex-bin/trunk/debian/rules.in 2006-08-02 15:49:18 UTC (rev 1542)
@@ -327,7 +327,7 @@
# targets to compile for sarge
####################################################################
-CHANGED_FILES_SARGE = debian/changelog
+CHANGED_FILES_SARGE = debian/changelog debian/control
EXCHANGED_FILES_SARGE =
debian/sarge-stamp: debian/sarge/changelog.sed
@@ -335,10 +335,11 @@
cp $${file} debian/sarge/`basename $${file}`.sid; \
done
- sed -f debian/sarge/changelog.sed debian/sarge/changelog.sid \
- > debian/changelog
+ debchange -b --newversion <:=$SARGEVERSION:> "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; \
Deleted: tetex-bin/trunk/debian/sarge/changelog.sed.in
===================================================================
--- tetex-bin/trunk/debian/sarge/changelog.sed.in 2006-08-01 23:01:01 UTC
(rev 1541)
+++ tetex-bin/trunk/debian/sarge/changelog.sed.in 2006-08-02 15:49:18 UTC
(rev 1542)
@@ -1,8 +0,0 @@
-#include "variables"
-s/<:=$VERSION:>/<:=$SARGEVERSION:>/
-1 s/unstable/sarge-backports/
-1 a \
-\
- * recompiled for sarge. \
- * The repository on people.debian.org will no longer be maintained. \
- Instead, backports will be uploaded to www.backports.org. \
Modified: tetex-bin/trunk/debian/sarge/control.sed
===================================================================
--- tetex-bin/trunk/debian/sarge/control.sed 2006-08-01 23:01:01 UTC (rev
1541)
+++ tetex-bin/trunk/debian/sarge/control.sed 2006-08-02 15:49:18 UTC (rev
1542)
@@ -1 +1 @@
-/^Build-Depends:/ [EMAIL PROTECTED], @@
+/^Build-Depends:/ [EMAIL PROTECTED]@, libx11-dev ( < 6.9 )@
_______________________________________________
Pkg-tetex-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-tetex-commits
