This commit is contained in:
parent
528f9d9278
commit
3148181539
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:756b1ce6d808fbe1d399321e704be4f744fc9303f372b8a4b81d6fd4658583a3
|
||||
size 278628
|
3
akonadi-15.08.1.tar.xz
Normal file
3
akonadi-15.08.1.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:46d7b561c5f1b4c1b330a56cb8ad77d6f51a1ae8976dd555c3948cb87f1542a4
|
||||
size 278404
|
@ -1,385 +0,0 @@
|
||||
commit 79758c9302532574920510a890be770a592b38a5
|
||||
Author: Dan Vrátil <dvratil@redhat.com>
|
||||
Date: Fri Aug 28 16:05:27 2015 +0200
|
||||
|
||||
Fix incorrect license of some files
|
||||
|
||||
The license should be LGPLv2.1+ everywhere, but some file were accidentally
|
||||
licensed under GPLv2. This patch relicenses those files to he under LGPLv2.1+
|
||||
too. All contributors agreed to the change.
|
||||
|
||||
BUG: 351747
|
||||
FIXED-IN: 15.08.1
|
||||
|
||||
diff --git a/autotests/server/fakeakonadiserver.cpp b/autotests/server/fakeakonadiserver.cpp
|
||||
index f1b9376..0b482eb 100644
|
||||
--- a/autotests/server/fakeakonadiserver.cpp
|
||||
+++ b/autotests/server/fakeakonadiserver.cpp
|
||||
@@ -1,19 +1,19 @@
|
||||
/*
|
||||
* Copyright (C) 2014 Daniel Vrátil <dvratil@redhat.com>
|
||||
*
|
||||
- * 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 library is free software; you can redistribute it and/or
|
||||
+ * modify it under the terms of the GNU Lesser General Public
|
||||
+ * License as published by the Free Software Foundation; either
|
||||
+ * version 2.1 of the License, or (at your option) any later version.
|
||||
*
|
||||
- * This program is distributed in the hope that it will be useful,
|
||||
+ * This library 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.
|
||||
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
+ * Lesser 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 should have received a copy of the GNU Lesser General Public
|
||||
+ * License along with this library; if not, write to the Free Software
|
||||
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*
|
||||
*/
|
||||
|
||||
diff --git a/autotests/server/fakeakonadiserver.h b/autotests/server/fakeakonadiserver.h
|
||||
index cf90e3d..ccc789a 100644
|
||||
--- a/autotests/server/fakeakonadiserver.h
|
||||
+++ b/autotests/server/fakeakonadiserver.h
|
||||
@@ -1,22 +1,21 @@
|
||||
/*
|
||||
* Copyright (C) 2014 Daniel Vrátil <dvratil@redhat.com>
|
||||
*
|
||||
- * 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 library is free software; you can redistribute it and/or
|
||||
+ * modify it under the terms of the GNU Lesser General Public
|
||||
+ * License as published by the Free Software Foundation; either
|
||||
+ * version 2.1 of the License, or (at your option) any later version.
|
||||
*
|
||||
- * This program is distributed in the hope that it will be useful,
|
||||
+ * This library 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.
|
||||
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
+ * Lesser 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 should have received a copy of the GNU Lesser General Public
|
||||
+ * License along with this library; if not, write to the Free Software
|
||||
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*
|
||||
*/
|
||||
-
|
||||
#ifndef FAKEAKONADISERVER_H
|
||||
#define FAKEAKONADISERVER_H
|
||||
|
||||
diff --git a/src/private/datastream_p.cpp b/src/private/datastream_p.cpp
|
||||
index c257e68..55621fa 100644
|
||||
--- a/src/private/datastream_p.cpp
|
||||
+++ b/src/private/datastream_p.cpp
|
||||
@@ -1,22 +1,20 @@
|
||||
/*
|
||||
- * Copyright 2015 Daniel Vrátil <dvratil@redhat.com>
|
||||
+ * Copyright (C) 2015 Daniel Vrátil <dvratil@redhat.com>
|
||||
*
|
||||
- * 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) version 3 or any later version
|
||||
- * accepted by the membership of KDE e.V. (or its successor approved
|
||||
- * by the membership of KDE e.V.), which shall act as a proxy
|
||||
- * defined in Section 14 of version 3 of the license.
|
||||
- *
|
||||
- * This program is distributed in the hope that it will be useful,
|
||||
+ * This library is free software; you can redistribute it and/or
|
||||
+ * modify it under the terms of the GNU Lesser General Public
|
||||
+ * License as published by the Free Software Foundation; either
|
||||
+ * version 2.1 of the License, or (at your option) any later version.
|
||||
+ *
|
||||
+ * This library 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, see <http://www.gnu.org/licenses/>.
|
||||
- *
|
||||
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
+ * Lesser General Public License for more details.
|
||||
+ *
|
||||
+ * You should have received a copy of the GNU Lesser General Public
|
||||
+ * License along with this library; if not, write to the Free Software
|
||||
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
+ *
|
||||
*/
|
||||
|
||||
#include "datastream_p_p.h"
|
||||
diff --git a/src/private/datastream_p_p.h b/src/private/datastream_p_p.h
|
||||
index 8b24e3d..f15c063 100644
|
||||
--- a/src/private/datastream_p_p.h
|
||||
+++ b/src/private/datastream_p_p.h
|
||||
@@ -1,22 +1,20 @@
|
||||
/*
|
||||
- * Copyright 2015 Daniel Vrátil <dvratil@redhat.com>
|
||||
- *
|
||||
- * 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) version 3 or any later version
|
||||
- * accepted by the membership of KDE e.V. (or its successor approved
|
||||
- * by the membership of KDE e.V.), which shall act as a proxy
|
||||
- * defined in Section 14 of version 3 of the license.
|
||||
- *
|
||||
- * This program is distributed in the hope that it will be useful,
|
||||
+ * Copyright (C) 2015 Daniel Vrátil <dvratil@redhat.com>
|
||||
+ *
|
||||
+ * This library is free software; you can redistribute it and/or
|
||||
+ * modify it under the terms of the GNU Lesser General Public
|
||||
+ * License as published by the Free Software Foundation; either
|
||||
+ * version 2.1 of the License, or (at your option) any later version.
|
||||
+ *
|
||||
+ * This library 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, see <http://www.gnu.org/licenses/>.
|
||||
- *
|
||||
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
+ * Lesser General Public License for more details.
|
||||
+ *
|
||||
+ * You should have received a copy of the GNU Lesser General Public
|
||||
+ * License along with this library; if not, write to the Free Software
|
||||
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
+ *
|
||||
*/
|
||||
|
||||
#ifndef AKONADI_PROTOCOL_DATASTREAM_H
|
||||
diff --git a/src/server/commandcontext.cpp b/src/server/commandcontext.cpp
|
||||
index 6ec5532..552d936 100644
|
||||
--- a/src/server/commandcontext.cpp
|
||||
+++ b/src/server/commandcontext.cpp
|
||||
@@ -1,19 +1,19 @@
|
||||
/*
|
||||
* Copyright (C) 2014 Daniel Vrátil <dvratil@redhat.com>
|
||||
*
|
||||
- * 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 library is free software; you can redistribute it and/or
|
||||
+ * modify it under the terms of the GNU Lesser General Public
|
||||
+ * License as published by the Free Software Foundation; either
|
||||
+ * version 2.1 of the License, or (at your option) any later version.
|
||||
*
|
||||
- * This program is distributed in the hope that it will be useful,
|
||||
+ * This library 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.
|
||||
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
+ * Lesser 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 should have received a copy of the GNU Lesser General Public
|
||||
+ * License along with this library; if not, write to the Free Software
|
||||
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*
|
||||
*/
|
||||
|
||||
diff --git a/src/server/commandcontext.h b/src/server/commandcontext.h
|
||||
index b9b1ef4..d6dd499 100644
|
||||
--- a/src/server/commandcontext.h
|
||||
+++ b/src/server/commandcontext.h
|
||||
@@ -1,22 +1,23 @@
|
||||
/*
|
||||
* Copyright (C) 2014 Daniel Vrátil <dvratil@redhat.com>
|
||||
*
|
||||
- * 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 library is free software; you can redistribute it and/or
|
||||
+ * modify it under the terms of the GNU Lesser General Public
|
||||
+ * License as published by the Free Software Foundation; either
|
||||
+ * version 2.1 of the License, or (at your option) any later version.
|
||||
*
|
||||
- * This program is distributed in the hope that it will be useful,
|
||||
+ * This library 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.
|
||||
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
+ * Lesser 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 should have received a copy of the GNU Lesser General Public
|
||||
+ * License along with this library; if not, write to the Free Software
|
||||
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*
|
||||
*/
|
||||
|
||||
+
|
||||
#ifndef COMMANDCONTEXT_H
|
||||
#define COMMANDCONTEXT_H
|
||||
|
||||
diff --git a/src/server/handler/searchresult.cpp b/src/server/handler/searchresult.cpp
|
||||
index e6606da..07545a3 100644
|
||||
--- a/src/server/handler/searchresult.cpp
|
||||
+++ b/src/server/handler/searchresult.cpp
|
||||
@@ -1,21 +1,19 @@
|
||||
/*
|
||||
- * Copyright 2013 Daniel Vrátil <dvratil@redhat.com>
|
||||
+ * Copyright (C) 2013 Daniel Vrátil <dvratil@redhat.com>
|
||||
*
|
||||
- * 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) version 3 or any later version
|
||||
- * accepted by the membership of KDE e.V. (or its successor approved
|
||||
- * by the membership of KDE e.V.), which shall act as a proxy
|
||||
- * defined in Section 14 of version 3 of the license.
|
||||
+ * This library is free software; you can redistribute it and/or
|
||||
+ * modify it under the terms of the GNU Lesser General Public
|
||||
+ * License as published by the Free Software Foundation; either
|
||||
+ * version 2.1 of the License, or (at your option) any later version.
|
||||
*
|
||||
- * This program is distributed in the hope that it will be useful,
|
||||
+ * This library 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.
|
||||
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
+ * Lesser General Public License for more details.
|
||||
*
|
||||
- * You should have received a copy of the GNU General Public License
|
||||
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
+ * You should have received a copy of the GNU Lesser General Public
|
||||
+ * License along with this library; if not, write to the Free Software
|
||||
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*
|
||||
*/
|
||||
|
||||
diff --git a/src/server/handler/searchresult.h b/src/server/handler/searchresult.h
|
||||
index 4766509..308cdfa 100644
|
||||
--- a/src/server/handler/searchresult.h
|
||||
+++ b/src/server/handler/searchresult.h
|
||||
@@ -1,24 +1,23 @@
|
||||
/*
|
||||
- * Copyright 2013 Daniel Vrátil <dvratil@redhat.com>
|
||||
+ * Copyright (C) 2013 Daniel Vrátil <dvratil@redhat.com>
|
||||
*
|
||||
- * 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) version 3 or any later version
|
||||
- * accepted by the membership of KDE e.V. (or its successor approved
|
||||
- * by the membership of KDE e.V.), which shall act as a proxy
|
||||
- * defined in Section 14 of version 3 of the license.
|
||||
+ * This library is free software; you can redistribute it and/or
|
||||
+ * modify it under the terms of the GNU Lesser General Public
|
||||
+ * License as published by the Free Software Foundation; either
|
||||
+ * version 2.1 of the License, or (at your option) any later version.
|
||||
*
|
||||
- * This program is distributed in the hope that it will be useful,
|
||||
+ * This library 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.
|
||||
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
+ * Lesser General Public License for more details.
|
||||
*
|
||||
- * You should have received a copy of the GNU General Public License
|
||||
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
+ * You should have received a copy of the GNU Lesser General Public
|
||||
+ * License along with this library; if not, write to the Free Software
|
||||
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*
|
||||
*/
|
||||
|
||||
+
|
||||
#ifndef AKONADI_SEARCHRESULT_H
|
||||
#define AKONADI_SEARCHRESULT_H
|
||||
|
||||
diff --git a/src/server/storage/storagedebugger.cpp b/src/server/storage/storagedebugger.cpp
|
||||
index 9a5e2d4..15ae2eb 100644
|
||||
--- a/src/server/storage/storagedebugger.cpp
|
||||
+++ b/src/server/storage/storagedebugger.cpp
|
||||
@@ -1,19 +1,19 @@
|
||||
/*
|
||||
* Copyright (C) 2013 Daniel Vrátil <dvratil@redhat.com>
|
||||
*
|
||||
- * 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 library is free software; you can redistribute it and/or
|
||||
+ * modify it under the terms of the GNU Lesser General Public
|
||||
+ * License as published by the Free Software Foundation; either
|
||||
+ * version 2.1 of the License, or (at your option) any later version.
|
||||
*
|
||||
- * This program is distributed in the hope that it will be useful,
|
||||
+ * This library 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.
|
||||
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
+ * Lesser 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 should have received a copy of the GNU Lesser General Public
|
||||
+ * License along with this library; if not, write to the Free Software
|
||||
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*
|
||||
*/
|
||||
|
||||
diff --git a/src/server/storage/storagedebugger.h b/src/server/storage/storagedebugger.h
|
||||
index 1d6f9e5..91b6934 100644
|
||||
--- a/src/server/storage/storagedebugger.h
|
||||
+++ b/src/server/storage/storagedebugger.h
|
||||
@@ -1,19 +1,19 @@
|
||||
/*
|
||||
* Copyright (C) 2013 Daniel Vrátil <dvratil@redhat.com>
|
||||
*
|
||||
- * 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 library is free software; you can redistribute it and/or
|
||||
+ * modify it under the terms of the GNU Lesser General Public
|
||||
+ * License as published by the Free Software Foundation; either
|
||||
+ * version 2.1 of the License, or (at your option) any later version.
|
||||
*
|
||||
- * This program is distributed in the hope that it will be useful,
|
||||
+ * This library 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.
|
||||
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
+ * Lesser 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 should have received a copy of the GNU Lesser General Public
|
||||
+ * License along with this library; if not, write to the Free Software
|
||||
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*
|
||||
*/
|
||||
|
@ -4,7 +4,7 @@ Sun Sep 13 18:54:20 UTC 2015 - tittiatcoke@gmail.com
|
||||
- Update to KDE Applications 15.08.1
|
||||
* KDE Applications 15.08.1
|
||||
* https://www.kde.org/announcements/announce-applications-15.08.1.php
|
||||
|
||||
- Drop upstream patch akonadi-fix-licenses.diff
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Aug 29 07:10:31 UTC 2015 - cgiboudeaux@gmx.com
|
||||
|
Loading…
Reference in New Issue
Block a user