[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[SCM] Debian packaging of tex-common) branch, master, updated. 4.00-1-gb9caf34



The following commit has been merged in the master branch:
commit b9caf3439b4972e6dd25313404b896750323f320
Author: Norbert Preining <preining@debian.org>
Date:   Wed Dec 19 12:09:13 2012 +0900

    dh_installtex automatically generates proper version for doc files loc
    add NEWS item

diff --git a/debian/NEWS b/debian/NEWS
index d5615f8..abd40f5 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -1,3 +1,15 @@
+tex-common (4.01) experimental; urgency=low
+
+  * moving files from /usr/share/doc/texmf to /usr/share/texmf/doc
+    when using dh_installtex:
+    - please Build-depend on tex-common (>= 4.01)
+    - install the files in /usr/share/texmf/doc
+    no further steps are necessary, dh_installtex automatically adds
+    the necessary dependencies (either >= 4 if /usr/share/texmf/doc
+    is present in the package, otherwise >= 3)
+
+ -- Norbert Preining <preining@debian.org>  Wed, 19 Dec 2012 13:09:07 +0900
+
 tex-common (4.00) experimental; urgency=low
 
   * documentation file changes:
diff --git a/debian/changelog b/debian/changelog
index 4f56854..015fcde 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+tex-common (4.01) experimental; urgency=low
+
+  * dh_installtex: if the dir /usr/share/texmf/doc is found in the
+    a package, then the generated tex-common dependency is >= 4
+
+ -- Norbert Preining <preining@debian.org>  Wed, 19 Dec 2012 13:10:52 +0900
+
 tex-common (4.00) experimental; urgency=low
 
   * drop the link from /u/s/texmf/doc -> /u/s/doc/texmf
diff --git a/scripts/dh_installtex b/scripts/dh_installtex
index 2eca63f..7a10d64 100755
--- a/scripts/dh_installtex
+++ b/scripts/dh_installtex
@@ -210,6 +210,10 @@ C</usr/share/texlive/texmf-dist>.
 
 =head1 NOTES
 
+"dh_installtex" adds a dependency relation onto tex-common to misc:Depends.
+If files are installed into /usr/share/texmf/doc, the version is >=4,
+otherwise >=3.
+
 Note that this command is not idempotent. "dh_clean -k" should be called
 between invocations of this command, unless using the B<-n> option.
 Otherwise, it may cause multiple instances of the same text to be added
@@ -668,9 +672,19 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 		autoscript($package, "postrm",   "postrm-tex", "s|#FORMATS#|@postrmfmtdata|; s|#WHATTODO#|@whattodo|");
 	}
 
+	# deduce dependency level
+	# from v3 to v4 we removed the link 
+	# /usr/share/texmf/doc -> /usr/share/doc/texmf
+	# thus, if packages are installing files into /usr/share/texmf/doc
+	# then it should depend on tex-common >= 4, otherwise >=3 is enough
+	my $tcvers = ">= 3";
+	if (-d "$tmp/usr/share/texmf/doc") {
+		$tcvers = ">= 4";
+	}
+
 	# for trigger support
 	addsubstvar($package, "misc:Depends", "dpkg", ">= 1.14.18");
-	addsubstvar($package, "misc:Depends", "tex-common", ">= 3");
+	addsubstvar($package, "misc:Depends", "tex-common", $tcvers);
 }
 
 =head1 SEE ALSO

-- 
Debian packaging of tex-common)


Reply to: