[kbibtex/kbibtex/0.7] /: Rewriting all occurrences of references to defunct Gna! page

Thomas Fischer null at kde.org
Fri Jun 16 20:51:14 UTC 2017


Git commit d81efcca84b16984545cda4517ee788cd9924809 by Thomas Fischer.
Committed on 16/06/2017 at 20:28.
Pushed by thomasfischer into branch 'kbibtex/0.7'.

Rewriting all occurrences of references to defunct Gna! page

- Links to homepage or bug tracker at Gna!
- DBus addresses
etc.

Updating some copyright dates as well.

CCBUG: 381119

M  +1    -1    README
M  +4    -4    dbus-example.py
M  +2    -2    doc/index.docbook
M  +1    -1    doc/man-kbibtex.1.docbook
M  +2    -2    kbibtex.appdata.xml
M  +1    -1    mime/bibliography.xml
M  +2    -2    src/io/fileexporterbibtexoutput.cpp
M  +2    -2    src/io/fileexporterpdf.cpp
M  +2    -2    src/io/fileexporterps.cpp
M  +3    -3    src/io/fileexporterxml.cpp
M  +2    -2    src/parts/partadaptor.h
M  +2    -2    src/parts/partfactory.cpp
M  +3    -3    src/program/openfileinfoadaptor.h
M  +3    -3    src/program/program.cpp
M  +5    -5    src/test/main.cpp

https://commits.kde.org/kbibtex/d81efcca84b16984545cda4517ee788cd9924809

diff --git a/README b/README
index 85309abc..718a3a07 100644
--- a/README
+++ b/README
@@ -15,5 +15,5 @@ purpose is to provide a user-friendly interface to BibTeX files.
 Homepage
 --------
 
-Visit  http://home.gna.org/kbibtex/  for more information.
+Visit  https://userbase.kde.org/KBibTeX  for more information.
 
diff --git a/dbus-example.py b/dbus-example.py
index d3fcc1ad..904d8c4c 100644
--- a/dbus-example.py
+++ b/dbus-example.py
@@ -21,7 +21,7 @@ bus = dbus.SessionBus()
 info("Searching KBibTeX process")
 names = bus.list_names()
 try:
-	kbibtex_name = next(filter(lambda name: re.match(r"\Aorg.gna.kbibtex-\d+\Z", name), names))
+	kbibtex_name = next(filter(lambda name: re.match(r"\Aorg.kde.kbibtex-\d+\Z", name), names))
 except StopIteration:
 	error(1, "KBibTeX not found on DBus session bus")
 info("KBibTeX's name in DBus session bus: " + kbibtex_name)
@@ -31,7 +31,7 @@ info("KBibTeX's name in DBus session bus: " + kbibtex_name)
 file_manager = bus.get_object(kbibtex_name, '/FileManager')
 # Create an object representing the file manager that allows calling functions
 # TODO check for errors
-file_manager_interface = dbus.Interface(file_manager, dbus_interface = 'org.gna.KBibTeX.FileManager')
+file_manager_interface = dbus.Interface(file_manager, dbus_interface = 'org.kde.KBibTeX.FileManager')
 
 # TODO file to open should be argument passed to this script?
 # TODO check for errors
@@ -52,7 +52,7 @@ assert opened_file_id == current_file_id
 info("Retrieving the document for current file")
 # TODO check for errors
 current_file = bus.get_object(kbibtex_name, '/FileManager/' + str(current_file_id))
-current_file_interface = dbus.Interface(current_file, dbus_interface = 'org.gna.KBibTeX.FileManager.FileInfo')
+current_file_interface = dbus.Interface(current_file, dbus_interface = 'org.kde.KBibTeX.FileManager.FileInfo')
 current_url = str(current_file_interface.url())
 info("Current url: " + current_url)
 assert file_url == current_url
@@ -65,7 +65,7 @@ info("Current document id: " + str(current_document_id))
 # TODO check for errors
 info("Adding example entries to the current document")
 current_document = bus.get_object(kbibtex_name, '/KBibTeX/Documents/' + str(current_document_id))
-current_document_interface = dbus.Interface(current_document, dbus_interface = 'org.gna.KBibTeX.Document')
+current_document_interface = dbus.Interface(current_document, dbus_interface = 'org.kde.KBibTeX.Document')
 
 # TODO check for errors
 indices = current_document_interface.insertEntries("""\
diff --git a/doc/index.docbook b/doc/index.docbook
index 6f7ad583..eafa00f5 100644
--- a/doc/index.docbook
+++ b/doc/index.docbook
@@ -98,7 +98,7 @@
       This manual is intended for any individual, regardless of her or his experience with &latex;, &kde;, &kbibtex; or &Linux;.
     </para>
     <para>
-      Advanced users are not likely to read this manual, but all suggestions on documentation will be considered. If you would like to contribute to this project or the documentation, please consult the <ulink url="http://home.gna.org/kbibtex/">&kbibtex; web page</ulink>.
+      Advanced users are not likely to read this manual, but all suggestions on documentation will be considered. If you would like to contribute to this project or the documentation, please consult the <ulink url="https://userbase.kde.org/KBibTeX">&kbibtex; web page</ulink>.
     </para>
   </sect1>
 
@@ -1709,7 +1709,7 @@ latex example</screen>
     The default way to install &kbibtex; is to use the package manager and software repositories of your distribution.
   </para>
   <para>
-    Please use <ulink url="http://home.gna.org/kbibtex/download.html">instructions from the official &kbibtex; page</ulink> to download the source code of &kbibtex; and compile it by yourself.
+    Please use <ulink url="https://userbase.kde.org/KBibTeX/Development">instructions from the official &kbibtex; page</ulink> to download the source code of &kbibtex; and compile it by yourself.
   </para>
 </appendix>
 
diff --git a/doc/man-kbibtex.1.docbook b/doc/man-kbibtex.1.docbook
index 5ce67229..c4a20285 100644
--- a/doc/man-kbibtex.1.docbook
+++ b/doc/man-kbibtex.1.docbook
@@ -115,7 +115,7 @@ url="help:/kbibtex">help:/kbibtex</ulink>
 <parameter>help:/kbibtex</parameter></userinput>).</para>
 
 <para>There is also further information available at the <ulink
-url="http://home.gna.org/kbibtex/">KBibTeX official website</ulink>.</para>
+url="https://userbase.kde.org/KBibTeX">KBibTeX official website</ulink>.</para>
 </refsect1>
 
 <refsect1>
diff --git a/kbibtex.appdata.xml b/kbibtex.appdata.xml
index 879e31c3..c2e01bb7 100644
--- a/kbibtex.appdata.xml
+++ b/kbibtex.appdata.xml
@@ -243,12 +243,12 @@
       <li xml:lang="x-test">xxImport your Zotero library.xx</li>
     </ul>
   </description>
-  <url type="homepage">http://home.gna.org/kbibtex/</url>
+  <url type="homepage">https://userbase.kde.org/KBibTeX</url>
   <url type="bugtracker">https://bugs.kde.org/enter_bug.cgi?format=guided&product=kbibtex</url>
   <url type="help">http://docs.kde.org/development/en/extragear-office/kbibtex/index.html</url>
   <screenshots>
     <screenshot type="default">
-      <image>http://home.gna.org/kbibtex/screenshots/kbibtex-20110213.png</image>
+      <image>https://userbase.kde.org/images.userbase/2/20/Kbibtex_window.png</image>
     </screenshot>
   </screenshots>
   <project_group>KDE</project_group>
diff --git a/mime/bibliography.xml b/mime/bibliography.xml
index c1209a47..c2ac65b1 100644
--- a/mime/bibliography.xml
+++ b/mime/bibliography.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  -  This file is part of KBibTeX: http://home.gna.org/kbibtex/
+  -  This file is part of KBibTeX: https://userbase.kde.org/KBibTeX
   -  Released under the GNU Public License version 2 or later
   -  Original author: Thomas Fischer <fischer at unix-ag.uni-kl.de>
   -->
diff --git a/src/io/fileexporterbibtexoutput.cpp b/src/io/fileexporterbibtexoutput.cpp
index 733154d5..587c293a 100644
--- a/src/io/fileexporterbibtexoutput.cpp
+++ b/src/io/fileexporterbibtexoutput.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2004-2014 by Thomas Fischer <fischer at unix-ag.uni-kl.de> *
+ *   Copyright (C) 2004-2017 by Thomas Fischer <fischer at unix-ag.uni-kl.de> *
  *                                                                         *
  *   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  *
@@ -139,7 +139,7 @@ bool FileExporterBibTeXOutput::writeLatexFile(const QString &filename)
         if (kpsewhich("babel.sty"))
             ts << "\\usepackage[" << m_latexLanguage << "]{babel}\n";
         if (kpsewhich("hyperref.sty"))
-            ts << "\\usepackage[pdfproducer={KBibTeX: http://home.gna.org/kbibtex/},pdftex]{hyperref}\n";
+            ts << "\\usepackage[pdfproducer={KBibTeX: https://userbase.kde.org/KBibTeX},pdftex]{hyperref}\n";
         else if (kpsewhich("url.sty"))
             ts << "\\usepackage{url}\n";
         if (m_latexBibStyle.startsWith(QLatin1String("apacite")) && kpsewhich("apacite.sty"))
diff --git a/src/io/fileexporterpdf.cpp b/src/io/fileexporterpdf.cpp
index f896851d..b7794b58 100644
--- a/src/io/fileexporterpdf.cpp
+++ b/src/io/fileexporterpdf.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2004-2014 by Thomas Fischer <fischer at unix-ag.uni-kl.de> *
+ *   Copyright (C) 2004-2017 by Thomas Fischer <fischer at unix-ag.uni-kl.de> *
  *                                                                         *
  *   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  *
@@ -149,7 +149,7 @@ bool FileExporterPDF::writeLatexFile(const QString &filename)
         if (kpsewhich("babel.sty"))
             ts << "\\usepackage[" << m_babelLanguage << "]{babel}" << endl;
         if (kpsewhich("hyperref.sty"))
-            ts << "\\usepackage[pdfborder={0 0 0},pdfproducer={KBibTeX: http://home.gna.org/kbibtex/},pdftex]{hyperref}" << endl;
+            ts << "\\usepackage[pdfborder={0 0 0},pdfproducer={KBibTeX: https://userbase.kde.org/KBibTeX},pdftex]{hyperref}" << endl;
         else if (kpsewhich("url.sty"))
             ts << "\\usepackage{url}" << endl;
         if (m_bibliographyStyle.startsWith(QLatin1String("apacite")) && kpsewhich("apacite.sty"))
diff --git a/src/io/fileexporterps.cpp b/src/io/fileexporterps.cpp
index 1550596b..30e483fc 100644
--- a/src/io/fileexporterps.cpp
+++ b/src/io/fileexporterps.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2004-2014 by Thomas Fischer <fischer at unix-ag.uni-kl.de> *
+ *   Copyright (C) 2004-2017 by Thomas Fischer <fischer at unix-ag.uni-kl.de> *
  *                                                                         *
  *   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  *
@@ -157,7 +157,7 @@ bool FileExporterPS::beautifyPostscriptFile(const QString &filename, const QStri
             if (i < 32 && line.startsWith(QLatin1String("%%Title:")))
                 line = QLatin1String("%%Title: ") + title;
             else if (i < 32 && line.startsWith(QLatin1String("%%Creator:")))
-                line += QLatin1String("; exported from within KBibTeX: http://home.gna.org/kbibtex/");
+                line += QLatin1String("; exported from within KBibTeX: https://userbase.kde.org/KBibTeX");
             lines += line;
             ++i;
         }
diff --git a/src/io/fileexporterxml.cpp b/src/io/fileexporterxml.cpp
index 886d3ef1..c89f0896 100644
--- a/src/io/fileexporterxml.cpp
+++ b/src/io/fileexporterxml.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2004-2014 by Thomas Fischer <fischer at unix-ag.uni-kl.de> *
+ *   Copyright (C) 2004-2017 by Thomas Fischer <fischer at unix-ag.uni-kl.de> *
  *                                                                         *
  *   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  *
@@ -54,7 +54,7 @@ bool FileExporterXML::save(QIODevice *iodevice, const File *bibtexfile, QStringL
 
     stream << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" << endl;
     stream << "<!-- XML document written by KBibTeXIO as part of KBibTeX/KDE4 -->" << endl;
-    stream << "<!-- http://home.gna.org/kbibtex/ -->" << endl;
+    stream << "<!-- https://userbase.kde.org/KBibTeX -->" << endl;
     stream << "<bibliography>" << endl;
 
     for (File::ConstIterator it = bibtexfile->constBegin(); it != bibtexfile->constEnd() && result && !m_cancelFlag; ++it)
@@ -78,7 +78,7 @@ bool FileExporterXML::save(QIODevice *iodevice, const QSharedPointer<const Eleme
 
     stream << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" << endl;
     stream << "<!-- XML document written by KBibTeXIO as part of KBibTeX/KDE4 -->" << endl;
-    stream << "<!-- http://home.gna.org/kbibtex/ -->" << endl;
+    stream << "<!-- https://userbase.kde.org/KBibTeX -->" << endl;
 
     const bool result = write(stream, element.data());
 
diff --git a/src/parts/partadaptor.h b/src/parts/partadaptor.h
index 324d3e5a..c8461aa1 100644
--- a/src/parts/partadaptor.h
+++ b/src/parts/partadaptor.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2004-2015 by Thomas Fischer <fischer at unix-ag.uni-kl.de> *
+ *   Copyright (C) 2004-2017 by Thomas Fischer <fischer at unix-ag.uni-kl.de> *
  *                      2015 by Shunsuke Shimizu <grafi at grafi.jp>          *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -30,7 +30,7 @@ class FileView;
 class KBibTeXPartAdaptor : public QDBusAbstractAdaptor
 {
     Q_OBJECT
-    Q_CLASSINFO("D-Bus Interface", "org.gna.KBibTeX.Document")
+    Q_CLASSINFO("D-Bus Interface", "org.kde.KBibTeX.Document")
 
 public:
     explicit KBibTeXPartAdaptor(KBibTeXPart *part);
diff --git a/src/parts/partfactory.cpp b/src/parts/partfactory.cpp
index 8c4c1079..4b2a9d91 100644
--- a/src/parts/partfactory.cpp
+++ b/src/parts/partfactory.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2004-2014 by Thomas Fischer <fischer at unix-ag.uni-kl.de> *
+ *   Copyright (C) 2004-2017 by Thomas Fischer <fischer at unix-ag.uni-kl.de> *
  *                                                                         *
  *   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  *
@@ -29,7 +29,7 @@ static const char PartId[] = "kbibtexpart";
 static const char PartName[] = I18N_NOOP("KBibTeXPart");
 static const char PartDescription[] = I18N_NOOP("BibTeX Editor Component");
 static const char PartCopyright[] = "Copyright 2004-2015 Thomas Fischer";
-static const char *programHomepage = "http://home.gna.org/kbibtex/";
+static const char *programHomepage = "https://userbase.kde.org/KBibTeX";
 
 static KComponentData *_componentData = 0;
 static KAboutData *_aboutData = 0;
diff --git a/src/program/openfileinfoadaptor.h b/src/program/openfileinfoadaptor.h
index c00dd614..27f85b40 100644
--- a/src/program/openfileinfoadaptor.h
+++ b/src/program/openfileinfoadaptor.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2004-2015 by Thomas Fischer <fischer at unix-ag.uni-kl.de> *
+ *   Copyright (C) 2004-2017 by Thomas Fischer <fischer at unix-ag.uni-kl.de> *
  *                      2015 by Shunsuke Shimizu <grafi at grafi.jp>          *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -31,7 +31,7 @@ class MDIWidget;
 class OpenFileInfoAdaptor : public QDBusAbstractAdaptor
 {
     Q_OBJECT
-    Q_CLASSINFO("D-Bus Interface", "org.gna.KBibTeX.FileManager.FileInfo")
+    Q_CLASSINFO("D-Bus Interface", "org.kde.KBibTeX.FileManager.FileInfo")
 
 public:
     explicit OpenFileInfoAdaptor(OpenFileInfo *p, OpenFileInfoManager *pm);
@@ -55,7 +55,7 @@ private:
 class OpenFileInfoManagerAdaptor : public QDBusAbstractAdaptor
 {
     Q_OBJECT
-    Q_CLASSINFO("D-Bus Interface", "org.gna.KBibTeX.FileManager")
+    Q_CLASSINFO("D-Bus Interface", "org.kde.KBibTeX.FileManager")
 
 public:
     explicit OpenFileInfoManagerAdaptor(OpenFileInfoManager *p);
diff --git a/src/program/program.cpp b/src/program/program.cpp
index c1f08ed3..fdaba16a 100644
--- a/src/program/program.cpp
+++ b/src/program/program.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2004-2014 by Thomas Fischer <fischer at unix-ag.uni-kl.de> *
+ *   Copyright (C) 2004-2017 by Thomas Fischer <fischer at unix-ag.uni-kl.de> *
  *                                                                         *
  *   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  *
@@ -25,13 +25,13 @@
 #include "version.h"
 
 const char *description = I18N_NOOP("A BibTeX editor for KDE");
-const char *programHomepage = "http://home.gna.org/kbibtex/";
+const char *programHomepage = "https://userbase.kde.org/KBibTeX";
 
 int main(int argc, char *argv[])
 {
     KAboutData aboutData("kbibtex", 0, ki18n("KBibTeX"), versionNumber,
                          ki18n(description), KAboutData::License_GPL_V2,
-                         ki18n("Copyright 2004-2015 Thomas Fischer"), KLocalizedString(),
+                         ki18n("Copyright 2004-2017 Thomas Fischer"), KLocalizedString(),
                          programHomepage);
     aboutData.addAuthor(ki18n("Thomas Fischer"), ki18n("Maintainer"), "fischer at unix-ag.uni-kl.de", "http://www.t-fischer.net/");
 
diff --git a/src/test/main.cpp b/src/test/main.cpp
index 32798e34..2c6a5697 100644
--- a/src/test/main.cpp
+++ b/src/test/main.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2004-2014 by Thomas Fischer <fischer at unix-ag.uni-kl.de> *
+ *   Copyright (C) 2004-2017 by Thomas Fischer <fischer at unix-ag.uni-kl.de> *
  *                                                                         *
  *   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  *
@@ -24,17 +24,17 @@
 #include "kbibtextest.h"
 
 const char *description = I18N_NOOP("A BibTeX editor for KDE");
-const char *programHomepage = "http://home.gna.org/kbibtex/";
-const char *bugTrackerHomepage = "https://gna.org/bugs/?group=kbibtex";
+const char *programHomepage = "https://userbase.kde.org/KBibTeX";
+const char *bugTrackerHomepage = "https://bugs.kde.org/enter_bug.cgi?product=KBibTeX";
 
 int main(int argc, char *argv[])
 {
     KAboutData aboutData("kbibtextest", 0, ki18n("KBibTeX Test"), "XXX",
                          ki18n(description), KAboutData::License_GPL_V2,
-                         ki18n("Copyright 2004-2014 Thomas Fischer"), KLocalizedString(),
+                         ki18n("Copyright 2004-2017 Thomas Fischer"), KLocalizedString(),
                          programHomepage, bugTrackerHomepage);
     aboutData.addAuthor(ki18n("Thomas Fischer"), ki18n("Maintainer"), "fischer at unix-ag.uni-kl.de", "http://www.t-fischer.net/");
-    aboutData.setCustomAuthorText(ki18n("Please use https://gna.org/bugs/?group=kbibtex to report bugs.\n"), ki18n("Please use <a href=\"https://gna.org/bugs/?group=kbibtex\">https://gna.org/bugs/?group=kbibtex</a> to report bugs.\n"));
+    aboutData.setCustomAuthorText(ki18n("Please use https://bugs.kde.org/enter_bug.cgi?product=KBibTeX to report bugs.\n"), ki18n("Please use <a href=\"https://bugs.kde.org/enter_bug.cgi?product=KBibTeX\">https://bugs.kde.org/enter_bug.cgi?product=KBibTeX</a> to report bugs.\n"));
 
     KCmdLineArgs::init(argc, argv, &aboutData);
     KApplication programCore;


More information about the kde-doc-english mailing list