Michael Terry has proposed merging ~mterry/kubuntu-packaging/+git/kmahjongg:master into ~kubuntu-packagers/kubuntu-packaging/+git/kmahjongg:kubuntu_zesty_archive.
Requested reviews: Kubuntu Packagers (kubuntu-packagers) For more details, see: https://code.launchpad.net/~mterry/kubuntu-packaging/+git/kmahjongg/+merge/311447 Add dependency on data package (I already uploaded this before noticing the Vcs lines in debian/control.) -- Your team Kubuntu Packagers is requested to review the proposed merge of ~mterry/kubuntu-packaging/+git/kmahjongg:master into ~kubuntu-packagers/kubuntu-packaging/+git/kmahjongg:kubuntu_zesty_archive.
diff --git a/debian/changelog b/debian/changelog index e497d68..6228479 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,16 @@ +<<<<<<< debian/changelog kmahjongg (4:16.04.3-0ubuntu2) UNRELEASED; urgency=medium * Update Vcs-Git fields to use https:// instead of git:// -- José Manuel SantamarÃa Lema <[email protected]> Sat, 29 Oct 2016 17:16:37 +0200 +======= +kmahjongg (4:16.04.3-0ubuntu2) zesty; urgency=medium + + * added missing dependency to kdegames-mahjongg-data-kf5 (LP: #1634250) + + -- Lars Bischoff <[email protected]> Sun, 13 Nov 2016 18:51:43 +0100 +>>>>>>> debian/changelog kmahjongg (4:16.04.3-0ubuntu1) yakkety; urgency=medium diff --git a/debian/control b/debian/control index 6cf93aa..c1f5f7b 100644 --- a/debian/control +++ b/debian/control @@ -30,7 +30,7 @@ Vcs-Git: https://git.launchpad.net/~kubuntu-packagers/kubuntu-packaging/+git/kma Package: kmahjongg Architecture: any -Depends: ${misc:Depends}, ${shlibs:Depends} +Depends: kdegames-mahjongg-data-kf5 (>= 4:16.04), ${misc:Depends}, ${shlibs:Depends} Recommends: khelpcenter Description: mahjongg solitaire game KMahjongg is a solitaire game where the player removes matching Mahjongg tiles
-- kubuntu-devel mailing list [email protected] Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel
