Merge lp:~dale-f-beaudoin/unity-control-center/security_privacy into lp:unity-control-center

[ventrical]

inserted activity-log-manager as a recommend in debian/control

insert activity-log-manager

[ventrical (dale-f-beaudoin)]

still got text conflict in changelog
Here is what I have been following from Seb

The steps would be basically
$ bzr branch lp:unity-control-center
$ cd unity-control-center
$ editor debian/rules

do your changes

$ dch -i

write your changelog entry

$ bzr commit
$ bzr push lp:~<USER_ID>/unity-control-center/<BRANCH_NAME>

where USER_ID is your launchpad user id and BRANCH_NAME a name for your work

$ bzr lp-open

and do the merge proposal from the UI

and

----------------------------

Some comments though

- "unity7maintainers" doesn't really describe your branch, usually you would pick a name that explains what the change do, e.g "update-distro-serie"

- your commit message is not really good (see on the webpage mentioned earlier)

"--message
modified:
  debian/changelog
  debian/rules"
the commit should explain the change, copying what you wrote in the debian/changelog is a common practice there

So that is what I did but , as I mentioned to Seb , it seems that nano is really borking up the changelog. Ill keep trying..

Unmerged revisions

12901. By dale_f_beaudoin <email address hidden> on 2017-09-30

--message
* recommend activity-log-manager

=== modified file 'debian/changelog'
--- debian/changelog	2017-09-06 14:40:51 +0000
+++ debian/changelog	2017-09-30 19:39:20 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 unity-control-center (15.04.0+17.10.20170814.1-0ubuntu2) artful; urgency=medium
 
   * debian/control: use 'X-Ubuntu-Use-Langpack: yes' since the indicator
@@ -9,9 +10,20 @@
 unity-control-center (15.04.0+17.10.20170814.1-0ubuntu1) artful; urgency=medium
 
   [ ventrical ]
+=======
+  * recommend activity-log manager
+
+unity-control-center (15.04.0+17.10.20170810-0ubuntu3) UNRELEASED; urgency=medium
+
+>>>>>>> MERGE-SOURCE
   * Replace version number from 17.04 to 17.10
+  * 
 
+<<<<<<< TREE
  -- Jeremy Bicha <[e-mail]>  Mon, 14 Aug 2017 16:11:40 +0000
+=======
+ -- ventrical <ventrical@ventrical-MS-7798>  Fri, 29 Sep 2017 15:48:34 -0400
+>>>>>>> MERGE-SOURCE
 
 unity-control-center (15.04.0+17.10.20170810-0ubuntu1) artful; urgency=medium
 
 
=== modified file 'debian/control'
--- debian/control	2017-09-06 14:40:35 +0000
+++ debian/control	2017-09-30 19:39:20 +0000
@@ -93,6 +93,7 @@
             libcanberra-pulse,
             system-config-printer,
             gnome-control-center-faces,
+            activity-log-manager,
 Conflicts: gnome-control-center (<< 1:3.6.3-0ubuntu50),
            gnome-control-center-unity,
            unity-control-center-datetime