From e2494d477ad29c5a5c18a685f4825f61cc312227 Mon Sep 17 00:00:00 2001 From: Brian Pellin Date: Wed, 11 Mar 2009 21:57:48 -0500 Subject: [PATCH] Update license texts to allow GPL version 2 as I originally intented. --- src/com/android/keepass/Database.java | 2 +- src/com/android/keepass/EntryActivity.java | 2 +- src/com/android/keepass/GroupActivity.java | 2 +- src/com/android/keepass/KeePass.java | 2 +- src/com/android/keepass/LockManager.java | 2 +- src/com/android/keepass/LockingActivity.java | 2 +- .../android/keepass/LockingListActivity.java | 19 ++++++++++++++++++ src/com/android/keepass/PasswordActivity.java | 2 +- src/com/android/keepass/PwEntryView.java | 2 +- src/com/android/keepass/PwGroupView.java | 2 +- src/com/android/keepass/PwListAdapter.java | 2 +- src/com/android/keepass/Util.java | 2 +- .../keepass/fileselect/FileDbHelper.java | 2 +- .../keepass/fileselect/FileListAdapter.java | 20 ++++++++++++++++++- .../fileselect/FileSelectActivity.java | 2 +- .../keepass/intents/TimeoutIntents.java | 20 ++++++++++++++++++- .../keepasslib/InvalidKeyFileException.java | 20 ++++++++++++++++++- .../keepass/services/TimeoutService.java | 2 +- 18 files changed, 90 insertions(+), 17 deletions(-) diff --git a/src/com/android/keepass/Database.java b/src/com/android/keepass/Database.java index de59fffe3..55676a162 100644 --- a/src/com/android/keepass/Database.java +++ b/src/com/android/keepass/Database.java @@ -5,7 +5,7 @@ * * KeePassDroid 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 + * the Free Software Foundation, either version 2 of the License, or * (at your option) any later version. * * KeePassDroid is distributed in the hope that it will be useful, diff --git a/src/com/android/keepass/EntryActivity.java b/src/com/android/keepass/EntryActivity.java index 23fa1e0da..3ca3f80f6 100644 --- a/src/com/android/keepass/EntryActivity.java +++ b/src/com/android/keepass/EntryActivity.java @@ -5,7 +5,7 @@ * * KeePassDroid 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 + * the Free Software Foundation, either version 2 of the License, or * (at your option) any later version. * * KeePassDroid is distributed in the hope that it will be useful, diff --git a/src/com/android/keepass/GroupActivity.java b/src/com/android/keepass/GroupActivity.java index f0818ff5c..2a539d7f9 100644 --- a/src/com/android/keepass/GroupActivity.java +++ b/src/com/android/keepass/GroupActivity.java @@ -5,7 +5,7 @@ * * KeePassDroid 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 + * the Free Software Foundation, either version 2 of the License, or * (at your option) any later version. * * KeePassDroid is distributed in the hope that it will be useful, diff --git a/src/com/android/keepass/KeePass.java b/src/com/android/keepass/KeePass.java index 3ee2dd011..39b981d4c 100644 --- a/src/com/android/keepass/KeePass.java +++ b/src/com/android/keepass/KeePass.java @@ -5,7 +5,7 @@ * * KeePassDroid 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 + * the Free Software Foundation, either version 2 of the License, or * (at your option) any later version. * * KeePassDroid is distributed in the hope that it will be useful, diff --git a/src/com/android/keepass/LockManager.java b/src/com/android/keepass/LockManager.java index 4216b6114..7b47e310a 100644 --- a/src/com/android/keepass/LockManager.java +++ b/src/com/android/keepass/LockManager.java @@ -5,7 +5,7 @@ * * KeePassDroid 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 + * the Free Software Foundation, either version 2 of the License, or * (at your option) any later version. * * KeePassDroid is distributed in the hope that it will be useful, diff --git a/src/com/android/keepass/LockingActivity.java b/src/com/android/keepass/LockingActivity.java index 40a810f3a..f5a06f590 100644 --- a/src/com/android/keepass/LockingActivity.java +++ b/src/com/android/keepass/LockingActivity.java @@ -5,7 +5,7 @@ * * KeePassDroid 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 + * the Free Software Foundation, either version 2 of the License, or * (at your option) any later version. * * KeePassDroid is distributed in the hope that it will be useful, diff --git a/src/com/android/keepass/LockingListActivity.java b/src/com/android/keepass/LockingListActivity.java index efe0a2614..eec1af073 100644 --- a/src/com/android/keepass/LockingListActivity.java +++ b/src/com/android/keepass/LockingListActivity.java @@ -1,3 +1,22 @@ +/* + * Copyright 2009 Brian Pellin. + * + * This file is part of KeePassDroid. + * + * KeePassDroid 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. + * + * KeePassDroid 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 KeePassDroid. If not, see . + * + */ package com.android.keepass; import android.app.ListActivity; diff --git a/src/com/android/keepass/PasswordActivity.java b/src/com/android/keepass/PasswordActivity.java index 8def7b932..c6f22ffb5 100644 --- a/src/com/android/keepass/PasswordActivity.java +++ b/src/com/android/keepass/PasswordActivity.java @@ -5,7 +5,7 @@ * * KeePassDroid 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 + * the Free Software Foundation, either version 2 of the License, or * (at your option) any later version. * * KeePassDroid is distributed in the hope that it will be useful, diff --git a/src/com/android/keepass/PwEntryView.java b/src/com/android/keepass/PwEntryView.java index 32f73647f..32665215d 100644 --- a/src/com/android/keepass/PwEntryView.java +++ b/src/com/android/keepass/PwEntryView.java @@ -5,7 +5,7 @@ * * KeePassDroid 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 + * the Free Software Foundation, either version 2 of the License, or * (at your option) any later version. * * KeePassDroid is distributed in the hope that it will be useful, diff --git a/src/com/android/keepass/PwGroupView.java b/src/com/android/keepass/PwGroupView.java index 7b7517102..0940642c9 100644 --- a/src/com/android/keepass/PwGroupView.java +++ b/src/com/android/keepass/PwGroupView.java @@ -5,7 +5,7 @@ * * KeePassDroid 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 + * the Free Software Foundation, either version 2 of the License, or * (at your option) any later version. * * KeePassDroid is distributed in the hope that it will be useful, diff --git a/src/com/android/keepass/PwListAdapter.java b/src/com/android/keepass/PwListAdapter.java index d87eb3e33..07d8d60c5 100644 --- a/src/com/android/keepass/PwListAdapter.java +++ b/src/com/android/keepass/PwListAdapter.java @@ -5,7 +5,7 @@ * * KeePassDroid 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 + * the Free Software Foundation, either version 2 of the License, or * (at your option) any later version. * * KeePassDroid is distributed in the hope that it will be useful, diff --git a/src/com/android/keepass/Util.java b/src/com/android/keepass/Util.java index d55d09d90..de5f5e2c6 100644 --- a/src/com/android/keepass/Util.java +++ b/src/com/android/keepass/Util.java @@ -5,7 +5,7 @@ * * KeePassDroid 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 + * the Free Software Foundation, either version 2 of the License, or * (at your option) any later version. * * KeePassDroid is distributed in the hope that it will be useful, diff --git a/src/com/android/keepass/fileselect/FileDbHelper.java b/src/com/android/keepass/fileselect/FileDbHelper.java index 094843ac7..7b1e3ff4d 100644 --- a/src/com/android/keepass/fileselect/FileDbHelper.java +++ b/src/com/android/keepass/fileselect/FileDbHelper.java @@ -5,7 +5,7 @@ * * KeePassDroid 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 + * the Free Software Foundation, either version 2 of the License, or * (at your option) any later version. * * KeePassDroid is distributed in the hope that it will be useful, diff --git a/src/com/android/keepass/fileselect/FileListAdapter.java b/src/com/android/keepass/fileselect/FileListAdapter.java index 355359d8a..49239bfbb 100644 --- a/src/com/android/keepass/fileselect/FileListAdapter.java +++ b/src/com/android/keepass/fileselect/FileListAdapter.java @@ -1,4 +1,22 @@ -package com.android.keepass.fileselect; +/* + * Copyright 2009 Brian Pellin. + * + * This file is part of KeePassDroid. + * + * KeePassDroid 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. + * + * KeePassDroid 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 KeePassDroid. If not, see . + * + */package com.android.keepass.fileselect; import android.content.Context; import android.view.View; diff --git a/src/com/android/keepass/fileselect/FileSelectActivity.java b/src/com/android/keepass/fileselect/FileSelectActivity.java index b68a2430e..c5c862410 100644 --- a/src/com/android/keepass/fileselect/FileSelectActivity.java +++ b/src/com/android/keepass/fileselect/FileSelectActivity.java @@ -5,7 +5,7 @@ * * KeePassDroid 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 + * the Free Software Foundation, either version 2 of the License, or * (at your option) any later version. * * KeePassDroid is distributed in the hope that it will be useful, diff --git a/src/com/android/keepass/intents/TimeoutIntents.java b/src/com/android/keepass/intents/TimeoutIntents.java index bf9308aa7..c50584ab1 100644 --- a/src/com/android/keepass/intents/TimeoutIntents.java +++ b/src/com/android/keepass/intents/TimeoutIntents.java @@ -1,4 +1,22 @@ -package com.android.keepass.intents; +/* + * Copyright 2009 Brian Pellin. + * + * This file is part of KeePassDroid. + * + * KeePassDroid 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. + * + * KeePassDroid 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 KeePassDroid. If not, see . + * + */package com.android.keepass.intents; public class TimeoutIntents { public static final String START = "com.android.keepass.timeout.start"; diff --git a/src/com/android/keepass/keepasslib/InvalidKeyFileException.java b/src/com/android/keepass/keepasslib/InvalidKeyFileException.java index bc24e64c3..61019e7d7 100644 --- a/src/com/android/keepass/keepasslib/InvalidKeyFileException.java +++ b/src/com/android/keepass/keepasslib/InvalidKeyFileException.java @@ -1,4 +1,22 @@ -package com.android.keepass.keepasslib; +/* + * Copyright 2009 Brian Pellin. + * + * This file is part of KeePassDroid. + * + * KeePassDroid 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. + * + * KeePassDroid 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 KeePassDroid. If not, see . + * + */package com.android.keepass.keepasslib; public class InvalidKeyFileException extends Exception { /** diff --git a/src/com/android/keepass/services/TimeoutService.java b/src/com/android/keepass/services/TimeoutService.java index d9ccec519..c22f373e5 100644 --- a/src/com/android/keepass/services/TimeoutService.java +++ b/src/com/android/keepass/services/TimeoutService.java @@ -5,7 +5,7 @@ * * KeePassDroid 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 + * the Free Software Foundation, either version 2 of the License, or * (at your option) any later version. * * KeePassDroid is distributed in the hope that it will be useful,