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
1=== added directory '.pc'
2=== added file '.pc/.quilt_patches'
3--- .pc/.quilt_patches 1970-01-01 00:00:00 +0000
4+++ .pc/.quilt_patches 2015-05-06 06:23:30 +0000
5@@ -0,0 +1,1 @@
6+debian/patches
7
8=== added file '.pc/.quilt_series'
9--- .pc/.quilt_series 1970-01-01 00:00:00 +0000
10+++ .pc/.quilt_series 2015-05-06 06:23:30 +0000
11@@ -0,0 +1,1 @@
12+series
13
14=== added file '.pc/.version'
15--- .pc/.version 1970-01-01 00:00:00 +0000
16+++ .pc/.version 2015-05-06 06:23:30 +0000
17@@ -0,0 +1,1 @@
18+2
19
20=== added file '.pc/applied-patches'
21--- .pc/applied-patches 1970-01-01 00:00:00 +0000
22+++ .pc/applied-patches 2015-05-06 06:23:30 +0000
23@@ -0,0 +1,1 @@
24+fix-typo-in-package-desc.diff
25
26=== added directory '.pc/fix-typo-in-package-desc.diff'
27=== added file '.pc/fix-typo-in-package-desc.diff/.timestamp'
28=== added directory '.pc/fix-typo-in-package-desc.diff/debian'
29=== added file '.pc/fix-typo-in-package-desc.diff/debian/control'
30--- .pc/fix-typo-in-package-desc.diff/debian/control 1970-01-01 00:00:00 +0000
31+++ .pc/fix-typo-in-package-desc.diff/debian/control 2015-05-06 06:23:30 +0000
32@@ -0,0 +1,31 @@
33+Source: session-migration
34+Section: misc
35+Priority: extra
36+Maintainer: Didier Roche <didrocks@ubuntu.com>
37+Build-Depends: debhelper (>= 9.0.0),
38+ cmake (>= 2.8),
39+ libglib2.0-dev,
40+ python3,
41+ python3-nose,
42+Standards-Version: 3.9.3
43+Homepage: https://launchpad.net/session-migration
44+Vcs-Bzr: http://code.launchpad.net/~ubuntu-desktop/session-migration/trunk
45+
46+Package: session-migration
47+Architecture: any
48+Depends: ${shlibs:Depends},
49+ ${misc:Depends},
50+Description: Tool to migrate in user session settings
51+ This tool is used to migrate in session user data when a program is evolving
52+ its configuration, or needing to have files moved and so on.
53+ .
54+ This program is generally autostarted at the very beginning of the session
55+ and integrates caching capability.
56+
57+Package: dh-migrations
58+Architecture: all
59+Depends: ${misc:Depends},
60+ debhelper,
61+Description: debhelper extension for session-migration support
62+ This package provides a debhelper extension to perform session migration
63+ operations on the installed packaged.
64
65=== modified file 'debian/changelog'
66--- debian/changelog 2015-04-15 10:37:21 +0000
67+++ debian/changelog 2015-05-06 06:23:30 +0000
68@@ -1,3 +1,11 @@
69+session-migration (0.2.3) unstable; urgency=low
70+
71+ * debian/patches/fix-typo-in-package-desc.dff: fix typo in package
72+ description. The word 'packaged' was replaced with 'packages'.
73+ (LP: #1193822)
74+
75+ -- Gayan Weerakutti <gayan@reversiblean.com> Wed, 06 May 2015 11:39:12 +0530
76+
77 session-migration (0.2.2) vivid; urgency=medium
78
79 [ Justin McPherson ]
80
81=== modified file 'debian/control'
82--- debian/control 2012-07-13 09:33:02 +0000
83+++ debian/control 2015-05-06 06:23:30 +0000
84@@ -28,4 +28,4 @@
85 debhelper,
86 Description: debhelper extension for session-migration support
87 This package provides a debhelper extension to perform session migration
88- operations on the installed packaged.
89+ operations on the installed packages.
90
91=== added directory 'debian/patches'
92=== added file 'debian/patches/fix-typo-in-package-desc.diff'
93--- debian/patches/fix-typo-in-package-desc.diff 1970-01-01 00:00:00 +0000
94+++ debian/patches/fix-typo-in-package-desc.diff 2015-05-06 06:23:30 +0000
95@@ -0,0 +1,10 @@
96+Index: bug-1193822/debian/control
97+===================================================================
98+--- bug-1193822.orig/debian/control
99++++ bug-1193822/debian/control
100+@@ -28,4 +28,4 @@ Depends: ${misc:Depends},
101+ debhelper,
102+ Description: debhelper extension for session-migration support
103+ This package provides a debhelper extension to perform session migration
104+- operations on the installed packaged.
105++ operations on the installed packages.
106
107=== added file 'debian/patches/series'
108--- debian/patches/series 1970-01-01 00:00:00 +0000
109+++ debian/patches/series 2015-05-06 06:23:30 +0000
110@@ -0,0 +1,1 @@
111+fix-typo-in-package-desc.diff

Subscribers

People subscribed via source and target branches