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

Proposed by ventrical on 2017-08-14
Status: Merged
Approved by: Jeremy Bicha on 2017-08-14
Approved revision: no longer in the source branch.
Merged at revision: 12900
Proposed branch: lp:~dale-f-beaudoin/unity-control-center/unity7maintainers
Merge into: lp:unity-control-center
Diff against target: 25 lines (+7/-1)
2 files modified
debian/changelog (+6/-0)
debian/rules (+1/-1)
To merge this branch: bzr merge lp:~dale-f-beaudoin/unity-control-center/unity7maintainers
Reviewer Review Type Date Requested Status
Jeremy Bicha 2017-08-14 Approve on 2017-08-14
Review via email: mp+328981@code.launchpad.net

Description of the change

debian/rules

changed "ubuntu 17.04" to "ubuntu 17.10"

To post a comment you must log in.
Jeremy Bicha (jbicha) wrote :

Thank you!

By the way, your changelog signature should be a valid email address.

I think a good way to fix that for next time is by adding your email address to ~/.devscripts like this:

<email address hidden>
<email address hidden>

For Unity stuff, we generally use bileto to build and publish these changes. I am doing that for you since you don't have an account there yet.

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

It looks like bileto is changing the changelog line to use my info anyway. (bileto does interesting mangling of debian/changelog).

review: Approve
12900. By dale_f_beaudoin <email address hidden> on 2017-08-14

  changed version number from 17.04 to 17.10
  debian/rules

ventrical (dale-f-beaudoin) wrote :

Thanks for the pointer.

________________________________
From: <email address hidden> <email address hidden> on behalf of Jeremy Bicha <email address hidden>
Sent: August 14, 2017 10:50:24 AM
To: ventrical
Subject: Re: [Merge] lp:~dale-f-beaudoin/unity-control-center/unity7maintainers into lp:unity-control-center

Review: Approve

Thank you!

By the way, your changelog signature should be a valid email address.

I think a good way to fix that for next time is by adding your email address to ~/.devscripts like this:

<email address hidden>
<email address hidden>

For Unity stuff, we generally use bileto to build and publish these changes. I am doing that for you since you don't have an account there yet.

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

It looks like bileto is changing the changelog line to use my info anyway. (bileto does interesting mangling of debian/changelog).
--
https://code.launchpad.net/~dale-f-beaudoin/unity-control-center/unity7maintainers/+merge/328981
You are the owner of lp:~dale-f-beaudoin/unity-control-center/unity7maintainers.

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-08-10 02:50:08 +0000
3+++ debian/changelog 2017-08-14 15:07:49 +0000
4@@ -1,3 +1,9 @@
5+unity-control-center (15.04.0+17.10.20170810-0ubuntu2) UNRELEASED; urgency=medium
6+
7+ * Replace version number from 17.04 to 17.10
8+
9+ -- ventrical <ventrical@ventrical-MS-7798> Mon, 14 Aug 2017 05:40:03 -0400
10+
11 unity-control-center (15.04.0+17.10.20170810-0ubuntu1) artful; urgency=medium
12
13 * No-change rebuild against latest libgtop2
14
15=== modified file 'debian/rules'
16--- debian/rules 2016-10-30 23:30:41 +0000
17+++ debian/rules 2017-08-14 15:07:49 +0000
18@@ -18,6 +18,6 @@
19 DEB_DH_MAKESHLIBS_ARGS_libunity-control-center1 += -- -c4
20
21 binary-post-install/unity-control-center::
22- ./panels/info/logo-generator --logo panels/info/UbuntuLogoBlank.png --text "ubuntu 17.04" --output debian/unity-control-center/usr/share/unity-control-center/ui/UbuntuLogo.png
23+ ./panels/info/logo-generator --logo panels/info/UbuntuLogoBlank.png --text "ubuntu 17.10" --output debian/unity-control-center/usr/share/unity-control-center/ui/UbuntuLogo.png
24
25 common-binary-post-install-arch:: list-missing

Subscribers

People subscribed via source and target branches