From 877585e2d7fdc5f25361f8fb6a8d976b8a3f04c4 Mon Sep 17 00:00:00 2001 From: Andrew McMillan Date: Sat, 26 Apr 2008 18:29:18 +1200 Subject: [PATCH 01/13] Refer to file explicitly in current directory. --- testing/run_regressions.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testing/run_regressions.sh b/testing/run_regressions.sh index 464b94fa..24944c5d 100755 --- a/testing/run_regressions.sh +++ b/testing/run_regressions.sh @@ -6,7 +6,7 @@ DBNAME=regression PGPOOL=inactive HOSTNAME=regression -. regression.conf +. ./regression.conf [ -z "${DSN}" ] && DSN="${DBNAME}" From 8cdc77232c456241989d612ed8db76dee6b1fc67 Mon Sep 17 00:00:00 2001 From: Andrew McMillan Date: Sat, 26 Apr 2008 18:30:09 +1200 Subject: [PATCH 02/13] Note need to remove 'general' from the regression tests. --- TODO | 3 +++ 1 file changed, 3 insertions(+) diff --git a/TODO b/TODO index 0209dd55..125369ad 100644 --- a/TODO +++ b/TODO @@ -10,3 +10,6 @@ Important - Fix the relationships code so relationships are controlled by the person affected (or the admin). - Implement draft-desruisseaux-caldav-sched specifications. + +Minor + - Remove the dependency on the 'general' user from the testing scripts. From 274469105c473870b522088be066fac5d23d2e1d Mon Sep 17 00:00:00 2001 From: Andrew McMillan Date: Sat, 26 Apr 2008 18:30:53 +1200 Subject: [PATCH 03/13] Remove over-enthusiastic quoting. --- dba/create-database.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dba/create-database.sh b/dba/create-database.sh index b2aab3b1..08a571e6 100755 --- a/dba/create-database.sh +++ b/dba/create-database.sh @@ -76,10 +76,10 @@ fi # # Try a few alternatives for a database user or give up... if try_db_user "${AWL_DBAUSER}" ; then - export DBA="-U \"${AWL_DBAUSER}\"" + export DBA="-U ${AWL_DBAUSER}" else if try_db_user "postgres" ; then - export DBA="-U \"postgres\"" + export DBA="-U postgres" else if try_db_user "${USER}" ; then export DBA="" From fe2b6d235254cb037d42188f8aa006bca12f8575 Mon Sep 17 00:00:00 2001 From: Andrew McMillan Date: Wed, 7 May 2008 21:05:06 +1200 Subject: [PATCH 04/13] Allow users to delete their own relationships, not just admins. --- inc/RSCDSUser.php | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/inc/RSCDSUser.php b/inc/RSCDSUser.php index 8bd7d2ae..d4df8b89 100644 --- a/inc/RSCDSUser.php +++ b/inc/RSCDSUser.php @@ -272,6 +272,31 @@ EOSQL; } + /** + * Extend parent definition of what the current user is allowed to do + * @param string $whatever What the user wants to do + * @return boolean Whether they are allowed to. + */ + function AllowedTo ( $whatever ) + { + global $session; + + $rc = false; + switch( strtolower($whatever) ) { + + case 'deleterelationship': + $rc = ( $session->AllowedTo("Admin") + || ($this->user_no > 0 && $session->user_no == $this->user_no) ); + break; + + default: + $rc = parent::AllowedTo( $whatever ); + } + + return $rc; + } + + /** * Handle any unusual actions we might invent */ @@ -283,7 +308,7 @@ EOSQL; switch( $action ) { case 'delete_relationship': dbg_error_log("User",":HandleAction: Deleting relationship to %d from %d", $this->user_no, $_GET['from_user'] ); - if ( $this->AllowedTo("Admin") ) { + if ( $this->AllowedTo("DeleteRelationship") ) { dbg_error_log("User",":HandleAction: Deleting relationship to %d from %d", $this->user_no, $_GET['from_user'] ); $qry = new PgQuery("DELETE FROM relationship WHERE to_user=? AND from_user=?;", $this->user_no, $_GET['from_user'] ); if ( $qry->Exec() ) { From cbb246d99aaadfdf5908367dca905952e1a5f283 Mon Sep 17 00:00:00 2001 From: Andrew McMillan Date: Wed, 7 May 2008 21:32:10 +1200 Subject: [PATCH 05/13] Merge changelog and VERSION from 0.9 branch. --- VERSION | 2 +- debian/changelog | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 0d14d751..b0bb8785 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.9.4.4 +0.9.5 diff --git a/debian/changelog b/debian/changelog index 3368012f..9c688739 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +rscds (0.9.5) unstable; urgency=low + + * Allow users to delete their own relationships, not just admin. + + -- Andrew McMillan Wed, 07 May 2008 21:29:39 +1200 + +rscds (0.9.4.5) unstable; urgency=low + + * Fix quoting in create database script. + + -- Andrew McMillan Mon, 05 May 2008 15:42:09 +1200 + rscds (0.9.4.4) unstable; urgency=low * Fix dependencies for postgresql-client. From 0d5845fc5b5fe2acdbe2726414cb29e16eb5587b Mon Sep 17 00:00:00 2001 From: Raphael Hertzog Date: Mon, 12 May 2008 20:12:10 +1200 Subject: [PATCH 06/13] Ensure postinst works idempotently. --- debian/rscds.postinst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rscds.postinst b/debian/rscds.postinst index 66fc27aa..f9c7f94d 100644 --- a/debian/rscds.postinst +++ b/debian/rscds.postinst @@ -9,7 +9,7 @@ PACKAGE=::package:: # # Migrate directory location to /etc/davical from /etc/rscds # -if [ -d /etc/rscds -a -d /etc/davical ]; then +if [ -d /etc/rscds -a -d /etc/davical -a ! -h /etc/rscds ]]; then for CNFFILE in /etc/rscds/*; do if [ -f "${CNFFILE}" ]; then mv "${CNFFILE}" /etc/davical From c02209acc36eab565e5597d0b275e81ae0a48933 Mon Sep 17 00:00:00 2001 From: Andrew McMillan Date: Mon, 12 May 2008 20:12:57 +1200 Subject: [PATCH 07/13] Fix typo. --- inc/drivers_ldap.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inc/drivers_ldap.php b/inc/drivers_ldap.php index 92e56854..9d886c65 100644 --- a/inc/drivers_ldap.php +++ b/inc/drivers_ldap.php @@ -105,7 +105,7 @@ class ldapDrivers if (!ldap_bind($this->connect,$config['bindDN'],$config['passDN'])){ $bindDN = isset($config['bindDN']) ? $config['bindDN'] : 'anonymous'; $passDN = isset($config['passDN']) ? $config['passDN'] : 'anonymous'; - dbg_error_log( "LDAP", i18n('drivers_ldap : Failed to bind to host %1$s on port %2$s with bindDN of %3$s'), $host, $port $bindDN ); + dbg_error_log( "LDAP", i18n('drivers_ldap : Failed to bind to host %1$s on port %2$s with bindDN of %3$s'), $host, $port, $bindDN ); $c->messages[] = i18n( 'drivers_ldap : Unable to bind to LDAP - check your configuration for bindDN and passDN, and that your LDAP server is reachable'); $this->valid=false; return ; From 72769a30ab060a7422d7568ba629a750b28497fa Mon Sep 17 00:00:00 2001 From: Francois Marier Date: Wed, 28 May 2008 12:21:09 +1200 Subject: [PATCH 08/13] Rename README.Debian --- debian/{README.debian => README.Debian} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename debian/{README.debian => README.Debian} (100%) diff --git a/debian/README.debian b/debian/README.Debian similarity index 100% rename from debian/README.debian rename to debian/README.Debian From be72c6f58b731780807ec961e9d4e46e8b920734 Mon Sep 17 00:00:00 2001 From: Francois Marier Date: Wed, 28 May 2008 12:23:16 +1200 Subject: [PATCH 09/13] Add a watch file. --- debian/watch | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 debian/watch diff --git a/debian/watch b/debian/watch new file mode 100644 index 00000000..6d9fc822 --- /dev/null +++ b/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://sf.net/rscds/rscds-([\d.]*).tar.gz From 5cfaa9783140d20038d28008b38a99236f415ecd Mon Sep 17 00:00:00 2001 From: Francois Marier Date: Wed, 28 May 2008 12:32:42 +1200 Subject: [PATCH 10/13] Add versioned depends on debhelper. Add informational fields. --- debian/control | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/debian/control b/debian/control index ad553a2c..b74ac582 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,10 @@ Section: web Priority: extra Maintainer: Andrew McMillan Standards-Version: 3.7.3 -Build-Depends: debhelper +Build-Depends: debhelper (>= 5) +Vcs-git: git://git.catalyst.net.nz/rscds.git +Vcs-browser: http://git.catalyst.net.nz/?p=rscds.git +Homepage: http://davical.org/ Package: rscds Architecture: all From 25d0a53038dd7be186f4dbf8125816f8cb886799 Mon Sep 17 00:00:00 2001 From: Francois Marier Date: Wed, 28 May 2008 12:33:05 +1200 Subject: [PATCH 11/13] Ignore debhelper log. --- debian/.gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/.gitignore b/debian/.gitignore index a133bef0..1cd85f44 100644 --- a/debian/.gitignore +++ b/debian/.gitignore @@ -2,3 +2,4 @@ files html rscds rscds-phpdoc.ini +rscds.debhelper.log From 6c641ef08a3a161cee94db4893513b348c979e08 Mon Sep 17 00:00:00 2001 From: Andrew McMillan Date: Wed, 28 May 2008 20:08:32 +1200 Subject: [PATCH 12/13] Fix lintian warnings --- debian/rules | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/debian/rules b/debian/rules index 540ad190..6518d6e5 100755 --- a/debian/rules +++ b/debian/rules @@ -17,6 +17,7 @@ clean: make clean rm -f build -rm -rf $(dt) debian/files* core debian/substvars debian/html + dh_clean binary-indep: checkroot build $(checkdir) @@ -36,24 +37,20 @@ binary-indep: checkroot build cp config/example-administration.yml $(dt)/usr/share/doc/$(package)/examples/administration.yml cp config/debug-config.php $(dt)/usr/share/doc/$(package)/examples cp config/other-config.php $(dt)/usr/share/doc/$(package)/examples + find $(dt)/ -name ".gitignore" -exec rm {} \; dh_installchangelogs dh_fixperms # install -m 1777 -d $(dt)/var/lib/$(package)/attachments dh_installdeb dpkg-gencontrol -P$(dt) + dh_md5sums dpkg --build $(dt) .. -binary-arch: checkroot build - $(checkdir) -# There are no architecture-dependent files to be uploaded -# generated by this package. If there were any they would be -# made here. - define checkdir test -f debian/rules endef -binary: binary-indep binary-arch +binary: binary-indep checkroot: $(checkdir) From 717adf26cbab7915401dd9a7ac6a6acae328d801 Mon Sep 17 00:00:00 2001 From: Andrew McMillan Date: Wed, 28 May 2008 21:01:09 +1200 Subject: [PATCH 13/13] Expand on copyright notices, as recommended by Debian and the FSF --- COPYING | 339 +++++++++++++++++++++++++++++++++++++++++++++++ README | 20 ++- debian/copyright | 28 +++- 3 files changed, 383 insertions(+), 4 deletions(-) create mode 100644 COPYING diff --git a/COPYING b/COPYING new file mode 100644 index 00000000..d511905c --- /dev/null +++ b/COPYING @@ -0,0 +1,339 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, 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 Lesser 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 Street, 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 Lesser General +Public License instead of this License. diff --git a/README b/README index 6593db96..6628e6dd 100644 --- a/README +++ b/README @@ -6,4 +6,22 @@ up. Good luck! -Andrew McMillan \ No newline at end of file +Andrew McMillan + +----------------------------------------------- +Copyright: 2006-2008 Andrew McMillan + +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 Street, Fifth Floor, Boston, MA +02110-1301, USA diff --git a/debian/copyright b/debian/copyright index 2a951092..32250540 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,4 +1,26 @@ -The Really Simple CalDAV Store is copyright 2006 Andrew McMillan and -are licensed under the Gnu Public License version 2, or later. +This package was debianized by Andrew McMillan -Translations and other contributions are copyright by their authors. +It was downloaded from http://sourceforge.net/projects/rscds/ + +Upstream Author: Andrew McMillan + +Copyright: 2006-2008 Andrew McMillan + + 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 Street, Fifth Floor, Boston, MA + 02110-1301, USA + +You are free to distribute this software under the terms of the GNU General +Public License. On Debian systems, the complete text of the GNU General +Public License can be found in /usr/share/common-licenses/GPL file.