Merge lp:~reversiblean/session-migration/session-migration into lp:session-migration

Proposed by Gayan Weerakutti
Status: Merged
Approved by: Sebastien Bacher
Approved revision: 28
Merge reported by: Sebastien Bacher
Merged at revision: not available
Proposed branch: lp:~reversiblean/session-migration/session-migration
Merge into: lp:session-migration
Diff against target: 111 lines (+55/-1)
9 files modified
.pc/.quilt_patches (+1/-0)
.pc/.quilt_series (+1/-0)
.pc/.version (+1/-0)
.pc/applied-patches (+1/-0)
.pc/fix-typo-in-package-desc.diff/debian/control (+31/-0)
debian/changelog (+8/-0)
debian/control (+1/-1)
debian/patches/fix-typo-in-package-desc.diff (+10/-0)
debian/patches/series (+1/-0)
To merge this branch: bzr merge lp:~reversiblean/session-migration/session-migration
Reviewer Review Type Date Requested Status
Sebastien Bacher Approve
Review via email: mp+258334@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Sebastien Bacher (seb128) wrote :

thank you for your work, there is no need to use a patch to change the packaging, that's not an upstream part and can be edited directly, I changed things to edit directly the control and commited/uploaded

review: Approve
Revision history for this message
Gayan Weerakutti (reversiblean) wrote :

Thanks for the information. : )

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== added directory '.pc'
=== added file '.pc/.quilt_patches'
--- .pc/.quilt_patches 1970-01-01 00:00:00 +0000
+++ .pc/.quilt_patches 2015-05-06 06:23:30 +0000
@@ -0,0 +1,1 @@
1debian/patches
02
=== added file '.pc/.quilt_series'
--- .pc/.quilt_series 1970-01-01 00:00:00 +0000
+++ .pc/.quilt_series 2015-05-06 06:23:30 +0000
@@ -0,0 +1,1 @@
1series
02
=== added file '.pc/.version'
--- .pc/.version 1970-01-01 00:00:00 +0000
+++ .pc/.version 2015-05-06 06:23:30 +0000
@@ -0,0 +1,1 @@
12
02
=== added file '.pc/applied-patches'
--- .pc/applied-patches 1970-01-01 00:00:00 +0000
+++ .pc/applied-patches 2015-05-06 06:23:30 +0000
@@ -0,0 +1,1 @@
1fix-typo-in-package-desc.diff
02
=== added directory '.pc/fix-typo-in-package-desc.diff'
=== added file '.pc/fix-typo-in-package-desc.diff/.timestamp'
=== added directory '.pc/fix-typo-in-package-desc.diff/debian'
=== added file '.pc/fix-typo-in-package-desc.diff/debian/control'
--- .pc/fix-typo-in-package-desc.diff/debian/control 1970-01-01 00:00:00 +0000
+++ .pc/fix-typo-in-package-desc.diff/debian/control 2015-05-06 06:23:30 +0000
@@ -0,0 +1,31 @@
1Source: session-migration
2Section: misc
3Priority: extra
4Maintainer: Didier Roche <didrocks@ubuntu.com>
5Build-Depends: debhelper (>= 9.0.0),
6 cmake (>= 2.8),
7 libglib2.0-dev,
8 python3,
9 python3-nose,
10Standards-Version: 3.9.3
11Homepage: https://launchpad.net/session-migration
12Vcs-Bzr: http://code.launchpad.net/~ubuntu-desktop/session-migration/trunk
13
14Package: session-migration
15Architecture: any
16Depends: ${shlibs:Depends},
17 ${misc:Depends},
18Description: Tool to migrate in user session settings
19 This tool is used to migrate in session user data when a program is evolving
20 its configuration, or needing to have files moved and so on.
21 .
22 This program is generally autostarted at the very beginning of the session
23 and integrates caching capability.
24
25Package: dh-migrations
26Architecture: all
27Depends: ${misc:Depends},
28 debhelper,
29Description: debhelper extension for session-migration support
30 This package provides a debhelper extension to perform session migration
31 operations on the installed packaged.
032
=== modified file 'debian/changelog'
--- debian/changelog 2015-04-15 10:37:21 +0000
+++ debian/changelog 2015-05-06 06:23:30 +0000
@@ -1,3 +1,11 @@
1session-migration (0.2.3) unstable; urgency=low
2
3 * debian/patches/fix-typo-in-package-desc.dff: fix typo in package
4 description. The word 'packaged' was replaced with 'packages'.
5 (LP: #1193822)
6
7 -- Gayan Weerakutti <gayan@reversiblean.com> Wed, 06 May 2015 11:39:12 +0530
8
1session-migration (0.2.2) vivid; urgency=medium9session-migration (0.2.2) vivid; urgency=medium
210
3 [ Justin McPherson ]11 [ Justin McPherson ]
412
=== modified file 'debian/control'
--- debian/control 2012-07-13 09:33:02 +0000
+++ debian/control 2015-05-06 06:23:30 +0000
@@ -28,4 +28,4 @@
28 debhelper,28 debhelper,
29Description: debhelper extension for session-migration support29Description: debhelper extension for session-migration support
30 This package provides a debhelper extension to perform session migration30 This package provides a debhelper extension to perform session migration
31 operations on the installed packaged.31 operations on the installed packages.
3232
=== added directory 'debian/patches'
=== added file 'debian/patches/fix-typo-in-package-desc.diff'
--- debian/patches/fix-typo-in-package-desc.diff 1970-01-01 00:00:00 +0000
+++ debian/patches/fix-typo-in-package-desc.diff 2015-05-06 06:23:30 +0000
@@ -0,0 +1,10 @@
1Index: bug-1193822/debian/control
2===================================================================
3--- bug-1193822.orig/debian/control
4+++ bug-1193822/debian/control
5@@ -28,4 +28,4 @@ Depends: ${misc:Depends},
6 debhelper,
7 Description: debhelper extension for session-migration support
8 This package provides a debhelper extension to perform session migration
9- operations on the installed packaged.
10+ operations on the installed packages.
011
=== added file 'debian/patches/series'
--- debian/patches/series 1970-01-01 00:00:00 +0000
+++ debian/patches/series 2015-05-06 06:23:30 +0000
@@ -0,0 +1,1 @@
1fix-typo-in-package-desc.diff

Subscribers

People subscribed via source and target branches