Ubuntu
unity-greeter-badges package

Merge lp:~profzoom/ubuntu/vivid/unity-greeter-badges/bump-to-version-0.3 into lp:ubuntu/vivid/unity-greeter-badges

  1. Vivid (15.04)
  2. bump-to-version-0.3
  3. Merge into vivid
Proposed by Doug Torrance
Status: Merged
Merged at revision: 3
Proposed branch: lp:~profzoom/ubuntu/vivid/unity-greeter-badges/bump-to-version-0.3
Merge into: lp:ubuntu/vivid/unity-greeter-badges
Diff against target: 126 lines (+29/-1)
5 files modified
debian/changelog (+14/-0)
debian/control (+1/-1)
debian/install (+9/-0)
debian/rules (+3/-0)
debian/watch (+2/-0)
To merge this branch: bzr merge lp:~profzoom/ubuntu/vivid/unity-greeter-badges/bump-to-version-0.3
Reviewer Review Type Date Requested Status
Ubuntu Development Team Pending
Review via email: mp+246852@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'custom_amiwm_badge.png'
2Binary files custom_amiwm_badge.png 1970-01-01 00:00:00 +0000 and custom_amiwm_badge.png 2015-01-18 19:47:15 +0000 differ
3=== added symlink 'custom_cinnamon2d_badge.png'
4=== target is u'custom_cinnamon_badge.png'
5=== added file 'custom_evilwm_badge.png'
6Binary files custom_evilwm_badge.png 1970-01-01 00:00:00 +0000 and custom_evilwm_badge.png 2015-01-18 19:47:15 +0000 differ
7=== added file 'custom_herbstluftwm_badge.png'
8Binary files custom_herbstluftwm_badge.png 1970-01-01 00:00:00 +0000 and custom_herbstluftwm_badge.png 2015-01-18 19:47:15 +0000 differ
9=== added symlink 'custom_i3-with-shmlog_badge.png'
10=== target is u'custom_i3_badge.png'
11=== added file 'custom_openbsd-cwm_badge.png'
12Binary files custom_openbsd-cwm_badge.png 1970-01-01 00:00:00 +0000 and custom_openbsd-cwm_badge.png 2015-01-18 19:47:15 +0000 differ
13=== added file 'custom_pekwm_badge.png'
14Binary files custom_pekwm_badge.png 1970-01-01 00:00:00 +0000 and custom_pekwm_badge.png 2015-01-18 19:47:15 +0000 differ
15=== added file 'custom_razor_badge.png'
16Binary files custom_razor_badge.png 1970-01-01 00:00:00 +0000 and custom_razor_badge.png 2015-01-18 19:47:15 +0000 differ
17=== added file 'custom_stumpwm_badge.png'
18Binary files custom_stumpwm_badge.png 1970-01-01 00:00:00 +0000 and custom_stumpwm_badge.png 2015-01-18 19:47:15 +0000 differ
19=== added file 'custom_ubuntustudio_badge.png'
20Binary files custom_ubuntustudio_badge.png 1970-01-01 00:00:00 +0000 and custom_ubuntustudio_badge.png 2015-01-18 19:47:15 +0000 differ
21=== modified file 'debian/changelog'
22--- debian/changelog 2014-11-27 01:01:37 +0000
23+++ debian/changelog 2015-01-18 19:47:15 +0000
24@@ -1,3 +1,17 @@
25+unity-greeter-badges (0.3-0ubuntu1) vivid; urgency=medium
26+
27+ * New upstream release.
28+ * debian/control
29+ - Fix typo in Maintainer email address.
30+ * debian/install
31+ - Install new badges from new upstream release.
32+ * debian/rules
33+ - Add get-orig-source target.
34+ * debian/watch
35+ - New file.
36+
37+ -- Doug Torrance <dtorrance@monmouthcollege.edu> Sun, 18 Jan 2015 12:53:25 -0600
38+
39 unity-greeter-badges (0.1-0ubuntu1) vivid; urgency=medium
40
41 * Initial release (LP: #1396851).
42
43=== modified file 'debian/control'
44--- debian/control 2014-11-27 01:01:37 +0000
45+++ debian/control 2015-01-18 19:47:15 +0000
46@@ -1,7 +1,7 @@
47 Source: unity-greeter-badges
48 Section: misc
49 Priority: optional
50-Maintainer: Ubuntu Developers <ubuntu-devel-discuss@listsoubuntu.com>
51+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
52 XSBC-Original-Maintainer: Doug Torrance <dtorrance@monmouthcollege.edu>
53 Build-Depends: debhelper (>= 9), dh-exec
54 Standards-Version: 3.9.6
55
56=== modified file 'debian/install'
57--- debian/install 2014-11-27 01:01:37 +0000
58+++ debian/install 2015-01-18 19:47:15 +0000
59@@ -3,6 +3,7 @@
60 # installed. There are a few badges not provided in other packages which
61 # link to them. We rename them instead.
62 custom_afterstep_badge.png usr/share/unity-greeter
63+custom_amiwm_badge.png usr/share/unity-greeter
64 custom_awesome_badge.png usr/share/unity-greeter
65 custom_blackbox_badge.png usr/share/unity-greeter
66 # custom_cairo-dock_badge.png provided by cairo-dock-data
67@@ -10,15 +11,18 @@
68 custom_cairo-dock_badge.png => usr/share/unity-greeter/custom_cairo-dock-unity_badge.png
69 custom_chromium_badge.png usr/share/unity-greeter
70 custom_cinnamon_badge.png usr/share/unity-greeter
71+custom_cinnamon2d_badge.png usr/share/unity-greeter
72 custom_dwm_badge.png usr/share/unity-greeter
73 custom_enlightenment_badge.png usr/share/unity-greeter
74 custom_etoile_badge.png usr/share/unity-greeter
75+custom_evilwm_badge.png usr/share/unity-greeter
76 custom_fluxbox_badge.png usr/share/unity-greeter
77 custom_fvwm1_badge.png usr/share/unity-greeter
78 custom_fvwm_badge.png usr/share/unity-greeter
79 custom_fvwm-crystal_badge.png usr/share/unity-greeter
80 custom_gnome-xmonad_badge.png usr/share/unity-greeter
81 custom_gnustep_badge.png usr/share/unity-greeter
82+custom_herbstluftwm_badge.png usr/share/unity-greeter
83 custom_i3_badge.png usr/share/unity-greeter
84 custom_IceWM_badge.png usr/share/unity-greeter
85 custom_IceWM-Experimental_badge.png usr/share/unity-greeter
86@@ -32,9 +36,13 @@
87 custom_openbox_badge.png usr/share/unity-greeter
88 custom_openbox-gnome_badge.png usr/share/unity-greeter
89 custom_openbox-kde_badge.png usr/share/unity-greeter
90+custom_openbsd-cwm_badge.png usr/share/unity-greeter
91 custom_pantheon_badge.png usr/share/unity-greeter
92+custom_pekwm_badge.png usr/share/unity-greeter
93 custom_ratpoison_badge.png usr/share/unity-greeter
94+custom_razor_badge.png usr/share/unity-greeter
95 custom_sawfish_badge.png usr/share/unity-greeter
96+custom_stumpwm_badge.png usr/share/unity-greeter
97 custom_subtle_badge.png usr/share/unity-greeter
98 custom_sugar-session-0.84_badge.png usr/share/unity-greeter
99 custom_sugar-session-0.86_badge.png usr/share/unity-greeter
100@@ -42,6 +50,7 @@
101 custom_sugar-session-0.90_badge.png usr/share/unity-greeter
102 custom_trinity_badge.png usr/share/unity-greeter
103 custom_twm_badge.png usr/share/unity-greeter
104+custom_ubuntustudio_badge.png usr/share/unity-greeter
105 custom_usr_badge.png usr/share/unity-greeter
106 # custom_wmaker-common_badge.png provided by wmaker-common
107 custom_wmii_badge.png usr/share/unity-greeter
108
109=== modified file 'debian/rules'
110--- debian/rules 2014-11-27 01:01:37 +0000
111+++ debian/rules 2015-01-18 19:47:15 +0000
112@@ -2,3 +2,6 @@
113
114 %:
115 dh $@
116+
117+get-orig-source:
118+ uscan --verbose --force-download --rename
119
120=== added file 'debian/watch'
121--- debian/watch 1970-01-01 00:00:00 +0000
122+++ debian/watch 2015-01-18 19:47:15 +0000
123@@ -0,0 +1,2 @@
124+version=3
125+http://users.wpi.edu/~kddoan/greeter/greeter-badges_(\d[\d.]*)\.(?:zip|tgz|tbz2|txz|tar\.(?:gz|bz2|xz))
126\ No newline at end of file

Subscribers

People subscribed via source and target branches

to all changes: