[equivs] 04/36: Import Debian version 2.0.7
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 c0bad0c6fb0e396be85dfa70a1879c949bf7ac5b
Author: Peter Samuelson <peter at p12n.org>
Date: Tue Feb 28 02:01:16 2006 -0600
Import Debian version 2.0.7
equivs (2.0.7) unstable; urgency=low
* New maintainer. (Closes: #350835)
* Acknowledge NMU. (Closes: #201852, #218443, #237963, #251547)
* Add file COPYING, the GNU GPL v2, to top level of source tree.
* Update both build-time and runtime use of debhelper to v4.
(Closes: #320619)
* debian/copyright, debian/rules: cleanups
* debian/control:
- standards version 3.6.2 (no changes needed)
- rewrite description
- drop 'perl5' alternative dependency; the perl5 package disappeared
about 3 release cycles ago
* template/debian/copyright: update FSF address.
* template/debian/control.in: edit description, set maintainer to
root at localhost, update standards version, add correct debhelper
Build-Depends
* template/debian/rules: streamline somewhat.
* equivs-build: support Replaces: field. (Closes: #118526)
* equivs-build, template/debian/README.Debian.in:
use "@" instead of the ISO-8859-1 section symbol for the variable
escapes, to make life slightly easier for users of other charsets.
- equivs-build.pod: update (and fix) the documentation for this
* equivs-build: allow comments in control file.
- template.ctl: comment out most of the entries, to save the user some
time in common cases. Also mention that packages lists are all
comma-separated.
* equivs-build: Lots of code cleanups. Highlights:
- Use File::Temp::tempdir. This removes the dir upon normal exit. On
abend, tell the user where it is so she can examine and remove it.
- Print usage message to STDERR, not STDOUT
- Actually bother to close all the files we open
- die with "\n". I doubt users care about source code line numbers.
- 3-arg open(), multi-arg system(), and in general try to look less
like Perl 4
- Delete outdated or useless comments, commented-out code, unneeded
variables, and redundant integrity checks
- Eliminate most use of global variables
The net effect is to shrink the file by about 20%.
equivs (2.0.6-0.1) unstable; urgency=low
* Non-maintainer upload.
* equivs-build: fix operator precedence problem. Applied patch from
Mattia Dongili. Closes: #237963, 218443.
* debian/control: Tweaked the description message, removing the
misleading phrase "dummy package". Closes: #201852.
equivs (2.0.6) unstable; urgency=low
* Just to correct some changelog issues
* Wrong bug closed in 2.0.5 (#131270). The bug was #131260
(manually closed by me)
* era eriksson correct mail is era at iki.fi
* Fixed Control file to Standars-Version 3.5.10
equivs (2.0.5) unstable; urgency=low
* New maintainer. (Closes: #192678)
* Uptated to Standards-Version 3.5.10
* Changed some docs to be more clear (patch from eriksson
<era at there.afraid.org>) (Closes: #163780, #131270)
* Changed Maintainer sample line in equivs-control to make it clear.
(Closes: #122041)
---
COPYING | 340 +++++++++++++++++++
debian/README.Debian | 58 +---
debian/changelog | 79 ++++-
debian/compat | 1 +
debian/control | 39 ++-
debian/copyright | 17 +-
debian/dirs | 3 -
debian/equivs-build.pod | 44 +--
debian/equivs-control.pod | 9 +-
debian/equivs.examples | 1 +
debian/equivs.manpages | 2 +
debian/examples | 5 -
debian/rules | 46 +--
usr/bin/equivs-build | 393 +++++++++-------------
usr/share/equivs/template.ctl | 31 +-
usr/share/equivs/template/debian/README.Debian.in | 4 +-
usr/share/equivs/template/debian/compat | 1 +
usr/share/equivs/template/debian/control.in | 20 +-
usr/share/equivs/template/debian/copyright | 6 +-
usr/share/equivs/template/debian/rules | 27 +-
20 files changed, 688 insertions(+), 438 deletions(-)
diff --git a/COPYING b/COPYING
new file mode 100644
index 0000000..b7b5f53
--- /dev/null
+++ b/COPYING
@@ -0,0 +1,340 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+ 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users. This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it. (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.) You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+ To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have. You must make sure that they, too, receive or can get the
+source code. And you must show them these terms so they know their
+rights.
+
+ We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+ Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software. If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+ Finally, any free program is threatened constantly by software
+patents. We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary. To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ GNU GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License. The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language. (Hereinafter, translation is included without limitation in
+the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+ 1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+ 2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) You must cause the modified files to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ b) You must cause any work that you distribute or publish, that in
+ whole or in part contains or is derived from the Program or any
+ part thereof, to be licensed as a whole at no charge to all third
+ parties under the terms of this License.
+
+ c) If the modified program normally reads commands interactively
+ when run, you must cause it, when started running for such
+ interactive use in the most ordinary way, to print or display an
+ announcement including an appropriate copyright notice and a
+ notice that there is no warranty (or else, saying that you provide
+ a warranty) and that users may redistribute the program under
+ these conditions, and telling the user how to view a copy of this
+ License. (Exception: if the Program itself is interactive but
+ does not normally print such an announcement, your work based on
+ the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+ a) Accompany it with the complete corresponding machine-readable
+ source code, which must be distributed under the terms of Sections
+ 1 and 2 above on a medium customarily used for software interchange; or,
+
+ b) Accompany it with a written offer, valid for at least three
+ years, to give any third party, for a charge no more than your
+ cost of physically performing source distribution, a complete
+ machine-readable copy of the corresponding source code, to be
+ distributed under the terms of Sections 1 and 2 above on a medium
+ customarily used for software interchange; or,
+
+ c) Accompany it with the information you received as to the offer
+ to distribute corresponding source code. (This alternative is
+ allowed only for noncommercial distribution and only if you
+ received the program in object code or executable form with such
+ an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it. For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable. However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License. Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+ 5. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Program or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+ 6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+ 7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all. For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded. In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+ 9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation. If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+ 10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission. For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this. Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+ NO WARRANTY
+
+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+ Gnomovision version 69, Copyright (C) year name of author
+ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+ `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+ <signature of Ty Coon>, 1 April 1989
+ Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs. If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library. If this is what you want to do, use the GNU Library General
+Public License instead of this License.
diff --git a/debian/README.Debian b/debian/README.Debian
index a8f0d2e..c53f8f8 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -1,18 +1,18 @@
equivs for DEBIAN
-----------------
-This is a package, that creates Debian packages that can be
-used to inform dpkg about localy installed packages and their
-dependencies. Also empty packages that just require other packages
+This is a package that creates Debian packages which can be
+used to inform dpkg about locally installed packages and their
+dependencies. Also empty packages which just require other packages
can be created with equivs. These can be used as "profile" packages
-that just mark otherones for installation.
+which just mark other ones for installation.
-Please note that this is a crude hack and if thoughtlessly used
-might possibly do damage to your packaging system. And please
+Please note that this is a crude hack and if thoughtlessly used,
+it might possibly do damage to your packaging system. And please
note as well that using it is not the recommended way of dealing
with broken dependencies. Better file a bug report instead.
-In contrast to prior versions of equivs, it does not recreate the
+In contrast to prior versions of equivs, this version does not recreate the
equivs package, but creates new dummy packages.
History of the package: (by Paul Seelig)
@@ -46,44 +46,16 @@ 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
-ones will be used, if you omit one.
+values will be used if you omit one. See the manual page for
+"equivs-build" for more information.
-There are four additional fields that can be used:
+Check the Debian Policy Manual, Chapter 2, if you are unsure
+about the different level of package relationships (dependencies)
+http://www.debian.org/doc/debian-policy/ch-archive.html
+(also available in the debian-policy package).
-- Changelog: file to be used as the changelog
-
-- Version: if you don't use a local changelog, equivs will create a
- dummy one. As the version of the package is defined in the
- changelog, equivs will asume the version 1.0. With this
- field, you can set an explicit version.
-
-- Readme: a file to be used as the README.Debian file. You can use the
- strings �packagename� and �depends� to insert the package
- name and the dependency information used.
-
-- Copyright: the copyright file to by used. If ommited, the GPL 2
- will be used.
-
-- Extra-Files: A comma-seperated list of files to copy to the
- /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.
-
-You can create full packages, suitable for a upload
-to the Debian servers. To do this, use the option
---full or -f, and equivs-build will use debuild to create the package.
-
-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.
-
-
-The program "equivs-control" will create a dummy control file
-you have to alter to be useful.
+The program "equivs-control" will create a dummy control file,
+which you have to alter before it will be useful.
So to use equivs, you do:
diff --git a/debian/changelog b/debian/changelog
index 33aa447..e63acd5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,78 @@
+equivs (2.0.7) unstable; urgency=low
+
+ * New maintainer. (Closes: #350835)
+ * Acknowledge NMU. (Closes: #201852, #218443, #237963, #251547)
+ * Add file COPYING, the GNU GPL v2, to top level of source tree.
+ * Update both build-time and runtime use of debhelper to v4.
+ (Closes: #320619)
+ * debian/copyright, debian/rules: cleanups
+ * debian/control:
+ - standards version 3.6.2 (no changes needed)
+ - rewrite description
+ - drop 'perl5' alternative dependency; the perl5 package disappeared
+ about 3 release cycles ago
+ * template/debian/copyright: update FSF address.
+ * template/debian/control.in: edit description, set maintainer to
+ root at localhost, update standards version, add correct debhelper
+ Build-Depends
+ * template/debian/rules: streamline somewhat.
+ * equivs-build: support Replaces: field. (Closes: #118526)
+ * equivs-build, template/debian/README.Debian.in:
+ use "@" instead of the ISO-8859-1 section symbol for the variable
+ escapes, to make life slightly easier for users of other charsets.
+ - equivs-build.pod: update (and fix) the documentation for this
+ * equivs-build: allow comments in control file.
+ - template.ctl: comment out most of the entries, to save the user some
+ time in common cases. Also mention that packages lists are all
+ comma-separated.
+ * equivs-build: Lots of code cleanups. Highlights:
+ - Use File::Temp::tempdir. This removes the dir upon normal exit. On
+ abend, tell the user where it is so she can examine and remove it.
+ - Print usage message to STDERR, not STDOUT
+ - Actually bother to close all the files we open
+ - die with "\n". I doubt users care about source code line numbers.
+ - 3-arg open(), multi-arg system(), and in general try to look less
+ like Perl 4
+ - Delete outdated or useless comments, commented-out code, unneeded
+ variables, and redundant integrity checks
+ - Eliminate most use of global variables
+ The net effect is to shrink the file by about 20%.
+
+ -- Peter Samuelson <peter at p12n.org> Tue, 28 Feb 2006 02:01:16 -0600
+
+equivs (2.0.6-0.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+
+ * equivs-build: fix operator precedence problem. Applied patch from
+ Mattia Dongili. Closes: #237963, 218443.
+
+ * debian/control: Tweaked the description message, removing the
+ misleading phrase "dummy package". Closes: #201852.
+
+ -- Steve M. Robbins <smr at debian.org> Fri, 28 May 2004 21:38:59 -0400
+
+equivs (2.0.6) unstable; urgency=low
+
+ * Just to correct some changelog issues
+ * Wrong bug closed in 2.0.5 (#131270). The bug was #131260
+ (manually closed by me)
+ * era eriksson correct mail is era at iki.fi
+ * Fixed Control file to Standars-Version 3.5.10
+
+ -- Fabio Rafael da Rosa <f2r at users.sourceforge.net> Wed, 11 Jun 2003 11:32:56 -0300
+
+equivs (2.0.5) unstable; urgency=low
+
+ * New maintainer. (Closes: #192678)
+ * Uptated to Standards-Version 3.5.10
+ * Changed some docs to be more clear (patch from eriksson
+ <era at there.afraid.org>) (Closes: #163780, #131270)
+ * Changed Maintainer sample line in equivs-control to make it clear.
+ (Closes: #122041)
+
+ -- Fabio Rafael da Rosa <f2r at users.sourceforge.net> Thu, 15 May 2003 16:58:59 -0300
+
equivs (2.0.4) unstable; urgency=low
* Added Preinst, Postinst, Prerm and Postrm entries to the control file
@@ -221,6 +296,4 @@ equivs (1.0) unstable; urgency=low
-- Paul Seelig <pseelig at goofy.zdv.uni-mainz.de> Wed, 12 Mar 1997 10:46:03 +0100
-Local variables:
-mode: debian-changelog
-End:
+
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..b8626c4
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+4
diff --git a/debian/control b/debian/control
index 781d0ab..170890c 100644
--- a/debian/control
+++ b/debian/control
@@ -1,28 +1,27 @@
Source: equivs
Section: admin
Priority: extra
-Maintainer: Martin Bialasinski <martinb at debian.org>
-Standards-Version: 3.1.0
-Build-Depends: debhelper
+Maintainer: Peter Samuelson <peter at p12n.org>
+Standards-Version: 3.6.2
+Build-Depends-Indep: debhelper (>= 4)
Package: equivs
-Depends: perl|perl5, debhelper, dpkg-dev, devscripts, make, fakeroot
+Depends: perl, debhelper (>= 4), dpkg-dev, devscripts, make, fakeroot
Architecture: all
-Description: Circumventing Debian package dependencies
- This is a dummy package which can be used to create Debian
- packages, which only contain dependency information.
+Description: Circumvent Debian package dependencies
+ This package provides a tool to create Debian packages that only
+ contain dependency information.
.
- This way, you can make the Debian package management
- system believe that equivalents to packages on which other
- packages do depend on are actually installed.
+ One use for this is to create a metapackage: a package whose sole
+ purpose is to declare dependencies and conflicts on other packages so
+ that these will be automatically installed, upgraded, or removed.
.
- Another possibility is creation of a meta package. When this
- package contains a dependency as "Depends: a, b, c", then
- installing this package will also select packages a, b and c.
- Instead of "Depends", you can also use "Recommends:" or
- "Suggests:" for less demanding dependency.
- .
- Please note that this is a crude hack and if thoughtlessly used
- might possibly do damage to your packaging system. And please
- note as well that using it is not the recommended way of dealing
- with broken dependencies. Better file a bug report instead.
+ Another use is to circumvent dependency checking. If a package P is
+ not installed on the system, packages that depend on P cannot normally
+ be installed. However, if functionality equivalent to P is known to
+ be installed, this tool can be used to trick the Debian package
+ management system into believing that package P is actually installed.
+ NOTE: this should be considered a crude hack to work around awkward
+ situations, not a normal solution. If you use equivs to work around
+ bugs in other Debian packages, you should also file bug reports
+ against those packages.
diff --git a/debian/copyright b/debian/copyright
index dbf28b6..7ce39bc 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,13 +1,12 @@
+Copyright 1997, 1998 by Christian Schwarz
Copyright 1997 by Paul Seelig <pseelig at goofy.zdv.uni-mainz.de>
Copyright 1999 by Martin Bialasinski <agr30 at uni-koeln.de>
+Copyright 2003 by Fabio Rafael da Rosa <f2r at users.sourceforge.net>
-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/share/common-licenses/GPL
+This package is free software; you can redistribute and/or modify it
+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.
-For the control file parser used in equivs-build:
-doc-base Copyright (C) 1997,1998 Christian Schwarz,
-Also licensed under the GPL2
-
+On Debian systems, the full text of the license can be found at
+/usr/share/common-licenses/GPL-2 .
diff --git a/debian/dirs b/debian/dirs
deleted file mode 100644
index 5096ff8..0000000
--- a/debian/dirs
+++ /dev/null
@@ -1,3 +0,0 @@
-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 2278d3c..6f76601 100644
--- a/debian/equivs-build.pod
+++ b/debian/equivs-build.pod
@@ -1,6 +1,6 @@
=head1 NAME
-equivs-build - make a debian package to register local software
+equivs-build - make a Debian package to register local software
=head1 SYNOPSIS
@@ -8,22 +8,22 @@ B<equivs-build [--full|-f] [--arch=foo|-a=foo] controlfile>
=head1 DESCRIPTION
-This is a package, that creates Debian packages that can be
-used to inform dpkg about localy installed packages and their
-dependancies. Also empty packages that just require other packages
+B<equivs-build> is a program that creates Debian packages which can be
+used to inform dpkg about locally installed packages and their
+dependencies. Also empty packages that just require other packages
can be created with equivs. These can be used as "profile" packages
-that just mark otherones for installation.
+which just mark other ones for installation.
-Please note that this is a crude hack and if thoughtlessly used
-might possibly do damage to your packaging system. And please
+Please note that this is a crude hack and if thoughtlessly used,
+it might possibly do damage to your packaging system. And please
note as well that using it is not the recommended way of dealing
with broken dependencies. Better file a bug report instead.
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
-ones will be used, if you omit one.
+values will be used if you omit one.
-There are four additional fields that can be used:
+There are several additional fields that can be used:
=over 4
@@ -35,18 +35,18 @@ File to be used as the changelog
If you don't use a local changelog, equivs will create a
dummy one. As the version of the package is defined in the
-changelog, equivs will asume the version 1.0. With this
+changelog, equivs will assume the version 1.0. With this
field, you can set an explicit version.
=item Readme:
-A file to be used as the README.Debian file. You can use the
-strings �packagename� and �depends� to insert the package
+A file to be used as the F<README.Debian> file. You can use the
+strings B<@packagename@> and B<@depends@> to insert the package
name and the dependency information used.
=item Copyright:
-The copyright file to by used. If ommited, the GPL 2
+The copyright file to by used. If omitted, the GPL 2
will be used.
=item Preinst: Postinst: Prerm: Postrm:
@@ -57,12 +57,12 @@ description (package developers-reference).
=item Extra-Files:
-A comma-seperated list of files to copy to the
-/usr/share/doc/packagename directory.
+A comma-separated list of files to copy to the
+F</usr/share/doc/packagename> directory.
=back
-See /usr/share/doc/equivs/README.Debian for more information.
+See F</usr/share/doc/equivs/README.Debian> for more information.
=head1 OPTIONS
@@ -70,19 +70,19 @@ See /usr/share/doc/equivs/README.Debian for more information.
=item --full | -f
-Do a complete build. debuild will be called, that is a
-full package will be build and signed, suitable for a upload
+Do a complete build. B<debuild> will be called, that is, a
+full package will be built and signed, suitable for upload
to the Debian servers.
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.
+equivs control file, or 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.
+Build package for the specified architecture. Used
+e.g. for building packages for hurd under linux. B<equivs-build> uses
+B<dpkg-architecture> to provide this facility.
=back
diff --git a/debian/equivs-control.pod b/debian/equivs-control.pod
index f03c00c..7cdeaf0 100644
--- a/debian/equivs-control.pod
+++ b/debian/equivs-control.pod
@@ -8,11 +8,11 @@ B<equivs-control filename>
=head1 DESCRIPTION
-This programm copies a template control file as needed by
-the equivs-control command as the specified filename.
+B<equivs-control> copies a template control file as needed by
+the B<equivs-build> command to the specified filename.
You then have to edit the created file to reflect your choices.
-The controlfile has the form used by regular controlfiles
+The control file has the form used by regular control files
in source packages. You can delete the unneeded fields
in the generated file.
@@ -36,5 +36,4 @@ Martin Bialasinski <martinb at debian.org>
=head1 SEE ALSO
-equivs-build(1)
-
+L<equivs-build(1)>
diff --git a/debian/equivs.examples b/debian/equivs.examples
new file mode 100644
index 0000000..e39721e
--- /dev/null
+++ b/debian/equivs.examples
@@ -0,0 +1 @@
+examples/*
diff --git a/debian/equivs.manpages b/debian/equivs.manpages
new file mode 100644
index 0000000..9789e7b
--- /dev/null
+++ b/debian/equivs.manpages
@@ -0,0 +1,2 @@
+debian/equivs-build.1
+debian/equivs-control.1
diff --git a/debian/examples b/debian/examples
deleted file mode 100644
index d89f843..0000000
--- a/debian/examples
+++ /dev/null
@@ -1,5 +0,0 @@
-examples/communicator45-full.ctl
-examples/so5.ctl
-examples/wp8.ctl
-examples/webserver.ctl
-examples/mail-transport-agent.ctl
diff --git a/debian/rules b/debian/rules
index 138b56e..d40afbf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,56 +2,40 @@
# Sample debian/rules that uses debhelper. GNU copyright 1997 by Joey Hess.
# This version is for packages that are architecture independent.
-# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
+PKG := equivs
+MANPAGES := debian/equivs-control.1 debian/equivs-build.1
-build: build-stamp
-build-stamp:
- dh_testdir
-
- # Add here commands to compile the package.
-
- pod2man --section=1 --release="`date +'%d %b %Y'`"\
- --center="Debian/GNU" --date=' '\
- debian/equivs-control.pod > debian/equivs-control.1
+%.1: %.pod
+ pod2man --section=1 --release="$(date +'%d %b %Y')" \
+ --center="Debian/GNU" --date=' ' $< > $@
- pod2man --section=1 --release="`date +'%d %b %Y'`"\
- --center="Debian/GNU" --date=' '\
- debian/equivs-build.pod > debian/equivs-build.1
-
- touch build-stamp
+build: $(MANPAGES)
clean:
dh_testdir
dh_testroot
- rm -f build-stamp install-stamp
-
- # Add here commands to clean up after the build process.
-
- -rm -f debian/equivs-build.1 debian/equivs-control.1
+ $(RM) $(MANPAGES)
dh_clean
-install: install-stamp
-install-stamp: build-stamp
+install: build
dh_testdir
dh_testroot
dh_clean -k
- dh_installdirs
- # Add here commands to install the package into debian/tmp.
- cp -R usr debian/tmp
+ mkdir -p debian/$(PKG)
+ cp -la usr debian/$(PKG)
- touch install-stamp
+# Build architecture-dependent packages - nothing to do here
+binary-arch: build install
# Build architecture-independent files here.
binary-indep: build install
-# dh_testversion
dh_testdir
dh_testroot
dh_installdocs
dh_installexamples
- dh_installmanpages
-# dh_undocumented
+ dh_installman
dh_installchangelogs
dh_link
dh_compress
@@ -61,10 +45,6 @@ binary-indep: build install
dh_md5sums
dh_builddeb
-# Build architecture-dependent files here.
-binary-arch: build install
-# We have nothing to do by default.
-
source diff:
@echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
diff --git a/usr/bin/equivs-build b/usr/bin/equivs-build
index 53f5ce8..9a2863b 100755
--- a/usr/bin/equivs-build
+++ b/usr/bin/equivs-build
@@ -1,9 +1,10 @@
#!/usr/bin/perl -w
-# Copyright 1999 Martin Bialasinski
-# This programm is subject to the GNU Public License Version 2
+# Copyright 1999 by Martin Bialasinski
+# Copyright 2006 by Peter Samuelson
+# This programm is subject to the GNU General Public License Version 2
-# doc-base Copyright (C) 1997,1998 Christian Schwarz,
+# doc-base Copyright (C) 1997,1998 Christian Schwarz,
# Also licensed under the GPL2
use strict;
@@ -11,189 +12,135 @@ use Cwd;
use Getopt::Long;
use File::Copy;
use File::Basename;
+use File::Temp ('tempdir');
-sub usage{
- print <<EOU;
+my $builddir = tempdir('equivs.XXXXXX', DIR => cwd, CLEANUP => 1) or
+ die "Cannot create temporary build dir: $!\n";
+my %control;
+
+sub usage {
+ print STDERR <<EOU;
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.
+--full Full build including signing, etc., suitable for upload to Debian
+--arch Build package for a different architecture.
+ Used e.g. for building Hurd packages under Linux.
EOU
exit 1;
}
-my $full_package;
-my $arch;
-my $result = GetOptions("full" => \$full_package,
- "arch=s" => \$arch);
-usage() if (!$result);
-
-my $debug=0;
+my ($full_package, $arch);
+GetOptions(full => \$full_package, 'arch=s' => \$arch) or usage();
-my $builddir= cwd . "/equivs"; # directory to put the files in needed for
- # creating the debian package
-
-my $cwd = cwd; # save the current working directory. The created
- # package will be put there
+my $debug = 0;
umask(022);
-# We need a control file
-
my $controlfile = $ARGV[0];
-
-my %control; # holds the control elements
-#my ($username, $fullname, $systemname);
-
if (! $controlfile) {
- print "No control file was specified";
+ print STDERR "No control file was specified\n";
usage();
}
-if (! -f $controlfile) {
- die "The control file [$controlfile] could not be opened";
-}
-
-
-# Create the build directory
-
-system ("[ ! -L $builddir ] && rm -rf $builddir"); # empty the builddir
-mkdir $builddir, 0755 or die "Can not create build directory $builddir: $!";
-
-# Copy the default files
-
-my $ret = system("cp -R /usr/share/equivs/template/* $builddir");
-
-if ( 0xffff & $ret != 0 ) {
- die "Error on copy of the template files: $!";
-}
+system("cp -R /usr/share/equivs/template/* $builddir") == 0 or
+ die "Error on copy of the template files: exit status " . ($?>>8) . "\n";
# Parse the equivs control file
-&read_control_file($controlfile);
+read_control_file($builddir, \%control, $arch, $controlfile);
- # Debug
- if ($debug) {
- my ($k, $v);
- while (($k, $v) = each %control ) {
- print "$k -> $v \n";
- }
- }
+if ($debug) {
+ my ($k, $v);
+ while (($k, $v) = each %control ) {
+ print "$k -> $v\n";
+ }
+}
# Copy any additional files
-my @extra_files = split ",", $control{"Extra-Files"} || "";
+my @extra_files = split ",", $control{'Extra-Files'} || "";
mkdir "$builddir/docs", 0755;
-open DOCS, "> $builddir/debian/docs" or
- die "Can't open $builddir/debian/docs for writing: $!";
+open DOCS, '>', "$builddir/debian/docs" or
+ die "Cannot open $builddir/debian/docs for writing: $!\n";
foreach my $file (@extra_files){
$file =~ s/ +//g;
my $destination = basename($file);
copy $file, "$builddir/docs/$destination" or
- die "Error on copying $file to $builddir/docs/$destination : $!";
+ die "Cannot copy $file to $builddir/docs/$destination: $!\n";
print DOCS "docs/$destination\n";
}
close DOCS;
-foreach my $script (("Preinst","Postinst","Prerm","Postrm")) {
+foreach my $script (qw(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";
+ die "Cannot copy $script to $builddir/debian/$destination: $!\n";
}
-# Write the control file
+write_control_file($builddir, \%control);
-&write_control_file;
-
-# Create the changelog
-
-if ($control{"Changelog"}){
- if(-f $control{"Changelog"}){
- # Changelog specified, copy it
- copy $control{'Changelog'}, "$builddir/debian/changelog" or
- die "Error on copy of your changelog file: $!";
-
- } else {
- die "Can't open the changelog [$control{'Changelog'}] you specified";
- }
+if ($control{'Changelog'}) {
+ copy $control{'Changelog'}, "$builddir/debian/changelog" or
+ die "Cannot copy changelog file $control{'Changelog'}: $!\n";
} else {
- # Create a standard changelog file
- &make_changelog;
+ make_changelog($builddir, \%control);
}
-# Create the README.Debian file
-if ($control{"Readme"}){
- if (-f $control{"Readme"}){
- # Readme specified, copy it
- copy $control{'Readme'}, "$builddir/debian/README.Debian.in" or
- die "Error on copy of your readme file: $!";
- } else {
- die "Can't open the readme file [$control{'Readme'}] you specified";
- }
+if ($control{'Readme'}) {
+ copy $control{'Readme'}, "$builddir/debian/README.Debian.in" or
+ die "Cannot copy README file $control{'Readme'}: $!\n";
}
-
-# Make substitutions in the Readme
-&make_readme;
+# Make substitutions in the Readme
+make_readme($builddir, \%control);
# Copy a copyright file, otherwise use GPL2
-
-if ($control{"Copyright"}) {
- if (-f $control{"Copyright"}){
- # Copyright specified, copy it
- copy $control{'Copyright'}, "$builddir/debian/copyright" or
- die "Error on copy of your copyright file: $!";
- } else {
- die "Can't open the copyright file [$control{'Copyright'}] you specified";
- }
+if ($control{'Copyright'}) {
+ copy $control{'Copyright'}, "$builddir/debian/copyright" or
+ die "Cannot copy copyright file $control{'Copyright'}: $!\n";
}
-# Cleanup a bit
-
-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;
+unlink glob "debian/*.in";
-if ($full_package){
- $ret = system("$arch_cmd debuild -rfakeroot");
-} else {
- $ret = system("$arch_cmd fakeroot debian/rules binary");
+my @build_cmd = ();
+# Set architecture for crosscompiling, if requested
+if ($arch) {
+ @build_cmd = ("dpkg-architecture", "-a$arch", "-c");
}
-if ( 0xffff & $ret != 0 ) {
- die "Error during the build process: $!";
+if ($full_package) {
+ push @build_cmd, 'debuild', '-rfakeroot';
} else {
- print "\nThe package has been created.\n";
- print "Attention, the package has been created in the ";
- print "current directory,\nnot in \"..\" as indicated by the message above!\n";
+ push @build_cmd, 'fakeroot', 'debian/rules', 'binary';
}
+system(@build_cmd) == 0 or
+ die "Error in the build process: exit status " . ($?>>8) . "\n";
+chdir '..';
+print "\nThe package has been created.\n";
+print "Attention, the package has been created in the current directory,\n";
+print "not in \"..\" as indicated by the message above!\n";
+exit 0;
sub read_control_file {
- my($file) = shift;
-
- open(IN, "$builddir/debian/control.in") or
- die "$builddir/debian/control.in: cannot open control file for reading: $!";
+ my ($builddir, $control, $specific_arch, $file) = @_;
+ my $in;
- read_control_file_section(\%control) or die "error: empty control file";
+ open($in, "$builddir/debian/control.in") or
+ die "Cannot open control file: $!\n";
+ read_control_file_section($in, $control) or
+ die "error: empty control file\n";
+ close $in;
-# Fix the Maintainer field
+ # Set some field defaults: Maintainer, Architecture
my (@user) = getpwuid $>;
my $gecos;
my ($username, $systemname, $fullname);
@@ -201,179 +148,143 @@ sub read_control_file {
($username, $gecos) = @user[0,6];
$fullname = (split ",", $gecos)[0];
- $systemname = `hostname --fqdn`;
- chomp($systemname);
+ chomp($systemname = qx(hostname --fqdn));
- $control{"Maintainer"} = "$fullname <$username\@$systemname>";
+ $control->{'Maintainer'} = "$fullname <$username\@$systemname>";
- open(IN, $file) or
- die "$file: cannot open control file for reading: $!";
+ $control->{'Architecture'} = $specific_arch ? 'any' : 'all';
- read_control_file_section(\%control) or die "error: empty control file";
+ open($in, $file) or
+ die "Cannot open control file $file: $!\n";
- # Fix Source: entry
+ read_control_file_section($in, $control) or
+ die "error: empty control file\n";
+ close $in;
- $control{"Source"} = $control{"Package"};
+ # Fix Source: entry
+ $control->{'Source'} = $control->{'Package'};
# remove trailing whitespace
-
-# foreach my $key (keys %control) {
-# $control{$key} =~ s/\s$//;
+# foreach my $key (keys %$control) {
+# $control->{$key} =~ s/\s$//;
# }
}
sub read_control_file_section {
- my ($pfields) = @_;
+ my ($fh, $pfields) = @_;
- my $empty = 1;
my ($cf,$v);
- while (<IN>) {
+ while (<$fh>) {
chomp;
-
- # empty line?
- if (/^\s*$/o) {
- next;
- }
+ next if (m/^\s*$/ or m/^\s*#/);
# new field?
if (/^(\S+)\s*:\s*(.*?)\s*$/) {
- ($cf,$v) = (ucfirst $1,$2);
-# print STDERR "$cf -> $v\n" if ($debug);
-# if (exists $$pfields{$cf}) {
-# warn "warning: $cf: overwriting previous setting of control field";
-# }
- $$pfields{$cf} = $v;
+ ($cf,$v) = (ucfirst lc $1, $2);
+ $cf =~ s/(?<=-)([a-z])/uc $1/eg;
+ $pfields->{$cf} = $v;
} elsif (/^(\s+\S.*)$/) {
$v = $1;
- defined($cf) or die "syntax error in control file: no field specified";
-# print STDERR "$cf -> $v (continued)\n" if ($debug);
- $$pfields{$cf} .= "\n$v";
+ defined($cf) or die "syntax error in control file: no field specified\n";
+ $pfields->{$cf} .= "\n$v";
} else {
- die "syntax error in control file: $_";
+ die "syntax error in control file: $_\n";
}
}
return 1;
}
-# Write control fields
+# Write control fields
sub control_fields {
my $retval;
- my @fields = @_;
+ my ($control, @fields) = @_;
foreach my $str (@fields) {
- my $t = $control{$str};
+ my $t = $control->{$str};
if ($t) {
$retval .= "$str: $t\n";
}
- }
+ }
return $retval;
}
-# Write control file
sub write_control_file {
- open OUT, ">$builddir/debian/control";
- my ($k, $v);
-
- my $deps;
-# foreach my $str (("Source",
-# "Section",
-# "Priority",
-# "Maintainer",
-# "Standards-Version")) {
-# my $t = $control{$str};
-# if ($t) {
-# $deps .= "$str: $t\n";
-# }
-# }
- $deps = control_fields(("Source",
- "Section",
- "Priority",
- "Maintainer",
- "Standards-Version"));
- $deps .= "\n";
-# my $str;
-# foreach $str (("Package",
-# "Architecture",
- # "Pre-Depends",
- # "Depends",
- # "Recommends",
- # "Suggests",
-# "Conflicts",
- # "Provides",
- # "Description")) {
- # my $t = $control{$str};
- # if ($t) {
- # $deps .= "$str: $t\n";
- # }
- $deps .= control_fields(("Package",
- "Architecture",
- "Pre-Depends",
- "Depends",
- "Recommends",
- "Suggests",
- "Conflicts",
- "Provides",
- "Description"));
- print OUT $deps;
+ my ($builddir, $control) = @_;
+ open OUT, '>', "$builddir/debian/control" or
+ die "Cannot open $builddir/debian/control for writing: $!\n";
+
+ print OUT control_fields($control,
+ "Source",
+ "Section",
+ "Priority",
+ "Maintainer",
+ "Build-Depends",
+ "Standards-Version");
+ print OUT "\n";
+ print OUT control_fields($control,
+ "Package",
+ "Architecture",
+ "Pre-Depends",
+ "Depends",
+ "Recommends",
+ "Suggests",
+ "Conflicts",
+ "Provides",
+ "Replaces",
+ "Description");
+ close OUT;
}
-# Create the changelog file
-
sub make_changelog {
- open OUT, ">$builddir/debian/changelog" || die "Couldn't write changelog: $!";
- my($date) = `822-date`; chop $date;
- my $version = $control{"Version"} || "1.0";
-
+ my ($builddir, $control) = @_;
+ my ($version, $date);
+
+ $version = $control->{'Version'} || "1.0";
+ chomp ($date = qx(822-date));
+
+ open OUT, '>', "$builddir/debian/changelog" or
+ die "Couldn't write changelog: $!\n";
print OUT <<EOINPUT;
-$control{Package} ($version) unstable; urgency=low
+$control->{Package} ($version) unstable; urgency=low
* First version
- -- $control{"Maintainer"} $date
+ -- $control->{'Maintainer'} $date
EOINPUT
-
+ close OUT;
}
-# Read the control file. Adopted from install-doc (doc-base package)
-
# Create the README.Debian file
-
sub make_readme {
- undef $/;
- open IN, "$builddir/debian/README.Debian.in" or die "Can't open the readme file: $!";
- my ($content) = <IN>;
- $/="\n";
- $content =~ s/�packagename�/$control{"Package"}/g;
- my $deps;
- my $str;
-
- $deps = control_fields(("Pre-Depends",
- "Depends",
- "Recommends",
- "Suggests",
- "Conflicts",
- "Provides"));
-# foreach $str (("Pre-Depends",
-# "Depends",
-# "Recommends",
-# "Suggests",
-# "Conflicts",
-# "Provides")) {
-# my $t = $control{$str};
-# if ($t) {
-# $deps .= "$str: $t\n";
-# }
-# }
- $content =~ s/�depends�/$deps || " "/eg;
- open OUT, ">$builddir/debian/README.Debian";
+ my ($builddir, $control) = @_;
+ my ($content, $deps);
+
+ open IN, "$builddir/debian/README.Debian.in" or
+ die "Cannot open the README file: $!\n";
+ $content = join '', <IN>;
+ close IN;
+
+ $content =~ s/\@packagename\@/$control->{'Package'}/g;
+
+ $deps = control_fields($control,
+ "Pre-Depends",
+ "Depends",
+ "Recommends",
+ "Suggests",
+ "Conflicts",
+ "Provides",
+ "Replaces");
+ $deps ||= " ";
+ $content =~ s/\@depends\@/$deps/g;
+ open OUT, '>', "$builddir/debian/README.Debian" or
+ die "Cannot open $builddir/debian/README.Debian for writing: $!\n";
print OUT $content;
- close OUT or die "$!";
+ close OUT;
}
-
diff --git a/usr/share/equivs/template.ctl b/usr/share/equivs/template.ctl
index a271462..f0ec346 100644
--- a/usr/share/equivs/template.ctl
+++ b/usr/share/equivs/template.ctl
@@ -1,20 +1,23 @@
+### Commented entries have reasonable defaults.
+### Uncomment to edit them.
Section: misc
Priority: optional
-Standards-Version: 3.0.1
+Standards-Version: 3.6.2
-Package: <enter package name; defaults to equivs-dummy>
-Version: <enter version here; defaults to 1.0>
-Maintainer: <your name and email address; defaults to username>
-Pre-Depends: <packages>
-Depends: <packages>
-Recommends: <packages>
-Suggests: <package>
-Provides: <(virtual)package>
-Architecture: all
-Copyright: <copyright file; defaults to GPL2>
-Changelog: <changelog file; defaults to a generic changelog>
-Readme: <README.Debian file; defaults to a generic one>
-Extra-Files: <additional files for the doc directory, commaseperated>
+Package: <package name; defaults to equivs-dummy>
+# Version: <enter version here; defaults to 1.0>
+# Maintainer: Your Name <yourname at example.com>
+# Pre-Depends: <comma-separated list of packages>
+# Depends: <comma-separated list of packages>
+# Recommends: <comma-separated list of packages>
+# Suggests: <comma-separated list of packages>
+# Provides: <comma-separated list of packages>
+# Replaces: <comma-separated list of packages>
+# Architecture: all
+# Copyright: <copyright file; defaults to GPL2>
+# Changelog: <changelog file; defaults to a generic changelog>
+# Readme: <README.Debian file; defaults to a generic one>
+# Extra-Files: <comma-separated list of additional files for the doc directory>
Description: <short description; defaults to some wise words>
long description and info
.
diff --git a/usr/share/equivs/template/debian/README.Debian.in b/usr/share/equivs/template/debian/README.Debian.in
index 2de64ae..d6258d4 100644
--- a/usr/share/equivs/template/debian/README.Debian.in
+++ b/usr/share/equivs/template/debian/README.Debian.in
@@ -1,4 +1,4 @@
-�packagename� for DEBIAN
+ at packagename@ for Debian
This is a dummy package that makes Debian's package management
@@ -7,7 +7,7 @@ packages do depend on are actually installed.
The special dependencies used in this package are:
-�depends�
+ at depends@
Please note that this is a crude hack and if thoughtlessly used
might possibly do damage to your packaging system. And please
diff --git a/usr/share/equivs/template/debian/compat b/usr/share/equivs/template/debian/compat
new file mode 100644
index 0000000..b8626c4
--- /dev/null
+++ b/usr/share/equivs/template/debian/compat
@@ -0,0 +1 @@
+4
diff --git a/usr/share/equivs/template/debian/control.in b/usr/share/equivs/template/debian/control.in
index 08ca1be..4c2e35d 100644
--- a/usr/share/equivs/template/debian/control.in
+++ b/usr/share/equivs/template/debian/control.in
@@ -1,22 +1,20 @@
Source: equivs-dummy
Section: misc
Priority: optional
-Maintainer: Martin Bialasinski <martinb at debian.org>
-Standards-Version: 3.0.1
+Build-Depends: debhelper (>= 4)
+Maintainer: root <root at localhost>
+Standards-Version: 3.6.2
Package: equivs-dummy
Architecture: all
-Description: Dummy package to fulfil package dependencies
+Description: Dummy package to fulfill package dependencies
This is a dummy package that makes Debian's package management
system believe that equivalents to packages on which other
- packages do depend on are actually installed.
- .
- Deinstallation of this package is only possible when all pending
- dependency issues are properly resolved in some other way. A more
- brutal approach for it's deinstallation is to create and install
- this package configured using an empty control file.
+ packages depend on are actually installed. Deinstallation of
+ this package is only possible when all pending dependency issues
+ are properly resolved in some other way.
.
Please note that this is a crude hack and if thoughtlessly used
- might possibly do damage to your packaging system. And please
+ might possibly do damage to your packaging system. And please
note as well that using it is not the recommended way of dealing
- with broken dependencies. Better file a bug report instead.
+ with broken dependencies. It is better to file a bug report.
diff --git a/usr/share/equivs/template/debian/copyright b/usr/share/equivs/template/debian/copyright
index 0b2ef1c..aea572f 100644
--- a/usr/share/equivs/template/debian/copyright
+++ b/usr/share/equivs/template/debian/copyright
@@ -14,7 +14,5 @@ General Public License for more details.
You should have received a copy of the GNU General Public License
with your Debian GNU/Linux system, in /usr/share/common-licenses/GPL,
or with the Debian GNU/Linux bash source package as the file COPYING.
-If not, write to the Free Software Foundation, Inc., 59 Temple Place -
-Suite 330, Boston, MA 02111-1307, USA.
-
-
+If not, write to the Free Software Foundation, Inc., 51 Franklin St,
+Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/usr/share/equivs/template/debian/rules b/usr/share/equivs/template/debian/rules
index 79eb261..e60ad71 100755
--- a/usr/share/equivs/template/debian/rules
+++ b/usr/share/equivs/template/debian/rules
@@ -1,39 +1,23 @@
#!/usr/bin/make -f
# Sample debian/rules that uses debhelper. GNU copyright 1997 by Joey Hess.
-# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-build: build-stamp
-build-stamp:
- dh_testdir
- touch build-stamp
+build:
clean:
dh_testdir
dh_testroot
- rm -f build-stamp install-stamp
-
- # Add here commands to clean up after the build process.
-
dh_clean
-install: install-stamp
-install-stamp: build-stamp
+install: build
dh_testdir
dh_testroot
dh_clean -k
- # Add here commands to install the package into debian/tmp.
+binary-indep: install
- touch install-stamp
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
+binary-arch: install
dh_testdir
dh_testroot
dh_installdocs
@@ -45,8 +29,5 @@ binary-arch: build install
dh_md5sums
dh_builddeb
-source diff:
- @echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
-
binary: binary-indep binary-arch
.PHONY: build clean binary-indep binary-arch binary install
--
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