From 3d458054e6282bd633d6bc4a245a94cb3cb5e129 Mon Sep 17 00:00:00 2001 From: "Siegfried-Angel Gevatter Pujals (RainCT)" Date: Tue, 7 Aug 2007 16:05:50 +0200 Subject: [PATCH 1/3] Improved (mainly rewrote) pbuilder-dist. (Other insignificant changes.) --- pbuilder-dist | 113 ++++++++++++++++++++++++++++++++++------------ suspicious-source | 2 +- update-maintainer | 2 +- what-patch | 2 +- 4 files changed, 87 insertions(+), 32 deletions(-) diff --git a/pbuilder-dist b/pbuilder-dist index 0f2cf92..cc77b12 100755 --- a/pbuilder-dist +++ b/pbuilder-dist @@ -1,11 +1,15 @@ #!/bin/sh # Copyright (C) Jamin W. Collins -# License: Public Domain +# and Jordan Mantha +# Copyright 2007 (C) Siegfried-A. Gevatter +# License: GPLv2 or later # # This script is a wrapper to use pbuilder with many different # distributions / versions. # -# Name this script 'pbuilder-dapper', 'pbuilder-feisty', 'pbuilder-gutsy', etc. +# If you want to use this copy of the script only for a single distribution +# / version, rename it to 'pbuilder-dapper', 'pbuilder-feisty', 'pbuilder-gutsy', +# or whatever it is. # # The only variable you really might need to change is BASE_DIR, if you # don't want pbuilder stuff in your home directory. @@ -14,34 +18,85 @@ BASE_DIR="$HOME/pbuilder" -OPERATION=$1 -DISTRIBUTION=`basename $0 | cut -f2 -d '-'` -PROCEED=false +if [ ! -z `echo \`basename $0\` | grep '-'` ] +then + if [ $# -lt 1 ] + then + echo "Insufficient number of arguments." + echo "Usage: $0 " + exit 1 + fi -case $OPERATION in - create|update|build|clean|login|execute ) - PROCEED=true - ;; + DISTRIBUTION=`basename $0 | cut -f2 -d '-'` + OPERATION=$1 + shift 1 +else + if [ $# -lt 2 ] + then + echo "Insufficient number of arguments." + echo "Usage: $0 " + exit 1 + fi + + DISTRIBUTION=$1 + OPERATION=$2 + shift 2 +fi + + +case $DISTRIBUTION in + #warty|hoary|breezy) + dapper|edgy|feisty|gutsy) + ARCHIVE="http://archive.ubuntu.com/ubuntu" + COMPONENTS="universe multiverse" + ;; + + oldstable|sarge|stable|etch|testing|lenny|unstable|sid|experimental) + ARCHIVE="http://ftp.debian.org" + COMPONENTS="main contrib non-free" + ;; + + *) + echo "Warning: Unknown distribution «$DISTRIBUTION»." + echo -n "Continue [y/N]? " + read continue + + if [ "$continue" != 'y' ] && [ "$continue" != 'Y' ] + then + echo " Aborting..." + exit 1 + fi + + ARCHIVE="http://archive.ubuntu.com/ubuntu" + COMPONENTS="universe multiverse" + ;; esac -if [[ $PROCEED = true ]]; then - shift - if [ ! -d $BASE_DIR/${DISTRIBUTION}_result ] - then mkdir -p $BASE_DIR/${DISTRIBUTION}_result/ - fi - sudo pbuilder $OPERATION \ - --basetgz $BASE_DIR/$DISTRIBUTION-base.tgz \ - --distribution $DISTRIBUTION \ - --buildresult $BASE_DIR/$DISTRIBUTION_result \ - --othermirror "deb http://archive.ubuntu.com/ubuntu $DISTRIBUTION universe multiverse" $@ -else - echo "Invalid command..." - echo "Valid commands are:" - echo " create" - echo " update" - echo " build" - echo " clean" - echo " login" - echo " execute" - exit 1 + +case $OPERATION in + create|update|build|clean|login|execute) + ;; + + *) + echo "Unrecognized argument. Please use one of those:" + echo " create" + echo " update" + echo " build" + echo " clean" + echo " login" + echo " execute" + exit 1 + ;; +esac + + +if [ ! -d $BASE_DIR/${DISTRIBUTION}_result ] +then + mkdir -p $BASE_DIR/${DISTRIBUTION}_result fi + +sudo pbuilder $OPERATION \ + --basetgz $BASE_DIR/$DISTRIBUTION-base.tgz \ + --distribution $DISTRIBUTION \ + --buildresult $BASE_DIR/$DISTRIBUTION_result \ + --othermirror "deb $ARCHIVE $DISTRIBUTION $COMPONENTS" $@ diff --git a/suspicious-source b/suspicious-source index 6fe6704..82d2b45 100755 --- a/suspicious-source +++ b/suspicious-source @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 2007 (C) Siegfried-A. Gevatter # Based upon a script by Martin Pitt -# License: GPL v3 or later +# License: GPLv3 or later # # This script outputs a list of files which are not common source files. This # should be run in the root of a source tree to find files which might not be diff --git a/update-maintainer b/update-maintainer index 460e67d..16f0fff 100755 --- a/update-maintainer +++ b/update-maintainer @@ -26,7 +26,7 @@ if [ -f debian/control -a -f debian/changelog ]; then elif [ -f control -a -f changelog ]; then DEBIANDIR=. else - echo "Please run that script in the source folder." >&2 && exit 1 + echo "Please execute «$0» in the source folder." >&2 && exit 1 fi IGNORE_DOMAINS="ubuntu\.com|ubuntu\.com\.au" diff --git a/what-patch b/what-patch index 7f12c5b..821aec8 100755 --- a/what-patch +++ b/what-patch @@ -1,6 +1,6 @@ #!/bin/bash # Copyright 2006-2007 (C) Kees Cook -# Modified by Siegfried-A. Gevatter +# Modified by Siegfried-A. Gevatter # License: GPLv2 if [[ -d debian ]]; then From b6435c46854394d6404f03f25330d76f63a14d1d Mon Sep 17 00:00:00 2001 From: "Siegfried-Angel Gevatter Pujals (RainCT)" Date: Tue, 7 Aug 2007 20:20:03 +0200 Subject: [PATCH 2/3] pbuilder-dist: filename related improvements. Updated AUTHORS, and sorted them A-Z. Updated debian/copyright and fixed a problem there (some scripts don't have the 'or later' clause). --- AUTHORS | 13 +- COPYING | 341 ----------------------------------------------- debian/changelog | 2 +- debian/copyright | 32 +++-- pbuilder-dist | 8 +- 5 files changed, 32 insertions(+), 364 deletions(-) delete mode 100644 COPYING diff --git a/AUTHORS b/AUTHORS index 9abfcf0..f57ac93 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,8 +1,9 @@ -Daniel Holbach -Luke Yelavich Albin Tonnerre -Michael Bienia -Kees Cook -Martin Pitt -Siegfried-A. Gevatter +Daniel Holbach Jamin W. Collins +Jordan Mantha +Luke Yelavich +Michael Bienia +Martin Pitt +Kees Cook +Siegfried-A. Gevatter diff --git a/COPYING b/COPYING deleted file mode 100644 index 1bb399f..0000000 --- a/COPYING +++ /dev/null @@ -1,341 +0,0 @@ - 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. - - - Copyright (C) - - 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. - - , 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/changelog b/debian/changelog index c390e0c..26a65c7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -ubuntu-dev-tools (0.2) UNRELEASED; urgency=low +ubuntu-dev-tools (0.2) gutsy; urgency=low [ Martin Pitt ] * Add suspicious-source: Output a list of files which are not common source diff --git a/debian/copyright b/debian/copyright index f530ee4..f162fb1 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,31 +1,35 @@ This package was re-debianized by Daniel Holbach on Fri, 01 Jun 2007 11:30:08 +0200. -Upstream Author: - Daniel Holbach - Luke Yelavich +Upstream Author: Albin Tonnerre + Daniel Holbach + Jamin W. Collins + Jordan Mantha + Luke Yelavich + Martin Pitt Michael Bienia Kees Cook - Martin Pitt + Siegfried-A. Gevatter -Copyright: + +Copyright: + Albin Tonnerre 2006-2007 Daniel Holbach 2006-2007 Luke Yelavich 2006-2007 - Albin Tonnerre 2006-2007 + Martin Pitt 2007 Michael Bienia 2006-2007 Kees Cook 2006-2007 - Martin Pitt 2007 + Siegfried-A. Gevatter 2007 Licenses: -check-symbols, dch-repeat, mk-sbuild-lv, pull-debian-diff, suspicious-source, +check-symbols, dch-repeat, mk-sbuild-lv, pbuilder-dist, pull-debian-debdiff, update-maintainer and what-patch are licensed under GPLv2: This package 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. + the Free Software Foundation, at version 2. This package is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -39,12 +43,11 @@ update-maintainer and what-patch are licensed under GPLv2: On Debian systems, the complete text of the GNU General Public License v2 can be found in `/usr/share/common-licenses/GPL-2'. -get-branches is licensed under GPLv3: +get-branches and suspicious-source are licensed under GPLv3: 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 3 of the License, or - (at your option) any later version. + the Free Software Foundation, at version 3. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -56,3 +59,6 @@ get-branches is licensed under GPLv3: On Debian systems, the complete text of the GNU General Public License v3 can be found in `/usr/share/common-licenses/GPL-3'. + +The following of the scripts can be used, at your option, regarding any later version +of the previously specified license: pbuilder-dist and suspicious-source. diff --git a/pbuilder-dist b/pbuilder-dist index 66fb3d7..cb35817 100755 --- a/pbuilder-dist +++ b/pbuilder-dist @@ -9,7 +9,8 @@ # # If you want to use this copy of the script only for a single distribution # / version, rename it to 'pbuilder-dapper', 'pbuilder-feisty', 'pbuilder-gutsy', -# or whatever it is. +# or whatever it is. If you have an amd64, you can also use names like +# 'pbuilder-feisty-i386', etc. # # The only variable you really might need to change is BASE_DIR, if you # don't want pbuilder stuff in your home directory. @@ -20,7 +21,7 @@ BASE_DIR="$HOME/pbuilder" ARCH=`dpkg-architecture | grep "DEB_HOST_ARCH=" | cut -f2 -d '='` -if [ ! -z `echo \`basename $0\` | grep '-'` ] +if [ ! -z `echo \`basename $0\` | grep -- '-'` ] && [ `basename $0` != 'pbuilder-dist' ] then if [ $# -lt 1 ] then @@ -28,7 +29,8 @@ then echo "Usage: $0 "$( [ $ARCH != "amd64" ] || echo "[i386|amd64] " )"" exit 1 fi - + + BINARCH=`basename $0 | cut -f3 -d '-'` DISTRIBUTION=`basename $0 | cut -f2 -d '-'` else if [ $# -lt 2 ] From e2bbdb1bb6a0ef76d6f2e6bf62f25d7c5decca2e Mon Sep 17 00:00:00 2001 From: "Siegfried-Angel Gevatter Pujals (RainCT)" Date: Tue, 7 Aug 2007 21:58:34 +0200 Subject: [PATCH 3/3] pbuilder-dist: added an option to disable universe/multiverse --- pbuilder-dist | 69 +++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 51 insertions(+), 18 deletions(-) diff --git a/pbuilder-dist b/pbuilder-dist index cb35817..6daf90d 100755 --- a/pbuilder-dist +++ b/pbuilder-dist @@ -5,7 +5,8 @@ # License: GPLv2 or later # # This script is a wrapper to use pbuilder with many different -# distributions / versions. +# distributions / versions. (It was originally created because of +# bug #255165 in Debian.) # # If you want to use this copy of the script only for a single distribution # / version, rename it to 'pbuilder-dapper', 'pbuilder-feisty', 'pbuilder-gutsy', @@ -14,20 +15,29 @@ # # The only variable you really might need to change is BASE_DIR, if you # don't want pbuilder stuff in your home directory. -# -# BTS: #255165 +# Base directory where pbuilder will put all the files it creates BASE_DIR="$HOME/pbuilder" +# Enable additional repositories by default? (universe and multiverse in Ubuntu, +# contrib and non-free in Debian.) +EXTRACOMP=1 + + ARCH=`dpkg-architecture | grep "DEB_HOST_ARCH=" | cut -f2 -d '='` +help() +{ + echo "Insufficient number of arguments." + echo "Usage: $0 "$( [ "$1" != 'show-dist-flag' ] || echo " " )$( [ $ARCH != "amd64" ] || echo "[i386|amd64] " )"[mainonly|allcomp] " + exit 1 +} + if [ ! -z `echo \`basename $0\` | grep -- '-'` ] && [ `basename $0` != 'pbuilder-dist' ] then if [ $# -lt 1 ] then - echo "Insufficient number of arguments." - echo "Usage: $0 "$( [ $ARCH != "amd64" ] || echo "[i386|amd64] " )"" - exit 1 + help fi BINARCH=`basename $0 | cut -f3 -d '-'` @@ -35,15 +45,14 @@ then else if [ $# -lt 2 ] then - echo "Insufficient number of arguments." - echo "Usage: $0 ""$( [ $ARCH != "amd64" ] || echo "[i386|amd64] " )""" - exit 1 + help show-dist-flag fi DISTRIBUTION=$1 shift 1 fi + if [ $1 = "i386" ] || [ $1 = "amd64" ] then if [ $ARCH = "amd64" ] @@ -56,18 +65,41 @@ then shift 1 fi -OPERATION=$1 + +if [ $1 = "mainonly" ] +then + EXTRACOMP=0 + shift 1 +elif [ $1 = "allcomp" ] +then + EXTRACOMP=1 + shift 1 +fi + + +distdata() +{ + if [ "$1" = "debian" ] + then + # Set Debian specific data + ARCHIVE="http://ftp.debian.org" + COMPONENTS="main"$( [ $EXTRACOMP = 0 ] || echo " contrib non-free" ) + else + # Set Ubuntu specific data + ARCHIVE="http://archive.ubuntu.com/ubuntu" + COMPONENTS="main restricted"$( [ $EXTRACOMP = 0 ] || echo " universe multiverse" ) + fi +} + case $DISTRIBUTION in #warty|hoary|breezy) dapper|edgy|feisty|gutsy) - ARCHIVE="http://archive.ubuntu.com/ubuntu" - COMPONENTS="universe multiverse" + distdata ubuntu ;; oldstable|sarge|stable|etch|testing|lenny|unstable|sid|experimental) - ARCHIVE="http://ftp.debian.org" - COMPONENTS="main contrib non-free" + distdata debian ;; *) @@ -77,16 +109,17 @@ case $DISTRIBUTION in if [ "$continue" != 'y' ] && [ "$continue" != 'Y' ] then - echo " Aborting..." + echo "Aborting..." exit 1 fi - ARCHIVE="http://archive.ubuntu.com/ubuntu" - COMPONENTS="universe multiverse" + distdata ;; esac +OPERATION=$1 + case $OPERATION in create|update|build|clean|login|execute) ;; @@ -113,5 +146,5 @@ sudo pbuilder $OPERATION \ --basetgz $BASE_DIR/$DISTRIBUTION-base.tgz \ --distribution $DISTRIBUTION \ $( [ -z $BINARCH ] || echo "--binary-arch $BINARCH" ) \ - --buildresult $BASE_DIR/$DISTRIBUTION_result \ + --buildresult $BASE_DIR/${DISTRIBUTION}_result \ --othermirror "deb $ARCHIVE $DISTRIBUTION $COMPONENTS" $@