Ubuntu
gnome-calculator package

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

  1. Git
  2. lp:~3v1n0/ubuntu/+source/gnome-calculator
  3. ubuntu/master
  4. Merge into ubuntu/master
Proposed by Marco Trevisan (Treviño)
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-Tolomelli Approve
Review via email: mp+354328@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Didier Roche-Tolomelli (didrocks) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/debian/changelog b/debian/changelog
index 193d268..2ced402 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
1gnome-calculator (1:3.30.0-1ubuntu2) UNRELEASED; urgency=medium
2
3 * debian/control:
4 - Use Ubuntu Vcs-* URIs, and move debian's to XS-Debian-Vcs-*
5
6 -- Marco Trevisan (Treviño) <marco@ubuntu.com> Wed, 05 Sep 2018 15:35:38 +0200
7
1gnome-calculator (1:3.30.0-1ubuntu1) cosmic; urgency=medium8gnome-calculator (1:3.30.0-1ubuntu1) cosmic; urgency=medium
29
3 * Sync with Debian10 * Sync with Debian
diff --git a/debian/control b/debian/control
index 7d6545e..02dbd88 100644
--- a/debian/control
+++ b/debian/control
@@ -22,8 +22,10 @@ Build-Depends: appstream-util,
22 libmpc-dev,22 libmpc-dev,
23 libmpfr-dev23 libmpfr-dev
24Standards-Version: 4.1.524Standards-Version: 4.1.5
25Vcs-Browser: https://salsa.debian.org/gnome-team/gnome-calculator25XS-Debian-Vcs-Browser: https://salsa.debian.org/gnome-team/gnome-calculator
26Vcs-Git: https://salsa.debian.org/gnome-team/gnome-calculator.git26XS-Debian-Vcs-Git: https://salsa.debian.org/gnome-team/gnome-calculator.git
27Vcs-Browser: https://git.launchpad.net/~ubuntu-desktop/ubuntu/+source/gnome-calculator
28Vcs-Git: https://git.launchpad.net/~ubuntu-desktop/ubuntu/+source/gnome-calculator
27Homepage: https://wiki.gnome.org/Apps/Calculator29Homepage: https://wiki.gnome.org/Apps/Calculator
28Rules-Requires-Root: no30Rules-Requires-Root: no
2931
diff --git a/debian/control.in b/debian/control.in
index eb08134..bce57c6 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -18,8 +18,10 @@ Build-Depends: appstream-util,
18 libmpc-dev,18 libmpc-dev,
19 libmpfr-dev19 libmpfr-dev
20Standards-Version: 4.1.520Standards-Version: 4.1.5
21Vcs-Browser: https://salsa.debian.org/gnome-team/gnome-calculator21XS-Debian-Vcs-Browser: https://salsa.debian.org/gnome-team/gnome-calculator
22Vcs-Git: https://salsa.debian.org/gnome-team/gnome-calculator.git22XS-Debian-Vcs-Git: https://salsa.debian.org/gnome-team/gnome-calculator.git
23Vcs-Browser: https://git.launchpad.net/~ubuntu-desktop/ubuntu/+source/gnome-calculator
24Vcs-Git: https://git.launchpad.net/~ubuntu-desktop/ubuntu/+source/gnome-calculator
23Homepage: https://wiki.gnome.org/Apps/Calculator25Homepage: https://wiki.gnome.org/Apps/Calculator
24Rules-Requires-Root: no26Rules-Requires-Root: no
2527

Subscribers

People subscribed via source and target branches