Merge lp:~robru/poppler-qml-plugin/more-packaging into lp:poppler-qml-plugin

[Robert Bruce Park]

Minor packaging fixups.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:11
http://jenkins.qa.ubuntu.com/job/poppler-qml-plugin-ci/2/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/poppler-qml-plugin-saucy-amd64-ci/2/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/poppler-qml-plugin-saucy-armhf-ci/2/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/poppler-qml-plugin-ci/2/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:11
http://jenkins.qa.ubuntu.com/job/poppler-qml-plugin-ci/3/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/poppler-qml-plugin-saucy-amd64-ci/3
    SUCCESS: http://jenkins.qa.ubuntu.com/job/poppler-qml-plugin-saucy-armhf-ci/3

Click here to trigger a rebuild:
http://s-jenkins:8080/job/poppler-qml-plugin-ci/3/rebuild

review: Approve (continuous-integration)

[lp:~robru/poppler-qml-plugin/more-packaging]

12. By Robert Bruce Park on 2013-08-19

Add Multi-Arch field.

[Robert Bruce Park (robru)]

Self-approving because all changes here were directly requested by didrocks anyway.

review: Approve

=== modified file 'debian/control'
--- debian/control	2013-08-19 07:56:50 +0000
+++ debian/control	2013-08-19 16:26:29 +0000
@@ -1,5 +1,5 @@
 Source: poppler-qml-plugin
-Priority: extra
+Priority: optional
 Maintainer: Ubuntu App Cats <[e-mail]>
 Build-Depends: debhelper (>= 9),
                libpoppler-qt5-dev,
@@ -16,6 +16,7 @@
 Package: qtdeclarative5-poppler1.0
 Section: libs
 Architecture: any
+Multi-Arch: same
 Depends: ${misc:Depends},
          ${shlibs:Depends},
 Replaces: qtdeclarative5-poppler-qml-plugin

=== modified file 'debian/copyright'
--- debian/copyright	2013-08-15 20:01:24 +0000
+++ debian/copyright	2013-08-19 16:26:29 +0000
@@ -1,6 +1,6 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: qtdeclarative5-poppler-qml-plugin
-Source:
+Upstream-Name: poppler-qml-plugin
+Source: https://launchpad.net/poppler-qml-plugin
 
 Files: *
 Copyright: 2013 Canonical Ltd.

=== modified file 'pageImageProvider.cpp'
--- pageImageProvider.cpp	2013-08-02 14:23:06 +0000
+++ pageImageProvider.cpp	2013-08-19 16:26:29 +0000
@@ -1,3 +1,22 @@
+/*
+ * Copyright (C) 2013 Canonical, Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, 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/>.
+ *
+ * Author: Anthony Granger <[e-mail]>
+ */
+
+
 #include <poppler/qt5/poppler-qt5.h>
 #include <QQuickImageProvider>
 #include <QDebug>

=== modified file 'pageImageProvider.h'
--- pageImageProvider.h	2013-07-19 16:50:46 +0000
+++ pageImageProvider.h	2013-08-19 16:26:29 +0000
@@ -1,3 +1,21 @@
+/*
+ * Copyright (C) 2013 Canonical, Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, 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/>.
+ *
+ * Author: Anthony Granger <[e-mail]>
+ */
+
 #ifndef PAGEIMAGEPROVIDER_H
 #define PAGEIMAGEPROVIDER_H
 

=== modified file 'pdfModel.cpp'
--- pdfModel.cpp	2013-08-02 14:23:06 +0000
+++ pdfModel.cpp	2013-08-19 16:26:29 +0000
@@ -1,3 +1,21 @@
+/*
+ * Copyright (C) 2013 Canonical, Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, 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/>.
+ *
+ * Author: Anthony Granger <[e-mail]>
+ */
+
 #include <pdfModel.h>
 #include <pageImageProvider.h>
 
@@ -83,4 +101,3 @@
 PdfModel::~PdfModel()
 {
 }
-

=== modified file 'pdfModel.h'
--- pdfModel.h	2013-07-19 16:50:46 +0000
+++ pdfModel.h	2013-08-19 16:26:29 +0000
@@ -1,3 +1,21 @@
+/*
+ * Copyright (C) 2013 Canonical, Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, 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/>.
+ *
+ * Author: Anthony Granger <[e-mail]>
+ */
+
 #ifndef PDFMODEL_H
 #define PDFMODEL_H
 
@@ -8,7 +26,7 @@
 {
     Q_OBJECT
     Q_DISABLE_COPY(PdfModel)
-    
+
 public:
     explicit PdfModel(QQuickItem *parent = 0);
     virtual ~PdfModel();
@@ -40,4 +58,3 @@
 QML_DECLARE_TYPE(PdfModel)
 
 #endif // PDFMODEL_H
-

=== modified file 'plugin.cpp'
--- plugin.cpp	2013-07-19 16:50:46 +0000
+++ plugin.cpp	2013-08-19 16:26:29 +0000
@@ -1,3 +1,21 @@
+/*
+ * Copyright (C) 2013 Canonical, Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, 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/>.
+ *
+ * Author: Anthony Granger <[e-mail]>
+ */
+
 #include "plugin.h"
 #include "pdfModel.h"
 
@@ -8,5 +26,3 @@
     // @uri org.docviewer.poppler
     qmlRegisterType<PdfModel>(uri, 1, 0, "Poppler");
 }
-
-

=== modified file 'plugin.h'
--- plugin.h	2013-07-19 16:50:46 +0000
+++ plugin.h	2013-08-19 16:26:29 +0000
@@ -1,3 +1,21 @@
+/*
+ * Copyright (C) 2013 Canonical, Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, 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/>.
+ *
+ * Author: Anthony Granger <[e-mail]>
+ */
+
 #ifndef POPPLERPLUGIN_H
 #define POPPLERPLUGIN_H
 
@@ -7,10 +25,9 @@
 {
     Q_OBJECT
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
-    
+
 public:
     void registerTypes(const char *uri);
 };
 
 #endif // POPPLERPLUGIN_H
-