rev 15680 - in kde-extras/akonadi-googledata/trunk/debian: . patches
Fathi Boudra
fabo at alioth.debian.org
Tue Aug 18 15:23:51 UTC 2009
Author: fabo
Date: 2009-08-18 15:23:51 +0000 (Tue, 18 Aug 2009)
New Revision: 15680
Added:
kde-extras/akonadi-googledata/trunk/debian/patches/
kde-extras/akonadi-googledata/trunk/debian/patches/01_fix_copyright_headers.diff
kde-extras/akonadi-googledata/trunk/debian/patches/series
Modified:
kde-extras/akonadi-googledata/trunk/debian/changelog
kde-extras/akonadi-googledata/trunk/debian/control
kde-extras/akonadi-googledata/trunk/debian/copyright
kde-extras/akonadi-googledata/trunk/debian/rules
Log:
* Add debian/patches/01_fix_copyright_headers.diff:
upstream patch to fix copyright headers.
akonadi-googledata is licensed under LGPL, not GPL.
* Add quilt build dependency and adjust debian/rules file.
Modified: kde-extras/akonadi-googledata/trunk/debian/changelog
===================================================================
--- kde-extras/akonadi-googledata/trunk/debian/changelog 2009-08-18 15:03:55 UTC (rev 15679)
+++ kde-extras/akonadi-googledata/trunk/debian/changelog 2009-08-18 15:23:51 UTC (rev 15680)
@@ -1,3 +1,12 @@
+akonadi-googledata (1.0-2) unstable; urgency=low
+
+ * Add debian/patches/01_fix_copyright_headers.diff:
+ upstream patch to fix copyright headers.
+ akonadi-googledata is licensed under LGPL, not GPL.
+ * Add quilt build dependency and adjust debian/rules file.
+
+ -- Fathi Boudra <fabo at debian.org> Tue, 18 Aug 2009 17:14:47 +0200
+
akonadi-googledata (1.0-1) unstable; urgency=low
* Initial release. (Closes: #540327)
Modified: kde-extras/akonadi-googledata/trunk/debian/control
===================================================================
--- kde-extras/akonadi-googledata/trunk/debian/control 2009-08-18 15:03:55 UTC (rev 15679)
+++ kde-extras/akonadi-googledata/trunk/debian/control 2009-08-18 15:23:51 UTC (rev 15680)
@@ -3,7 +3,7 @@
Priority: extra
Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
Uploaders: Fathi Boudra <fabo at debian.org>
-Build-Depends: debhelper (>= 7.3), cmake, pkg-kde-tools (>= 0.4.11),
+Build-Depends: debhelper (>= 7.3), quilt (>= 0.46-7), cmake, pkg-kde-tools (>= 0.4.11),
kdelibs5-dev, kdepimlibs5-dev, libboost-dev, libgcal-dev (>= 0.9.2), xsltproc
Standards-Version: 3.8.2
Homepage: http://code.google.com/p/libgcal/
Modified: kde-extras/akonadi-googledata/trunk/debian/copyright
===================================================================
--- kde-extras/akonadi-googledata/trunk/debian/copyright 2009-08-18 15:03:55 UTC (rev 15679)
+++ kde-extras/akonadi-googledata/trunk/debian/copyright 2009-08-18 15:23:51 UTC (rev 15680)
@@ -16,7 +16,7 @@
Copyright for libgcal cmake module:
- Copyright (C) 2009 Mike Arthur <mike at mikearthur.co.uk>
+ Copyright (C) 2009 Mike Arthur <mike at mikearthur.co.uk>
License:
Added: kde-extras/akonadi-googledata/trunk/debian/patches/01_fix_copyright_headers.diff
===================================================================
--- kde-extras/akonadi-googledata/trunk/debian/patches/01_fix_copyright_headers.diff (rev 0)
+++ kde-extras/akonadi-googledata/trunk/debian/patches/01_fix_copyright_headers.diff 2009-08-18 15:23:51 UTC (rev 15680)
@@ -0,0 +1,172 @@
+--- a/shared/dlgGoogleDataConf.cpp
++++ b/shared/dlgGoogleDataConf.cpp
+@@ -1,3 +1,24 @@
++/***********************************************************************/
++/* googledata.h */
++/* */
++/* Copyright (C) 2009 Adenilson Cavalcanti <savagobr at yahoo.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 */
++/* 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 "dlgGoogleDataConf.h"
+ #include <QPushButton>
+ #include <QLineEdit>
+@@ -14,5 +35,5 @@ dlgGoogleDataConf::dlgGoogleDataConf(QWi
+
+ void dlgGoogleDataConf::accountChanged(const QString& text)
+ {
+- buttonBox->button(QDialogButtonBox::Ok)->setEnabled(!text.isEmpty());
++ buttonBox->button(QDialogButtonBox::Ok)->setEnabled(!text.isEmpty());
+ }
+--- a/shared/googledata.cpp
++++ b/shared/googledata.cpp
+@@ -1,20 +1,23 @@
+-/* Copyright (C) 2009 Adenilson Cavalcanti <savagobr at yahoo.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; by version 2 of the License or (at your
+- * choice) 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
+- *
+- */
++/***********************************************************************/
++/* googledata.h */
++/* */
++/* Copyright (C) 2009 Adenilson Cavalcanti <savagobr at yahoo.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 */
++/* 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 */
++/***********************************************************************/
+
+ /* REMARK: if you change this check the effects on both calendar and
+ * contacts resource files.
+--- a/calendar/gcalresource.cpp
++++ b/calendar/gcalresource.cpp
+@@ -1,20 +1,23 @@
+-/* Copyright (C) 2009 Adenilson Cavalcanti <savagobr at yahoo.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; by version 2 of the License or (at your
+- * choice) 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
+- *
+- */
++/***********************************************************************/
++/* googledata.h */
++/* */
++/* Copyright (C) 2009 Adenilson Cavalcanti <savagobr at yahoo.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 */
++/* 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 */
++/***********************************************************************/
+
+ /* TODO:
+ * - support for recurrent events (it will require changes on libgcal)
+--- a/contacts/googledataresource.cpp
++++ b/contacts/googledataresource.cpp
+@@ -1,20 +1,23 @@
+-/* Copyright (C) 2009 Adenilson Cavalcanti <savagobr at yahoo.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; by version 2 of the License or (at your
+- * choice) 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
+- *
+- */
++/***********************************************************************/
++/* gcalresource.h */
++/* */
++/* Copyright (C) 2009 Adenilson Cavalcanti <savagobr at yahoo.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 */
++/* 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 */
++/***********************************************************************/
+
+ /* TODO:
+ * - dialog displaying (kwallet + user account) is a bit confusing right
+--- a/contacts/googledataresource.h
++++ b/contacts/googledataresource.h
+@@ -1,5 +1,5 @@
+ /***********************************************************************/
+-/* googledataresource.h */
++/* googledata.h */
+ /* */
+ /* Copyright (C) 2009 Adenilson Cavalcanti <savagobr at yahoo.com> */
+ /* */
Added: kde-extras/akonadi-googledata/trunk/debian/patches/series
===================================================================
--- kde-extras/akonadi-googledata/trunk/debian/patches/series (rev 0)
+++ kde-extras/akonadi-googledata/trunk/debian/patches/series 2009-08-18 15:23:51 UTC (rev 15680)
@@ -0,0 +1 @@
+01_fix_copyright_headers.diff
Modified: kde-extras/akonadi-googledata/trunk/debian/rules
===================================================================
--- kde-extras/akonadi-googledata/trunk/debian/rules 2009-08-18 15:03:55 UTC (rev 15679)
+++ kde-extras/akonadi-googledata/trunk/debian/rules 2009-08-18 15:23:51 UTC (rev 15680)
@@ -3,6 +3,6 @@
include /usr/share/pkg-kde-tools/makefiles/1/debhelper/kde.mk
%:
- dh $@
+ dh --with quilt $@
.PHONY: override_dh_auto_test
More information about the pkg-kde-commits
mailing list