[SCM] Debian packaging of texlive-nonbin) branch, master, updated. 8975e0b2634e292e28cade078fab1629c729dc1c
The following commit has been merged in the master branch:
commit a3e1b85432c6ad6ad8863e2bcbc3ea77a8e2aefb
Author: Norbert Preining <preining@debian.org>
Date: Tue Sep 4 09:58:14 2012 +0900
remove svn Id headers, adapt copyright statements, some update to readmes
diff --git a/README b/README
index e50b690..7023681 100644
--- a/README
+++ b/README
@@ -1,6 +1,5 @@
README how to build TeX live for Debian packages
================================================
-$Id$
IMPORTANT NOTE: This file is NOT installed into any Debian package, it is
here only for documentation purpose how to generate the deb source packages
@@ -19,7 +18,7 @@ QUICK HOWTO TO BUILD A SOURCE PACKAGE
perl ./tpm2deb-source.pl make-deb-source $sourcepackage
where $sourcepackage is one of texlive-{base,extra,doc,lang} or 'all'
. texlive-bin is a separate package, that is located parallel to
- the current location in svn. texlive-bin is a completely normal
+ the current location in texlive-bin is a completely normal
Debian package without any meta-generation.
@@ -127,7 +126,7 @@ docs/
src/ (maybe not present)
this contains the last build .orig.tar.gz. If they are present
- new ones are not build. NOT UNDER svn control, so you wont see
+ new ones are not build. NOT UNDER control, so you wont see
it in a check out, but you could create it and put the orig.tar.gz
into it ;-)
diff --git a/all/debian/CHANGES.packaging b/all/debian/CHANGES.packaging
index feb5f28..b011209 100644
--- a/all/debian/CHANGES.packaging
+++ b/all/debian/CHANGES.packaging
@@ -1,7 +1,6 @@
#
# ChangeLog for tpm2deb.pl and relatives
#
-# $Id$
#
texlive-base (2011.20120322-2) unstable
diff --git a/all/debian/README.Debian b/all/debian/README.Debian
index dd955ac..9cf5cd4 100644
--- a/all/debian/README.Debian
+++ b/all/debian/README.Debian
@@ -42,4 +42,3 @@ For disappearing whole collections this is not possible, but the metapackage
`texlive-full' depends on all the necessary items.
-$Id$
diff --git a/all/debian/README.source b/all/debian/README.source
index 2833a82..b63edd5 100644
--- a/all/debian/README.source
+++ b/all/debian/README.source
@@ -6,8 +6,8 @@ a very specific layout and source packages are generated from that.
If you want to know how the *orig.tar.gz* and the *source* packages are
generated, please check out the Debian TeX Live packaging infrastructure at
- http://svn.debian.org/wsvn/debian-tex/texlive2012/texlive-nonbin/trunk
+ http://anonscm.debian.org/gitweb/?p=debian-tex/texlive-nonbin.git
where you will find a README file explaining everything in detail. Or get it
at
- http://svn.debian.org/wsvn/debian-tex/texlive2012/texlive-nonbin/trunk/README
+ http://anonscm.debian.org/gitweb/?p=debian-tex/texlive-nonbin.git;a=blob_plain;f=README
diff --git a/all/debian/bug.script b/all/debian/bug.script
index 3bbe5fc..b7b61f4 100755
--- a/all/debian/bug.script
+++ b/all/debian/bug.script
@@ -1,5 +1,6 @@
#!/bin/bash
-# $Id$
+# bug script for TeX Live packages
+
set -e
cat <<EOF
diff --git a/all/debian/convert-info-files-to-unix.sh b/all/debian/convert-info-files-to-unix.sh
index 2213603..2943fdf 100644
--- a/all/debian/convert-info-files-to-unix.sh
+++ b/all/debian/convert-info-files-to-unix.sh
@@ -4,7 +4,6 @@
#
# info files in texlive are with DOS lineendings. Fix this here
#
-# $Id$
# Norbert Preining, 2005
# GPL
set -e
diff --git a/all/debian/copyright b/all/debian/copyright
index b812d1e..bf0fb19 100644
--- a/all/debian/copyright
+++ b/all/debian/copyright
@@ -790,4 +790,3 @@ and can be found, for each binary package, in
/usr/share/doc/texlive-<name>/Licenses.
-$Id$
diff --git a/all/debian/create-doc-links b/all/debian/create-doc-links
index ad332a9..0a39923 100644
--- a/all/debian/create-doc-links
+++ b/all/debian/create-doc-links
@@ -2,7 +2,7 @@
# create-doc-links
#
# (c) 2006 Norbert Preining
-# $Id$
+#
# create links from every file under /usr/share/doc/$1/ to
# /usr/share/doc/$2/
#
diff --git a/all/debian/fix-bin-symlink-targets-permissions.sh b/all/debian/fix-bin-symlink-targets-permissions.sh
index d69ec64..6e270ee 100644
--- a/all/debian/fix-bin-symlink-targets-permissions.sh
+++ b/all/debian/fix-bin-symlink-targets-permissions.sh
@@ -1,5 +1,4 @@
#!/bin/bash
-# $Id$
#
# TeX Live 2008 ships many "binaries" as symlinks to ../../texmf-*/...
# we make sure that the link targets have executable bit set
diff --git a/all/debian/fix-manpages.sh b/all/debian/fix-manpages.sh
index 23adcba..04db7fa 100644
--- a/all/debian/fix-manpages.sh
+++ b/all/debian/fix-manpages.sh
@@ -1,5 +1,4 @@
#!/bin/bash
-# $Id$
# fix-manpages.sh
#
# Several manpages in TeX live have smaller or bigger flaws like:
diff --git a/all/debian/generate-license-file b/all/debian/generate-license-file
index 5d58c7c..743c0b0 100644
--- a/all/debian/generate-license-file
+++ b/all/debian/generate-license-file
@@ -1,6 +1,5 @@
#
# generate-license-file
-# $Id$
# (c) 2006 Norbert Preining
#
diff --git a/all/debian/merge-dist-tree b/all/debian/merge-dist-tree
index 5be7030..094c7d2 100644
--- a/all/debian/merge-dist-tree
+++ b/all/debian/merge-dist-tree
@@ -1,6 +1,5 @@
#
# merge-dist-tree
-# $Id$
# (c) 2006 Norbert Preining
#
# merge tree $1 into destination $2
diff --git a/all/debian/preinst.pre b/all/debian/preinst.pre
index 9c22fd2..37211fb 100644
--- a/all/debian/preinst.pre
+++ b/all/debian/preinst.pre
@@ -1,5 +1,4 @@
# preinst.pre
-# $Id$
# we want to be sure that experimental versions are purged before
# the first unstable is installed
# furthermore check that we are at least at version 2005 for the
diff --git a/all/debian/rules.in b/all/debian/rules.in
index 256f209..91245fc 100755
--- a/all/debian/rules.in
+++ b/all/debian/rules.in
@@ -2,7 +2,6 @@
#!/usr/bin/make -f
#
# debian/rules file for <:=$srcpackage:>
-# $Id$
PACKAGES=<:=$binpackages:>
METAPACKAGES=<:=$metapackages:>
diff --git a/all/debian/tpm2deb-bin.pl b/all/debian/tpm2deb-bin.pl
index 317746f..54d2187 100755
--- a/all/debian/tpm2deb-bin.pl
+++ b/all/debian/tpm2deb-bin.pl
@@ -2,9 +2,7 @@
#
# tpm2deb-bin.pl
# machinery to create debian packages from TeX Live depot
-# (c) 2005, 2006 Norbert Preining
-#
-# $Id: tpm2deb.pl 2080 2006-12-15 12:03:49Z preining $
+# (c) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Norbert Preining
#
# configuration is done via the file tpm2deb.cfg
#
diff --git a/all/debian/tpm2deb.cfg b/all/debian/tpm2deb.cfg
index fcb5012..5db0ae6 100644
--- a/all/debian/tpm2deb.cfg
+++ b/all/debian/tpm2deb.cfg
@@ -2,8 +2,6 @@
# tpm2deb.cfg
# (c) 2005-2012 Norbert Preining
#
-# $Id$
-#
# describe relations between texlive and other debian packages, but als
# which packages and files should be blacklisted
# and the filemappings
@@ -11,7 +9,7 @@
# For a description of the format of this file please see
# the toplevel README file
#
-# THIS IS FOR TEXLIVE 2011!!!!!!!!!!!!
+# THIS IS FOR TEXLIVE 2012!!!!!!!!!!!!
#
# we have to keep texlive-bin here so that we can change the dependency
# on texlive-binaries for packages:
diff --git a/all/debian/tpm2debcommon.pm b/all/debian/tpm2debcommon.pm
index 723b782..9207678 100755
--- a/all/debian/tpm2debcommon.pm
+++ b/all/debian/tpm2debcommon.pm
@@ -2,9 +2,7 @@
#
# tpm2deb-common.pl
# machinery to create debian packages from TeX Live depot
-# (c) 2005, 2006, 2007, 2008 Norbert Preining
-#
-# $Id$
+# (c) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Norbert Preining
#
# configuration is done via the file tpm2deb.cfg
#
diff --git a/all/debian/update-link-files.sh b/all/debian/update-link-files.sh
index c4d024f..cc3fe57 100644
--- a/all/debian/update-link-files.sh
+++ b/all/debian/update-link-files.sh
@@ -1,7 +1,6 @@
#!/bin/bash
#
# update-link-files.sh
-# $Id$
#
# This script serves two purposes:
# 1) it copies the content of $package.links.dist to $package.links
diff --git a/scripts/tex-filter-debdiff.py b/scripts/tex-filter-debdiff.py
index 472ba14..a259755 100755
--- a/scripts/tex-filter-debdiff.py
+++ b/scripts/tex-filter-debdiff.py
@@ -19,7 +19,6 @@
# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
# Boston, MA 02110-1301 USA.
#
-# $Id$
import sys, os, re, getopt
diff --git a/scripts/tpm2deb-tool.pl b/scripts/tpm2deb-tool.pl
index a4ccedd..1e62c18 100755
--- a/scripts/tpm2deb-tool.pl
+++ b/scripts/tpm2deb-tool.pl
@@ -4,8 +4,6 @@
# machinery to create debian packages from TeX Live depot
# (c) 2005, 2006 Norbert Preining
#
-# $Id: tpm2deb.pl 2080 2006-12-15 12:03:49Z preining $
-#
# configuration is done via the file tpm2deb.cfg
#
diff --git a/tpm2deb-source.pl b/tpm2deb-source.pl
index cf2fa1a..ca05d56 100755
--- a/tpm2deb-source.pl
+++ b/tpm2deb-source.pl
@@ -2,9 +2,7 @@
#
# tpm2deb-source.pl
# machinery to create debian packages from TeX Live depot
-# (c) 2005, 2006, 2007, 2008, 2009, 2010, 2011 Norbert Preining
-#
-# $Id$
+# (c) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Norbert Preining
#
# configuration is done via the file tpm2deb.cfg
#
@@ -306,9 +304,9 @@ sub make_orig_tar {
system("find $texlivedest/texmf-doc/ -type f -print0 | xargs -0 chmod -x") == 0
or die("Cannot remove unwanted execution permissions");
}
- # remove any svn directories
- system("find $texlivedest -name '.svn' | xargs rm -rf") == 0
- or die("Error while removing svn directories");
+ # remove any git directories
+ system("find $texlivedest -name '.git' | xargs rm -rf") == 0
+ or die("Error while removing git directories");
#
# make the original source package
#
@@ -457,8 +455,8 @@ sub make_deb_source {
or die("Error copying common files");
system ("rm $tmpdir/debian/rules.in") == 0
or die("Error removing rules.in");
- system ("find $tmpdir/ -name .svn -type d -print0 | xargs -0 rm -rf") == 0
- or die("Error removing .svn directories");
+ system ("find $tmpdir/ -name .git -type d -print0 | xargs -0 rm -rf") == 0
+ or die("Error removing .git directories");
system ("cp -a $mydir/$package/* $tmpdir/") == 0
or die("Error copying package-specific files");
@@ -479,8 +477,8 @@ sub make_deb_source {
or die("Cannot change permissions of $debdest/rules");;
make_deb_control($package,"$debdest/control");
- system ("find $tmpdir/ -name .svn -type d -print0 | xargs -0 rm -rf") == 0
- or die("Error removing .svn directories");
+ system ("find $tmpdir/ -name .git -type d -print0 | xargs -0 rm -rf") == 0
+ or die("Error removing .git directories");
#
# lintian override files
#
--
Debian packaging of texlive-nonbin)
Reply to: