[SCM] Debian packaging of texlive-nonbin) branch, master, updated. debian/2013.20130523-1-7-g8d3af39
The following commit has been merged in the master branch:
commit 282386faf90ad6930b83f1106135698f4e94a95e
Author: Norbert Preining <preining@debian.org>
Date: Fri May 24 12:50:32 2013 +0900
get rid of \.root handling and move to $pkg.install files
diff --git a/README b/README
index fa55b0f..1434ad6 100644
--- a/README
+++ b/README
@@ -221,7 +221,6 @@ which does the following for each binary package $pkg
- finally the maintainer scripts are created (see below 5a)
After this the debian/rules file continues and does the following
(current situation) for each $binpkg:
- - merge the files from debian/$binpkg.root into the install dir
- generate the license file
- remove the tpm files
- install lintian override, bug script and control files
@@ -251,13 +250,6 @@ Time done: at source patching time, before building
Advantage: the usual Debian way, but it circumvents quilt
Disadvantage: no binary files possible
-4.1b) add the file to the finished tree
-------------------------------------
-you can add files to the *final* tree by putting them into
- trunk/<src-package>/debian/<bin-package-name>.root/
-Example:
- trunk/texlive-base/debian/texlive-latex-base.root/usr/share/texmf-texlive/tex/latex/fancyhdr/fancyheadings.sty
-adds the file fancyheadings to the final package texlive-latex-base.
Time done: after build time, before actually packaging the debs (more or less)
Advantage: binary files can be included .uu encoded and are automatically
diff --git a/all/debian/merge-dist-tree b/all/debian/merge-dist-tree
deleted file mode 100644
index 094c7d2..0000000
--- a/all/debian/merge-dist-tree
+++ /dev/null
@@ -1,37 +0,0 @@
-#
-# merge-dist-tree
-# (c) 2006 Norbert Preining
-#
-# merge tree $1 into destination $2
-# files in tree $1 with extension .uu are uudecoded installed into $2
-#
-
-src="$1"
-dst="$2"
-
-if ! [ -d "$dst" ] ; then
- echo "please first call debian/rules install!"
- exit 1
-fi
-
-if ! [ -d "$src" ] ; then
- echo "first argument must be a directory: $src"
- exit 1
-fi
-
-for f in $(cd "$src"; find . -type f) ; do
- bn=$(basename "$f")
- dn=$(dirname "$f")
- mkdir -p "$dst/$dn"
- case "$f" in
- *.uu)
- bn=$(basename "$f" .uu)
- uudecode -o "$dst/$dn/$bn" "$src/$f"
- ;;
- *)
- cp -a "$src/$f" "$dst/$dn/"
- ;;
- esac
-done
-
-
diff --git a/all/debian/rules.in b/all/debian/rules.in
index 3e8bcfe..5faa11a 100755
--- a/all/debian/rules.in
+++ b/all/debian/rules.in
@@ -39,7 +39,6 @@ install-stamp: build-stamp
mkdir -p texmf/web2c
perl debian/tpm2deb-bin.pl --nosource $(PACKAGES) $(METAPACKAGES)
for i in $(PACKAGES) $(METAPACKAGES) ; do \
- if [ -d debian/$$i.root ] ; then bash debian/merge-dist-tree debian/$$i.root debian/$$i ; fi ; \
bash debian/generate-license-file $$i ; \
install -D --mode=644 debian/$$i.override debian/$$i/usr/share/lintian/overrides/$$i ; \
install -D --mode=755 debian/bug.script debian/$$i/usr/share/bug/$$i/script ; \
diff --git a/all/debian/update-link-files.sh b/all/debian/update-link-files.sh
deleted file mode 100644
index cc3fe57..0000000
--- a/all/debian/update-link-files.sh
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/bash
-#
-# update-link-files.sh
-#
-# This script serves two purposes:
-# 1) it copies the content of $package.links.dist to $package.links
-# 2) it adjusts the links in $package.links.generated to files which
-# have been compressed by dh_compress
-#
-# Norbert Preining, 2005-2006
-# GPL
-set -e
-shopt -s nullglob
-
-#
-# first copy the dist link files to the normal
-for i in debian/*.links.dist ; do
- cp $i debian/`basename $i .dist`
-done
-
-for i in debian/*.links.generated ; do
- bn=`basename $i .links.generated`
- while read a b ; do
- case "$a" in
- usr/share/doc/$bn/* )
- if [ -r debian/$bn/$a ] ; then
- echo "$a $b"
- else
- if [ -r debian/$bn/$a.gz ] ; then #
- echo "$a.gz $b.gz"
- else
- echo "Missing $a" >&2
- fi
- fi
- ;;
- * )
- echo "$a $b"
- ;;
- esac
- done < $i >> debian/$bn.links
-done
-
diff --git a/texlive-base/debian/texlive-base.root/usr/share/texlive/debian/debianize-fmtutil b/texlive-base/debian/debianize-fmtutil
similarity index 100%
rename from texlive-base/debian/texlive-base.root/usr/share/texlive/debian/debianize-fmtutil
rename to texlive-base/debian/debianize-fmtutil
diff --git a/texlive-base/debian/texlive-base.install b/texlive-base/debian/texlive-base.install
new file mode 100644
index 0000000..0447390
--- /dev/null
+++ b/texlive-base/debian/texlive-base.install
@@ -0,0 +1,2 @@
+debian/tl-paper usr/bin/
+debian/debianize-fmtutil usr/share/texlive/debian/
diff --git a/texlive-base/debian/texlive-base.root/usr/bin/tl-paper b/texlive-base/debian/tl-paper
similarity index 100%
rename from texlive-base/debian/texlive-base.root/usr/bin/tl-paper
rename to texlive-base/debian/tl-paper
diff --git a/texlive-lang/debian/texlive-lang-cjk.root/usr/share/texlive/texmf-dist/metapost/pmetapost/pmpost.mp b/texlive-lang/debian/pmpost.mp
similarity index 100%
rename from texlive-lang/debian/texlive-lang-cjk.root/usr/share/texlive/texmf-dist/metapost/pmetapost/pmpost.mp
rename to texlive-lang/debian/pmpost.mp
diff --git a/texlive-lang/debian/texlive-lang-cjk.install b/texlive-lang/debian/texlive-lang-cjk.install
new file mode 100644
index 0000000..7bfa4c9
--- /dev/null
+++ b/texlive-lang/debian/texlive-lang-cjk.install
@@ -0,0 +1 @@
+debian/pmpost.mp usr/share/texlive/texmf-dist/metapost/pmetapost/
--
Debian packaging of texlive-nonbin)
Reply to: