Merge ~3v1n0/ubuntu/+source/gnome-calculator:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gnome-calculator:ubuntu/master

Proposed by Marco Trevisan (Treviño) on 2018-09-05
Status: Merged
Merged at revision: 2628c12ce12f813b753dd72b7405818bdf90ce5f
Proposed branch: ~3v1n0/ubuntu/+source/gnome-calculator:ubuntu/master
Merge into: ~ubuntu-desktop/ubuntu/+source/gnome-calculator:ubuntu/master
Diff against target: 48 lines (+15/-4)
3 files modified
debian/changelog (+7/-0)
debian/control (+4/-2)
debian/control.in (+4/-2)
Reviewer Review Type Date Requested Status
Didier Roche 2018-09-05 Approve on 2018-09-05
Review via email: mp+354328@code.launchpad.net
To post a comment you must log in.
Didier Roche (didrocks) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/changelog b/debian/changelog
2index 193d268..2ced402 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,10 @@
6+gnome-calculator (1:3.30.0-1ubuntu2) UNRELEASED; urgency=medium
7+
8+ * debian/control:
9+ - Use Ubuntu Vcs-* URIs, and move debian's to XS-Debian-Vcs-*
10+
11+ -- Marco Trevisan (Treviño) <marco@ubuntu.com> Wed, 05 Sep 2018 15:35:38 +0200
12+
13 gnome-calculator (1:3.30.0-1ubuntu1) cosmic; urgency=medium
14
15 * Sync with Debian
16diff --git a/debian/control b/debian/control
17index 7d6545e..02dbd88 100644
18--- a/debian/control
19+++ b/debian/control
20@@ -22,8 +22,10 @@ Build-Depends: appstream-util,
21 libmpc-dev,
22 libmpfr-dev
23 Standards-Version: 4.1.5
24-Vcs-Browser: https://salsa.debian.org/gnome-team/gnome-calculator
25-Vcs-Git: https://salsa.debian.org/gnome-team/gnome-calculator.git
26+XS-Debian-Vcs-Browser: https://salsa.debian.org/gnome-team/gnome-calculator
27+XS-Debian-Vcs-Git: https://salsa.debian.org/gnome-team/gnome-calculator.git
28+Vcs-Browser: https://git.launchpad.net/~ubuntu-desktop/ubuntu/+source/gnome-calculator
29+Vcs-Git: https://git.launchpad.net/~ubuntu-desktop/ubuntu/+source/gnome-calculator
30 Homepage: https://wiki.gnome.org/Apps/Calculator
31 Rules-Requires-Root: no
32
33diff --git a/debian/control.in b/debian/control.in
34index eb08134..bce57c6 100644
35--- a/debian/control.in
36+++ b/debian/control.in
37@@ -18,8 +18,10 @@ Build-Depends: appstream-util,
38 libmpc-dev,
39 libmpfr-dev
40 Standards-Version: 4.1.5
41-Vcs-Browser: https://salsa.debian.org/gnome-team/gnome-calculator
42-Vcs-Git: https://salsa.debian.org/gnome-team/gnome-calculator.git
43+XS-Debian-Vcs-Browser: https://salsa.debian.org/gnome-team/gnome-calculator
44+XS-Debian-Vcs-Git: https://salsa.debian.org/gnome-team/gnome-calculator.git
45+Vcs-Browser: https://git.launchpad.net/~ubuntu-desktop/ubuntu/+source/gnome-calculator
46+Vcs-Git: https://git.launchpad.net/~ubuntu-desktop/ubuntu/+source/gnome-calculator
47 Homepage: https://wiki.gnome.org/Apps/Calculator
48 Rules-Requires-Root: no
49

Subscribers

People subscribed via source and target branches