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

[Frank Küster]

Author: frank
Date: 2006-09-29 18:09:35 +0000 (Fri, 29 Sep 2006)
New Revision: 1650

Modified:
   tetex-bin/trunk/debian/changelog
   tetex-bin/trunk/debian/rules
   tetex-bin/trunk/debian/rules.in
Log:
these are the last changes for 3.0-19, obviously forgot to commit


Modified: tetex-bin/trunk/debian/changelog
===================================================================
--- tetex-bin/trunk/debian/changelog	2006-09-29 13:50:10 UTC (rev 1649)
+++ tetex-bin/trunk/debian/changelog	2006-09-29 18:09:35 UTC (rev 1650)
@@ -1,4 +1,4 @@
-tetex-bin (3.0-18.1) UNRELEASED; urgency=low
+tetex-bin (3.0-19) unstable; urgency=low
 
   * Fix typo in the changelog entry of 3.0-17, s/nonexitant/nonexistent/. [frank]
   * Install documentation in /usr/share/doc/tetex-doc/tetex, not in
@@ -15,14 +15,15 @@
     - stolen from TeX-Live repository of Norbert Preining
     - kills another lintian error
   * Remove last debconf question (or rather, a note), and add a remark in
-    README.Debian.sgml instead (closes: #388972, #382965) [frank]
+    README.Debian.sgml instead (closes: #388972, #382965).  Consequently,
+    we can remove the Build-Dependency on po-debconf. [frank]
   * 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 <frank at debian.org>  Mon, 25 Sep 2006 18:02:50 +0200
+ -- Frank Küster <frank at debian.org>  Wed, 27 Sep 2006 12:11:23 +0200
 
 tetex-bin (3.0-18) unstable; urgency=low
 

Modified: tetex-bin/trunk/debian/rules
===================================================================
--- tetex-bin/trunk/debian/rules	2006-09-29 13:50:10 UTC (rev 1649)
+++ tetex-bin/trunk/debian/rules	2006-09-29 18:09:35 UTC (rev 1650)
@@ -11,7 +11,7 @@
 
 # debian/rules can never be in eperl_files, because it may not be removed
 EPERL_FILES := debian/config debian/preinst debian/postinst debian/prerm debian/postrm \
-   debian/common.functions debian/tetex-bin_install debian/sarge/changelog.sed
+   debian/common.functions debian/tetex-bin_install
 eperl_sourcefiles=debian/variables debian/COPYRIGHT.scripts \
    debian/common.variables debian/common.functions
 eperl_pwd = $(shell pwd)/debian
@@ -84,7 +84,7 @@
 
 configure: configure-stamp
 
-build: build-stamp debian/po/templates.pot
+build: build-stamp
 
 install: $(EPERL_FILES) install-bin install-lib 
 
@@ -167,8 +167,6 @@
 	-rm -f debian/README.Debian.html/*
 	-rmdir debian/README.Debian.html
 
-	debconf-updatepo
-
 	dh_clean
 
 
@@ -205,12 +203,12 @@
 
 	touch configure-stamp
 
-debian/po/templates.pot: debian/templates
-	debconf-updatepo
-	grep "Last-Translator" debian/po/*.po | \
-	  sed -e 's/.*\(<.*@.*>\).*/\1, /g' | \
-	  tr "\n" " " | sed -e 's/,  $$/\n/' \
-	  > debian/recent-translators
+# debian/po/templates.pot: debian/templates
+# 	debconf-updatepo
+# 	grep "Last-Translator" debian/po/*.po | \
+# 	  sed -e 's/.*\(<.*@.*>\).*/\1, /g' | \
+# 	  tr "\n" " " | sed -e 's/,  $$/\n/' \
+# 	  > debian/recent-translators
 
 build-stamp: configure-stamp 
 # comment out the following line if you want to check the build target
@@ -325,13 +323,13 @@
 CHANGED_FILES_SARGE = debian/changelog debian/control
 EXCHANGED_FILES_SARGE =
 
-debian/sarge-stamp: debian/sarge/changelog.sed
+debian/sarge-stamp: 
 	for file in $(CHANGED_FILES_SARGE); do \
 	    cp $${file} debian/sarge/`basename $${file}`.sid; \
 	done
 
 	# needs devscripts in etch or from backports.org
-	debchange -b --newversion 3.0-18.1~bpo.1 "Recompiled for sarge."
+	debchange --distribution sarge-backports -b --newversion 3.0-18.1~bpo.1 "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

Modified: tetex-bin/trunk/debian/rules.in
===================================================================
--- tetex-bin/trunk/debian/rules.in	2006-09-29 13:50:10 UTC (rev 1649)
+++ tetex-bin/trunk/debian/rules.in	2006-09-29 18:09:35 UTC (rev 1650)
@@ -16,7 +16,7 @@
 
 # debian/rules can never be in eperl_files, because it may not be removed
 EPERL_FILES := debian/config debian/preinst debian/postinst debian/prerm debian/postrm \
-   debian/common.functions debian/tetex-bin_install debian/sarge/changelog.sed
+   debian/common.functions debian/tetex-bin_install
 eperl_sourcefiles=debian/variables debian/COPYRIGHT.scripts \
    debian/common.variables debian/common.functions
 eperl_pwd = $(shell pwd)/debian
@@ -89,7 +89,7 @@
 
 configure: configure-stamp
 
-build: build-stamp debian/po/templates.pot
+build: build-stamp
 
 install: $(EPERL_FILES) install-bin install-lib 
 
@@ -172,8 +172,6 @@
 	-rm -f debian/README.Debian.html/*
 	-rmdir debian/README.Debian.html
 
-	debconf-updatepo
-
 	dh_clean
 
 
@@ -210,12 +208,12 @@
 
 	touch configure-stamp
 
-debian/po/templates.pot: debian/templates
-	debconf-updatepo
-	grep "Last-Translator" debian/po/*.po | \
-	  sed -e 's/.*\(<.*@.*>\).*/\1, /g' | \
-	  tr "\n" " " | sed -e 's/,  $$/\n/' \
-	  > debian/recent-translators
+# debian/po/templates.pot: debian/templates
+# 	debconf-updatepo
+# 	grep "Last-Translator" debian/po/*.po | \
+# 	  sed -e 's/.*\(<.*@.*>\).*/\1, /g' | \
+# 	  tr "\n" " " | sed -e 's/,  $$/\n/' \
+# 	  > debian/recent-translators
 
 build-stamp: configure-stamp 
 # comment out the following line if you want to check the build target
@@ -330,7 +328,7 @@
 CHANGED_FILES_SARGE = debian/changelog debian/control
 EXCHANGED_FILES_SARGE =
 
-debian/sarge-stamp: debian/sarge/changelog.sed
+debian/sarge-stamp: 
 	for file in $(CHANGED_FILES_SARGE); do \
 	    cp $${file} debian/sarge/`basename $${file}`.sid; \
 	done