Merge lp:~jdstrand/click/click-codify-appid into lp:click

[Jamie Strandboge]

* codify allowed characters for "application ID"
* fix typos in apparmor hook example

[lp:~jdstrand/click/click-codify-appid]

203. By jdstrand <Jamie Strandboge <email address hidden>> on 2013-08-12

doc/hooks.rst: application name can also have upper case letters

[Colin Watson (cjwatson)]

review: Approve

=== modified file 'doc/file-format.rst'
--- doc/file-format.rst	2013-08-05 00:08:42 +0000
+++ doc/file-format.rst	2013-08-12 20:30:12 +0000
@@ -79,17 +79,18 @@
 the value of "framework" does not declare a framework implemented by the
 system on which the package is being installed.
 
-The value of "name" identifies the application; every package in the app
-store has a unique "name" identifier, and the app store will reject clashes.
-It is the developer's responsibility to choose a unique identifier.  The
-recommended approach is to follow the Java package name convention, i.e.
-"com.mydomain.myapp", starting with the reverse of an Internet domain name
-owned by the person or organisation developing the application; note that it
-is not necessary for the application to contain any Java code in order to
-use this convention.
+The value of "name" identifies the application, following Debian source
+package name rules; every package in the app store has a unique "name"
+identifier, and the app store will reject clashes.  It is the developer's
+responsibility to choose a unique identifier.  The recommended approach is
+to follow the Java package name convention, i.e.  "com.mydomain.myapp",
+starting with the reverse of an Internet domain name owned by the person or
+organisation developing the application; note that it is not necessary for
+the application to contain any Java code in order to use this convention.
 
 The value of "version" provides a unique version for the application,
-following Debian version numbering rules.
+following Debian version numbering rules. See deb-version(5) for full
+details.
 
 For future expansion (e.g. applications that require multiple frameworks),
 the syntax of "framework" is formally that of a Debian dependency

=== modified file 'doc/hooks.rst'
--- doc/hooks.rst	2013-08-06 10:00:47 +0000
+++ doc/hooks.rst	2013-08-12 20:30:12 +0000
@@ -77,8 +77,9 @@
    will be only one).  Each application has a name.
 
  * An "application ID" is a string unique to each application instance: it
-   is made up of the Click package name, the application name, and the Click
-   package version joined by underscores, e.g.
+   is made up of the Click package name, the application name (must consist
+   of only of characters for a Debian source package name, Debian version
+   and [A-Z]), and the Click package version joined by underscores, e.g.
    ``com.ubuntu.clock_alarm_0.1``.
 
  * An integrated-with system package may add ``*.hook`` files to
@@ -193,8 +194,8 @@
 ::
 
   /usr/share/click/hooks/apparmor.hook:
-    Pattern: /var/lib/apparmor/click/${id}.json
-    Exec: aa-click
+    Pattern: /var/lib/apparmor/clicks/${id}.json
+    Exec: /usr/bin/aa-clickhook
     User: root
 
   /usr/share/click/hooks/click-desktop.hook: