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

[Frank Küster]

Author: frank
Date: 2006-04-03 12:55:45 +0000 (Mon, 03 Apr 2006)
New Revision: 1158

Modified:
   tetex-bin/trunk/debian/changelog
   tetex-bin/trunk/debian/rules
   tetex-bin/trunk/debian/rules.in
Log:
  * Backports:  Since libpoppler is now available on backports.org, use it
    again, and remove the included xpdf sources before build


Modified: tetex-bin/trunk/debian/changelog
===================================================================
--- tetex-bin/trunk/debian/changelog	2006-04-03 12:51:39 UTC (rev 1157)
+++ tetex-bin/trunk/debian/changelog	2006-04-03 12:55:45 UTC (rev 1158)
@@ -23,6 +23,8 @@
   * Remove _all_ generated *.info and dir, dir.old files during
     debian/rules clean
   * Version conflicts with cweb and ctie [jdg]
+  * Backports:  Since libpoppler is now available on backports.org, use it
+    again, and remove the included xpdf sources before build
   * Translations:
     - Update Dutch debconf translation, thanks to Vincent Zweije
       <zweije at xs4all.nl> (closes: #358461) [frank]
@@ -33,7 +35,7 @@
     - Update Lithuanian debconf translation, thanks to Kęstutis Biliūnas
       <kebil at kaunas.init.lt> (closes: #360283) [frank]
 
- -- Frank Küster <frank at debian.org>  Sat,  1 Apr 2006 14:37:18 +0200
+ -- Frank Küster <frank at debian.org>  Mon,  3 Apr 2006 13:54:18 +0200
 
 tetex-bin (3.0-15) unstable; urgency=medium
 

Modified: tetex-bin/trunk/debian/rules
===================================================================
--- tetex-bin/trunk/debian/rules	2006-04-03 12:51:39 UTC (rev 1157)
+++ tetex-bin/trunk/debian/rules	2006-04-03 12:55:45 UTC (rev 1158)
@@ -321,13 +321,9 @@
 #  targets to compile for sarge
 ####################################################################
 
-CHANGED_FILES_SARGE = debian/changelog debian/rules.in debian/control
+CHANGED_FILES_SARGE = debian/changelog
+EXCHANGED_FILES_SARGE =
 
-# 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/changelog.sed
 	for file in $(CHANGED_FILES_SARGE); do \
 	    cp $${file} debian/sarge/`basename $${file}`.sid; \
@@ -335,8 +331,8 @@
 
 	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/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; \

Modified: tetex-bin/trunk/debian/rules.in
===================================================================
--- tetex-bin/trunk/debian/rules.in	2006-04-03 12:51:39 UTC (rev 1157)
+++ tetex-bin/trunk/debian/rules.in	2006-04-03 12:55:45 UTC (rev 1158)
@@ -326,13 +326,9 @@
 #  targets to compile for sarge
 ####################################################################
 
-CHANGED_FILES_SARGE = debian/changelog debian/rules.in debian/control
+CHANGED_FILES_SARGE = debian/changelog
+EXCHANGED_FILES_SARGE =
 
-# 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/changelog.sed
 	for file in $(CHANGED_FILES_SARGE); do \
 	    cp $${file} debian/sarge/`basename $${file}`.sid; \
@@ -340,8 +336,8 @@
 
 	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/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; \