Merge lp:~townsend/libertine-scope/release-1.2 into lp:libertine-scope/release

[Christopher Townsend]

[Stephen M. Webb (bregma)]

All good.

review: Approve

[Christopher Townsend (townsend)]

Removed commit message per robru's email.

[lp:~townsend/libertine-scope/release-1.2]

38. By Stephen M. Webb on 2016-06-02

changed the icons and logos once again

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2016-05-05 15:35:18 +0000
+++ CMakeLists.txt	2016-06-02 17:14:16 +0000
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.0)
 project(libertine-scope
-        VERSION 1.1
+        VERSION 1.2
         LANGUAGES CXX)
 
 # We require at least g++ 4.9, to avoid ABI breakage with earlier versions.
@@ -42,11 +42,13 @@
   ${LIBERTINE_INCLUDE_DIRS}
 )
 
+set(PACKAGE_NAME "libertine-scope.ubuntu")
+set(APP ${PROJECT})
+
 # Important project paths
 set(SCOPE_INSTALL_DIR ${CMAKE_INSTALL_FULL_LIBDIR}/unity-scopes/libertine-scope/)
 set(SCOPE_NAME "libertine-scope")
 set(GETTEXT_PACKAGE "${SCOPE_NAME}")
-set(PACKAGE_NAME "libertine-scope.canonical")
 
 # If we need to refer to the scope's name or package in code, these definitions will help
 add_definitions(-DPACKAGE_NAME="${PACKAGE_NAME}")

=== modified file 'data/CMakeLists.txt'
--- data/CMakeLists.txt	2016-01-07 19:35:25 +0000
+++ data/CMakeLists.txt	2016-06-02 17:14:16 +0000
@@ -3,13 +3,13 @@
 # .so file so that the test tools can find them.
 intltool_merge_translations(
   "libertine-scope.ini.in"
-  "${CMAKE_CURRENT_BINARY_DIR}/${SCOPE_NAME}.ini"
+  "${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}_${SCOPE_NAME}.ini"
   ALL
   UTF8
 )
 intltool_merge_translations(
   "libertine-scope-settings.ini.in"
-  "${CMAKE_CURRENT_BINARY_DIR}/${SCOPE_NAME}-settings.ini"
+  "${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}_${SCOPE_NAME}-settings.ini"
   ALL
   UTF8
 )
@@ -17,26 +17,16 @@
 # Install the scope ini files
 install(
   FILES
-    "${CMAKE_CURRENT_BINARY_DIR}/${SCOPE_NAME}.ini"
-    "${CMAKE_CURRENT_BINARY_DIR}/${SCOPE_NAME}-settings.ini"
+    "${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}_${SCOPE_NAME}.ini"
+    "${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}_${SCOPE_NAME}-settings.ini"
   DESTINATION
     ${SCOPE_INSTALL_DIR}
 )
 
-# Put the logo file in the build directory next to the scope
-# .ini file so that the test tools can find it.
-configure_file(
-  "logo.png"
-  "${CMAKE_CURRENT_BINARY_DIR}/logo.png"
-  @ONLY
-  COPYONLY
-)
-
 # Install the scope images
 install(
   FILES
     "icon.png"
-    "logo.png"
   DESTINATION
     ${SCOPE_INSTALL_DIR}
 )

=== modified file 'data/icon.png'
Binary files data/icon.png	2015-12-29 21:50:58 +0000 and data/icon.png	2016-06-02 17:14:16 +0000 differ
=== added file 'data/icon.svg'
--- data/icon.svg	1970-01-01 00:00:00 +0000
+++ data/icon.svg	2016-06-02 17:14:16 +0000
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="275"
+   height="275"
+   id="svg2">
+  <defs
+     id="defs4" />
+  <g
+     transform="translate(-295.17857,-338.61217)"
+     id="layer1">
+    <path
+       d="m 296.78571,612.63003 c 0,0 104.06285,-132.7859 104.06285,-132.7859 0,0 -104.06285,-140.24982 -104.06285,-140.24982 l 67.30299,0 c 0,0 83.34749,113.48826 83.34749,113.48826 l -126.86477,159.54746 -23.78571,0 z M 417.28794,500.06578 544.11662,339.59431 c 0,0 24.45481,0 24.45481,0 L 464.47749,471.26578 c 0,0 104.09394,141.36425 104.09394,141.36425 l -67.30357,0 c 0,0 -83.97992,-112.56425 -83.97992,-112.56425 z"
+       id="path2830"
+       style="fill:#000000" />
+  </g>
+</svg>

=== modified file 'data/libertine-scope.ini.in'
--- data/libertine-scope.ini.in	2015-12-29 21:50:58 +0000
+++ data/libertine-scope.ini.in	2016-06-02 17:14:16 +0000
@@ -1,11 +1,7 @@
 [ScopeConfig]
-_DisplayName=Legacy Applications Scope
-_Description=Deb-packaged X11-based legacy applications.
+_DisplayName=XApps
+_Description=Surface and launch DEB-packaged X11-based applications.
 Art=screenshot.png
-Author=Stephen M. Webb
+Author=The Canonical Libertine Team <[e-mail]>
 Icon=icon.png
 Keywords=apps
-
-[Appearance]
-PageHeader.Logo=logo.png
-

=== removed file 'data/logo.png'
Binary files data/logo.png	2016-01-06 17:19:35 +0000 and data/logo.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'data/logo.xcf'
Binary files data/logo.xcf	2016-01-06 17:19:35 +0000 and data/logo.xcf	1970-01-01 00:00:00 +0000 differ
=== added file 'data/project-logo.xcf'
Binary files data/project-logo.xcf	1970-01-01 00:00:00 +0000 and data/project-logo.xcf	2016-06-02 17:14:16 +0000 differ
=== modified file 'debian/changelog'
--- debian/changelog	2016-05-06 16:16:35 +0000
+++ debian/changelog	2016-06-02 17:14:16 +0000
@@ -1,3 +1,21 @@
+libertine-scope (1.2-0ubuntu1) UNRELEASED; urgency=medium
+
+  [ Chris Townsend ]
+  * Using the "unconfined" template is strongly discouraged, so use the
+    "ubuntu-scope-network" template and define read_path and write_path.
+  * Use the ubuntu package namespace as canonical is used for special 3rd
+    party click packages.  Also use variable substitution in the manifest.json.in
+    file to match what's in the CMakefile.
+
+  [ Kyle Nitzsche ]
+  * Install ini file names and .so file to be fully qualified.
+
+  [ Stephen M. Webb ]
+  * Use new icon and logo for the Libertine Scope. Also renam "Legacy
+    Applications Scope" to "XApps".
+
+ -- Chris Townsend <[e-mail]>  Wed, 01 Jun 2016 16:22:18 -0400
+
 libertine-scope (1.1+16.04.20160506-0ubuntu1) xenial; urgency=medium
 
   [ Chris Townsend ]

=== modified file 'libertine-scope.apparmor'
--- libertine-scope.apparmor	2016-03-18 13:02:44 +0000
+++ libertine-scope.apparmor	2016-06-02 17:14:16 +0000
@@ -1,6 +1,14 @@
 {
-    "template": "unconfined",
+    "template": "ubuntu-scope-network",
     "policy_groups": [],
-    "policy_version": 1.3
+    "policy_version": 1.3,
+    "read_path": [
+        "@{HOME}/.local/share/libertine/",
+        "@{HOME}/.cache/libertine-container/",
+        "@{CLICK_DIR}/com.ubuntu.puritine/"
+    ],
+    "write_path": [
+        "/{dev,run}/shm/lttng-ust-wait-5*"
+     ]
 }
 

=== modified file 'libertine-scope/CMakeLists.txt'
--- libertine-scope/CMakeLists.txt	2016-04-27 16:33:00 +0000
+++ libertine-scope/CMakeLists.txt	2016-06-02 17:14:16 +0000
@@ -27,7 +27,7 @@
 
 set_target_properties(scope
   PROPERTIES
-    OUTPUT_NAME "${SCOPE_NAME}"
+    OUTPUT_NAME "${PACKAGE_NAME}_${SCOPE_NAME}"
 )
 
 install(TARGETS scope

=== modified file 'manifest.json.in'
--- manifest.json.in	2015-12-29 21:50:58 +0000
+++ manifest.json.in	2016-06-02 17:14:16 +0000
@@ -4,12 +4,12 @@
     "framework": "ubuntu-sdk-15.04.3",
     "hooks": {
         "libertine-scope": {
-            "apparmor": "libertine-scope.apparmor",
-            "scope": "libertine-scope"
+            "apparmor": "@SCOPE_NAME@.apparmor",
+            "scope": "@SCOPE_NAME@"
         }
     },
-    "maintainer": "Stephen M. Webb <[e-mail]>",
-    "name": "libertine-scope.canonical",
-    "title": "libertine-scope",
-    "version": "0.1"
+    "maintainer": "Ubuntu Libertine Team <[e-mail]>",
+    "name": "@PACKAGE_NAME@",
+    "title": "@SCOPE_NAME@",
+    "version": "@PROJECT_VERSION@"
 }

=== modified file 'po/libertine-scope.pot'
--- po/libertine-scope.pot	2016-04-27 18:37:46 +0000
+++ po/libertine-scope.pot	2016-06-02 17:14:16 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-27 14:37-0400\n"
+"POT-Creation-Date: 2016-06-02 13:05-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -18,9 +18,9 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #: ../data/libertine-scope.ini.in.h:1
-msgid "Legacy Applications Scope"
+msgid "XApps"
 msgstr ""
 
 #: ../data/libertine-scope.ini.in.h:2
-msgid "Deb-packaged X11-based legacy applications."
+msgid "Surface and launch DEB-packaged X11-based applications."
 msgstr ""