Merge lp:~codygarver/maya/packaging-fix-1082367 into lp:~elementary-os/maya/deb-packaging

Proposed by Cody Garver
Status: Merged
Merged at revision: 13
Proposed branch: lp:~codygarver/maya/packaging-fix-1082367
Merge into: lp:~elementary-os/maya/deb-packaging
Diff against target: 79 lines (+15/-9)
4 files modified
debian/changelog (+1/-1)
debian/control (+9/-3)
debian/copyright (+3/-3)
debian/rules (+2/-2)
To merge this branch: bzr merge lp:~codygarver/maya/packaging-fix-1082367
Reviewer Review Type Date Requested Status
Sergey "Shnatsel" Davidoff (community) Approve
Review via email: mp+141572@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Sergey "Shnatsel" Davidoff (shnatsel) wrote :

Looks good to me. I'll update the apport hooks as well.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2012-11-10 06:32:03 +0000
3+++ debian/changelog 2013-01-01 22:57:23 +0000
4@@ -1,4 +1,4 @@
5-maya (0.2.0) UNRELEASED; urgency=low
6+maya-calendar (0.2.0) UNRELEASED; urgency=low
7
8 * Initial Release.
9
10
11=== modified file 'debian/control'
12--- debian/control 2012-12-07 19:20:27 +0000
13+++ debian/control 2013-01-01 22:57:23 +0000
14@@ -1,4 +1,4 @@
15-Source: maya
16+Source: maya-calendar
17 Section: utils
18 Priority: optional
19 Maintainer: Cody Garver <codygarver@gmail.com>
20@@ -17,16 +17,22 @@
21
22 Package: maya
23 Architecture: any
24+Depends: maya-calendar, ${misc:Depends}
25+Description: transitional dummy package
26+ This is a transitional dummy package. It can safely be removed.
27+
28+Package: maya-calendar
29+Architecture: any
30 Depends: ${misc:Depends}, ${shlibs:Depends}
31 Description: GCal-syncing GTK+ calendar application
32 Maya is a slim, lightweight, GCal-syncing GTK+ calendar application written
33 in Vala, specifically for the Elementary project.
34
35-Package: maya-dbg
36+Package: maya-calendar-dbg
37 Architecture: any
38 Section: debug
39 Priority: extra
40-Depends: maya (= ${binary:Version}), ${misc:Depends}
41+Depends: maya-calendar (= ${binary:Version}), ${misc:Depends}
42 Description: GCal-syncing GTK+ calendar application (debugging symbols)
43 Maya is a slim, lightweight, GCal-syncing GTK+ Calendar application written
44 in Vala, specifically for the Elementary project.
45
46=== modified file 'debian/copyright'
47--- debian/copyright 2012-11-10 06:32:03 +0000
48+++ debian/copyright 2013-01-01 22:57:23 +0000
49@@ -100,13 +100,13 @@
50
51 License: 2-clause BSD
52 Redistribution and use in source and binary forms, with or without
53- modification, are permitted provided that the following conditions are met:
54+ modification, are permitted provided that the following conditions are met:
55 .
56 1. Redistributions of source code must retain the above copyright notice, this
57- list of conditions and the following disclaimer.
58+ list of conditions and the following disclaimer.
59 2. Redistributions in binary form must reproduce the above copyright notice,
60 this list of conditions and the following disclaimer in the documentation
61- and/or other materials provided with the distribution.
62+ and/or other materials provided with the distribution.
63 .
64 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
65 ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
66
67=== modified file 'debian/rules'
68--- debian/rules 2012-11-10 06:32:03 +0000
69+++ debian/rules 2013-01-01 22:57:23 +0000
70@@ -4,7 +4,7 @@
71 dh $@
72
73 override_dh_auto_install:
74- dh_auto_install --destdir=debian/maya
75+ dh_auto_install --destdir=debian/maya-calendar
76
77 override_dh_strip:
78- dh_strip --dbg-package=maya-dbg
79+ dh_strip --dbg-package=maya-calendar-dbg

Subscribers

People subscribed via source and target branches