[equivs] 03/36: Import Debian version 2.0.4
Axel Beckert
abe at deuxchevaux.org
Fri Jul 28 23:04:34 UTC 2017
This is an automated email from the git hooks/post-receive script.
abe pushed a commit to branch master
in repository equivs.
commit 1611b31738d2f1d2151c735b23594cf6a8bd7a9e
Author: Martin Bialasinski <martinb at debian.org>
Date: Fri Jun 29 22:04:01 2001 +0200
Import Debian version 2.0.4
equivs (2.0.4) unstable; urgency=low
* Added Preinst, Postinst, Prerm and Postrm entries to the control file
for usage with maintainerscripts. Closes: #101198
equivs (2.0.3) unstable; urgency=low
* provide a --arch switch for "cross-compiling" using dpkg-architecture
closes: #87791
equivs (2.0.2) unstable; urgency=low
* Add build-depends. Closes: #70284
equivs (2.0.1) unstable; urgency=low
* Make equivs-control print usage information, on any option.
closes: #78799
equivs (2.0) unstable; urgency=low
* No more TODO, remove file
* Make full FHS complient (change docs etc.)
* Move files from /usr/lib/equivs to /usr/share/equivs
* Fix documentation, closes: #66771
* Call it version 2.0
---
debian/README.Debian | 14 ++++----
debian/TODO | 2 --
debian/changelog | 37 ++++++++++++++++++++++
debian/control | 5 +--
debian/copyright | 4 +--
debian/dirs | 4 +--
debian/equivs-build.pod | 22 ++++++++++---
debian/equivs-control.pod | 8 ++---
usr/bin/equivs-build | 30 ++++++++++++++----
usr/bin/equivs-control | 12 +++++--
usr/{lib => share}/equivs/template.ctl | 0
.../equivs/template/debian/README.Debian.in | 0
.../equivs/template/debian/control.in | 0
.../equivs/template/debian/copyright | 0
usr/{lib => share}/equivs/template/debian/rules | 0
15 files changed, 106 insertions(+), 32 deletions(-)
diff --git a/debian/README.Debian b/debian/README.Debian
index 0a1e3ca..a8f0d2e 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -42,7 +42,7 @@ subdirectory "equivs", containing the files necessary to create
a Debian package and build that package.
You need a control file for make-equivs. You will find examples
-of control files in /usr/doc/equivs/examples.
+of control files in /usr/share/doc/equivs/examples.
The control file has a structure like the control files in "real"
Debian packages, but it doesn't have to define all keys, as default
@@ -65,13 +65,13 @@ There are four additional fields that can be used:
will be used.
- Extra-Files: A comma-seperated list of files to copy to the
- /usr/doc/packagename directory.
+ /usr/share/doc/packagename directory.
Check the Debian Packaging Manual Chapter 8, if you are unsure
about the different level of package relationsships (dependencies)
-http://www.debian.org/doc/packaging-manuals/packaging.html/ch-relationships.html
-, also available in the packaging-manual package.
+http://www.debian.org/doc/packaging-manuals/packaging.html/ch-relationships.html,
+also available in the packaging-manual package.
You can create full packages, suitable for a upload
to the Debian servers. To do this, use the option
@@ -91,7 +91,7 @@ a. cd /tmp
b.1. equivs-control ns-control
or
-b.2. cp /usr/doc/equivs/examples/<a control file> ns-control
+b.2. cp /usr/share/doc/equivs/examples/<a control file> ns-control
c. edit ns-control
@@ -102,6 +102,6 @@ e. su -
f. dpkg -i /tmp/ns-dummy_1.0_all.deb
Deinstallation of this package is only possible when all pending
-dependency issues are properly resolved in some other way.
+dependencies are properly resolved in some other way.
-Martin Bialasinski <martinb at debian.org>, Mon, 4 Jan 1999 12:35:16 +0100
+Martin Bialasinski <martinb at debian.org>, Fri, 7 Jul 2000 17:56:32 +0200
diff --git a/debian/TODO b/debian/TODO
deleted file mode 100644
index f104141..0000000
--- a/debian/TODO
+++ /dev/null
@@ -1,2 +0,0 @@
-Man files for the scripts
-"Usage" message in the scripts
diff --git a/debian/changelog b/debian/changelog
index 6cb8529..33aa447 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,40 @@
+equivs (2.0.4) unstable; urgency=low
+
+ * Added Preinst, Postinst, Prerm and Postrm entries to the control file
+ for usage with maintainerscripts. Closes: #101198
+
+ -- Martin Bialasinski <martinb at debian.org> Fri, 29 Jun 2001 22:04:01 +0200
+
+equivs (2.0.3) unstable; urgency=low
+
+ * provide a --arch switch for "cross-compiling" using dpkg-architecture
+ closes: #87791
+
+ -- Martin Bialasinski <martinb at debian.org> Tue, 13 Mar 2001 22:32:44 +0100
+
+equivs (2.0.2) unstable; urgency=low
+
+ * Add build-depends. Closes: #70284
+
+ -- Martin Bialasinski <martinb at debian.org> Thu, 21 Dec 2000 14:35:39 +0100
+
+equivs (2.0.1) unstable; urgency=low
+
+ * Make equivs-control print usage information, on any option.
+ closes: #78799
+
+ -- Martin Bialasinski <martinb at debian.org> Wed, 6 Dec 2000 23:49:14 +0100
+
+equivs (2.0) unstable; urgency=low
+
+ * No more TODO, remove file
+ * Make full FHS complient (change docs etc.)
+ * Move files from /usr/lib/equivs to /usr/share/equivs
+ * Fix documentation, closes: #66771
+ * Call it version 2.0
+
+ -- Martin Bialasinski <martinb at debian.org> Fri, 7 Jul 2000 17:57:57 +0200
+
equivs (1.999.12) unstable; urgency=low
* Fixed some perl -w warnings
diff --git a/debian/control b/debian/control
index 7d2d388..781d0ab 100644
--- a/debian/control
+++ b/debian/control
@@ -1,8 +1,9 @@
Source: equivs
Section: admin
-Priority: optional
+Priority: extra
Maintainer: Martin Bialasinski <martinb at debian.org>
-Standards-Version: 3.0.1
+Standards-Version: 3.1.0
+Build-Depends: debhelper
Package: equivs
Depends: perl|perl5, debhelper, dpkg-dev, devscripts, make, fakeroot
diff --git a/debian/copyright b/debian/copyright
index f982330..dbf28b6 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -5,9 +5,9 @@ The files in this package are free software; you can redistribute them
and/or modify them under the terms of the GNU General Public License
as published by the Free Software Foundation; either version 2, or (at
your option) any later version. Full text of the license can be found
-at /usr/doc/copyright/GPL
+at /usr/share/common-licenses/GPL
-For the control file parser used in make-equivs:
+For the control file parser used in equivs-build:
doc-base Copyright (C) 1997,1998 Christian Schwarz,
Also licensed under the GPL2
diff --git a/debian/dirs b/debian/dirs
index 856b78c..5096ff8 100644
--- a/debian/dirs
+++ b/debian/dirs
@@ -1,3 +1,3 @@
-usr/lib/equivs
-usr/lib/equivs/debian
+usr/share/equivs
+usr/share/equivs/debian
usr/bin
\ No newline at end of file
diff --git a/debian/equivs-build.pod b/debian/equivs-build.pod
index c9b9ae6..2278d3c 100644
--- a/debian/equivs-build.pod
+++ b/debian/equivs-build.pod
@@ -4,7 +4,7 @@ equivs-build - make a debian package to register local software
=head1 SYNOPSIS
-B<equivs-build [--full|-f] controlfile>
+B<equivs-build [--full|-f] [--arch=foo|-a=foo] controlfile>
=head1 DESCRIPTION
@@ -49,14 +49,20 @@ name and the dependency information used.
The copyright file to by used. If ommited, the GPL 2
will be used.
+=item Preinst: Postinst: Prerm: Postrm:
+
+Maintainerscripts executed before/after installation/removal
+of the package. See the Debian developers reference for a
+description (package developers-reference).
+
=item Extra-Files:
A comma-seperated list of files to copy to the
-/usr/doc/packagename directory.
+/usr/share/doc/packagename directory.
=back
-See /usr/doc/equivs/README.Debian for more information.
+See /usr/share/doc/equivs/README.Debian for more information.
=head1 OPTIONS
@@ -68,10 +74,16 @@ Do a complete build. debuild will be called, that is a
full package will be build and signed, suitable for a upload
to the Debian servers.
-The ID used to signed is taken from, in that order, the User from
+The ID used to signed is taken from, in that order, the user from
the last entry of a supplied changelog, the Maintainer: field in the
equivs control file, the local username.
+=item --arch | -a
+
+Build package for architecture the specified architecture. Used
+e.g. for building packages for hurd under linux. equivs-build uses
+dpkg-architecture to provide this facility.
+
=back
=head1 DISTRIBUTION
@@ -84,4 +96,4 @@ Martin Bialasinski <martinb at debian.org>
=head1 SEE ALSO
-equivs-control(1), /usr/doc/equivs/README.Debian
+equivs-control(1), /usr/share/doc/equivs/README.Debian
diff --git a/debian/equivs-control.pod b/debian/equivs-control.pod
index 7a3033d..f03c00c 100644
--- a/debian/equivs-control.pod
+++ b/debian/equivs-control.pod
@@ -1,15 +1,15 @@
=head1 NAME
-make-control - create a configuration file for make-equivs
+equivs-control - create a configuration file for equivs-build
=head1 SYNOPSIS
-B<make-control filename>
+B<equivs-control filename>
=head1 DESCRIPTION
This programm copies a template control file as needed by
-the make-equivs command as the specified filename.
+the equivs-control command as the specified filename.
You then have to edit the created file to reflect your choices.
The controlfile has the form used by regular controlfiles
@@ -20,7 +20,7 @@ in the generated file.
=over 4
-=item F</usr/lib/equivs/template.ctl>
+=item F</usr/share/equivs/template.ctl>
This is the template file that gets copied to the given filename.
diff --git a/usr/bin/equivs-build b/usr/bin/equivs-build
index 10a1b4f..53f5ce8 100755
--- a/usr/bin/equivs-build
+++ b/usr/bin/equivs-build
@@ -14,16 +14,22 @@ use File::Basename;
sub usage{
print <<EOU;
-Usage: equivs [--full|-f] controlfile
+Usage: equivs-build [--full|-f] [--arch=foo|-a=foo] controlfile
controlfile is the name of an equivs controlfile.
You can use "equivs-control filename" to create one.
+
+--full : full build incl. signing etc. suitable for
+ upload to Debian
+--arch : Build package for architecture foo. Used e.g. for building
+ packages for hurd under linux.
EOU
exit 1;
}
my $full_package;
-
-my $result = GetOptions("full" => \$full_package);
+my $arch;
+my $result = GetOptions("full" => \$full_package,
+ "arch=s" => \$arch);
usage() if (!$result);
my $debug=0;
@@ -60,7 +66,7 @@ mkdir $builddir, 0755 or die "Can not create build directory $builddir: $!";
# Copy the default files
-my $ret = system("cp -R /usr/lib/equivs/template/* $builddir");
+my $ret = system("cp -R /usr/share/equivs/template/* $builddir");
if ( 0xffff & $ret != 0 ) {
die "Error on copy of the template files: $!";
@@ -95,6 +101,14 @@ foreach my $file (@extra_files){
}
close DOCS;
+foreach my $script (("Preinst","Postinst","Prerm","Postrm")) {
+ next unless defined $control{$script};
+ my $destination = lc($script);
+ copy $control{$script}, "$builddir/debian/$destination" or
+ die "Cannot copy $script to $builddir/debian/$destination\n";
+}
+
+
# Write the control file
&write_control_file;
@@ -148,14 +162,18 @@ if ($control{"Copyright"}) {
unlink "$builddir/debian/README.Debian.in";
unlink "$builddir/debian/control.in";
+# Set architecture for crosscompiling, if requested
+
+my $arch_cmd = $arch ? "dpkg-architecture -a$arch -c " : "";
+
# Create the package
chdir $builddir;
if ($full_package){
- $ret = system("debuild -rfakeroot");
+ $ret = system("$arch_cmd debuild -rfakeroot");
} else {
- $ret = system("fakeroot debian/rules binary");
+ $ret = system("$arch_cmd fakeroot debian/rules binary");
}
if ( 0xffff & $ret != 0 ) {
diff --git a/usr/bin/equivs-control b/usr/bin/equivs-control
index c8142a9..9fb8196 100755
--- a/usr/bin/equivs-control
+++ b/usr/bin/equivs-control
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
if [ $# -eq 0 ]
then
@@ -7,5 +7,13 @@ then
exit 1
fi
-cp /usr/lib/equivs/template.ctl $1
+ case $1 in
+ -*)
+ echo Usage: $0 filename
+ echo filename is the name of the equivs control file to create
+ exit 1
+ ;;
+ esac
+
+cp /usr/share/equivs/template.ctl $1
diff --git a/usr/lib/equivs/template.ctl b/usr/share/equivs/template.ctl
similarity index 100%
rename from usr/lib/equivs/template.ctl
rename to usr/share/equivs/template.ctl
diff --git a/usr/lib/equivs/template/debian/README.Debian.in b/usr/share/equivs/template/debian/README.Debian.in
similarity index 100%
rename from usr/lib/equivs/template/debian/README.Debian.in
rename to usr/share/equivs/template/debian/README.Debian.in
diff --git a/usr/lib/equivs/template/debian/control.in b/usr/share/equivs/template/debian/control.in
similarity index 100%
rename from usr/lib/equivs/template/debian/control.in
rename to usr/share/equivs/template/debian/control.in
diff --git a/usr/lib/equivs/template/debian/copyright b/usr/share/equivs/template/debian/copyright
similarity index 100%
rename from usr/lib/equivs/template/debian/copyright
rename to usr/share/equivs/template/debian/copyright
diff --git a/usr/lib/equivs/template/debian/rules b/usr/share/equivs/template/debian/rules
similarity index 100%
rename from usr/lib/equivs/template/debian/rules
rename to usr/share/equivs/template/debian/rules
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/equivs.git
More information about the Pkg-perl-cvs-commits
mailing list