Unity Control Center

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

  1. activity_log_manager
  2. Merge into trunk
Proposed by ventrical
Status: Merged
Approved by: Jeremy Bícha
Approved revision: 12904
Merged at revision: 12904
Proposed branch: lp:~dale-f-beaudoin/unity-control-center/activity_log_manager
Merge into: lp:unity-control-center
Diff against target: 26 lines (+8/-0)
2 files modified
debian/changelog (+7/-0)
debian/control (+1/-0)
To merge this branch: bzr merge lp:~dale-f-beaudoin/unity-control-center/activity_log_manager
Reviewer Review Type Date Requested Status
Jeremy Bícha Approve
Review via email: mp+331620@code.launchpad.net

Description of the change

inserted activity-log-manager into debian/control

To post a comment you must log in.
Revision history for this message
ventrical (dale-f-beaudoin) wrote :

had had some difficulty with nano
deleting old unity-control-center directory and creating new one seems to have fixed the problem
I need to do more of these so I can get used to the code used for commit/merge

Revision history for this message
Jeremy Bícha (jbicha) wrote :

For bileto uploads like this, you didn't have to touch debian/changelog and could have just used the Set commit message button.

https://bileto.ubuntu.com/#/ticket/2973

review: Approve
Revision history for this message
ventrical (dale-f-beaudoin) wrote :

> For bileto uploads like this, you didn't have to touch debian/changelog and
> could have just used the Set commit message button.
>
> https://bileto.ubuntu.com/#/ticket/2973

Jeremy,

Thanks for all your help!

Uh.. try to send me a couple more of these at the ubuntuforums so I can get used to the commit/merge code. if I do these everyday or so I don't think there will be too many problems and will make me a potentially better maintainer.

regards..

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2017-09-06 14:40:51 +0000
3+++ debian/changelog 2017-09-30 22:37:02 +0000
4@@ -1,3 +1,10 @@
5+unity-control-center (15.04.0+17.10.20170814.1-0ubuntu3) UNRELEASED; urgency=medium
6+
7+ * debian/control insert recommend activity-log-manager to pop privacy and
8+ security icon in settings panel
9+
10+ -- ventrical <ventrical@ventrical-MS-7798> Sat, 30 Sep 2017 18:23:39 -0400
11+
12 unity-control-center (15.04.0+17.10.20170814.1-0ubuntu2) artful; urgency=medium
13
14 * debian/control: use 'X-Ubuntu-Use-Langpack: yes' since the indicator
15
16=== modified file 'debian/control'
17--- debian/control 2017-09-06 14:40:35 +0000
18+++ debian/control 2017-09-30 22:37:02 +0000
19@@ -93,6 +93,7 @@
20 libcanberra-pulse,
21 system-config-printer,
22 gnome-control-center-faces,
23+ activity-log-manager,
24 Conflicts: gnome-control-center (<< 1:3.6.3-0ubuntu50),
25 gnome-control-center-unity,
26 unity-control-center-datetime

Subscribers

People subscribed via source and target branches