Merge lp://qastaging/~khurshid-alam/gsettings-ubuntu-touch-schemas/gds-to-gus-impish into lp://qastaging/gsettings-ubuntu-touch-schemas

Proposed by Khurshid Alam
Status: Merged
Approved by: Ken VanDine
Approved revision: 82
Merged at revision: 79
Proposed branch: lp://qastaging/~khurshid-alam/gsettings-ubuntu-touch-schemas/gds-to-gus-impish
Merge into: lp://qastaging/gsettings-ubuntu-touch-schemas
Diff against target: 191 lines (+106/-4)
8 files modified
Makefile.am (+3/-0)
configure.ac (+1/-0)
debian/control (+14/-2)
debian/gsettings-unity-schemas-dev.install (+1/-0)
debian/rules (+1/-1)
gsettings-unity-schemas.pc.in (+6/-0)
schemas/Makefile.am (+2/-1)
schemas/com.canonical.unity.desktop.gschema.xml.in.in (+78/-0)
To merge this branch: bzr merge lp://qastaging/~khurshid-alam/gsettings-ubuntu-touch-schemas/gds-to-gus-impish
Reviewer Review Type Date Requested Status
Sebastien Bacher (community) Approve
Marco Trevisan (Treviño) (community) Approve
Review via email: mp+405057@code.qastaging.launchpad.net

Commit message

* Provide removed gsettings-desktop-schemas in gsettings-ubuntu-schemas. LP: #1933646

* These keys are used by unity-settings-daemon

To post a comment you must log in.
Revision history for this message
Khurshid Alam (khurshid-alam) wrote :

Note, I created a gsettings-ubuntu-schemas-dev which we can use in build depends in u-s-d. And this needs to be published first so the build order would be gsettings-ubuntu-schema -> u-s-d -> unity/u-c-c + others

Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

LGTM, see if you can address that tiny comments.

80. By Khurshid Alam

* Use debhelper-compat and bump it 13.

* Remove --fail-missing, dh_missing --fail-missing is the default

Revision history for this message
Khurshid Alam (khurshid-alam) wrote :

I replaced it with debhelper-compat and bump it to 13.

Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

LGTM

review: Approve
Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

I was looking again, at this, but maybe isn't better to call the pc file (and so the package name) gsettings-unity-schemas.pc?

I don't think this will be ever so ubuntu generic, and in case we'll need to have an ubuntu one would be better not to clash with this.

Revision history for this message
Khurshid Alam (khurshid-alam) wrote :

You want me to rename,

1) gsettings-ubuntu-schemas-dev ----> gsettings-unity-schemas-dev --> but pulls gsettings-ubuntu-schema for now

2) gsettings-ubuntu-schemas.pc --> gsettings-unity-schemas.pc ?

81. By Khurshid Alam

Change package name to gsettings-unity-schemas-dev but keeps depending on gsettings-ubuntu-schemas for now

Revision history for this message
Khurshid Alam (khurshid-alam) wrote :

I made the pc file changes.

Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

LGTM, I can't fully approve though. Seb can you?

Debs will be at https://bileto.ubuntu.com/#/ticket/4606

Revision history for this message
Marco Trevisan (Treviño) (3v1n0) :
review: Approve
Revision history for this message
Sebastien Bacher (seb128) wrote :

Thanks, one question from me, why did you add the Build-Depends on gnome-pkg-tools ?

Revision history for this message
Khurshid Alam (khurshid-alam) wrote :

@seb128,

That is when I was also adding enum-headers, generating gir and typelib for the touchpad schema (which I later moved in u-s-d because originally it was migrated from there)

But it is not required for this merge. I can remove it if you want.

82. By Khurshid Alam

Remove gnome-pkg-tools from build-depends. It is not required.

Revision history for this message
Sebastien Bacher (seb128) wrote :

thanks

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches