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

[Doug Torrance]

[Graham Inggs (ginggs)]

review: Approve

Unmerged revisions

4. By Doug Torrance on 2015-02-28

* New upstream release.
* debian/install
  - Simplify file to use wildcard. We will handle the special cases
    in debian/rules.
  - Remove executable bit; not needed since we no longer use dh-exec.
* debian/control
  - Remove dh-exec from Build-Depends; no longer needed.
* debian/rules
  - Add override_dh_install target to remove badges found in other packages
    and fix resulting broken symlinks. This function was previously
    performed by dh-exec using debian/install, but this was harder to
    maintain.

=== added symlink 'custom_QLubuntu_badge.png'
=== target is u'custom_LXDE_badge.png'
=== added file 'custom_aewm++_badge.png'
 Binary files custom_aewm++_badge.png	1970-01-01 00:00:00 +0000 and custom_aewm++_badge.png	2015-02-28 14:28:23 +0000 differ
=== added file 'custom_cde_badge.png'
 Binary files custom_cde_badge.png	1970-01-01 00:00:00 +0000 and custom_cde_badge.png	2015-02-28 14:28:23 +0000 differ
=== added file 'custom_deepin_badge.png'
 Binary files custom_deepin_badge.png	1970-01-01 00:00:00 +0000 and custom_deepin_badge.png	2015-02-28 14:28:23 +0000 differ
=== added file 'custom_ede_badge.png'
 Binary files custom_ede_badge.png	1970-01-01 00:00:00 +0000 and custom_ede_badge.png	2015-02-28 14:28:23 +0000 differ
=== added file 'custom_gnome-bluetile_badge.png'
 Binary files custom_gnome-bluetile_badge.png	1970-01-01 00:00:00 +0000 and custom_gnome-bluetile_badge.png	2015-02-28 14:28:23 +0000 differ
=== added symlink 'custom_lubuntu-nexus7_badge.png'
=== target is u'custom_LXDE_badge.png'
=== added symlink 'custom_lxgames_badge.png'
=== target is u'custom_LXDE_badge.png'
=== added file 'custom_matchbox_badge.png'
 Binary files custom_matchbox_badge.png	1970-01-01 00:00:00 +0000 and custom_matchbox_badge.png	2015-02-28 14:28:23 +0000 differ
=== added file 'custom_mate-old_badge.png'
 Binary files custom_mate-old_badge.png	1970-01-01 00:00:00 +0000 and custom_mate-old_badge.png	2015-02-28 14:28:23 +0000 differ
=== modified file 'custom_mate_badge.png'
 Binary files custom_mate_badge.png	2014-11-27 01:01:37 +0000 and custom_mate_badge.png	2015-02-28 14:28:23 +0000 differ
=== added symlink 'custom_sugar-session-0.96_badge.png'
=== target is u'custom_usr_badge.png'
=== added symlink 'custom_sugar-session-0.98_badge.png'
=== target is u'custom_usr_badge.png'
=== modified file 'debian/changelog'
--- debian/changelog	2015-01-18 12:53:25 +0000
+++ debian/changelog	2015-02-28 14:28:23 +0000
@@ -1,3 +1,20 @@
+unity-greeter-badges (0.4-0ubuntu1) vivid; urgency=medium
+
+  * New upstream release.
+  * debian/install
+    - Simplify file to use wildcard.  We will handle the special cases
+      in debian/rules.
+    - Remove executable bit; not needed since we no longer use dh-exec.
+  * debian/control
+    - Remove dh-exec from Build-Depends; no longer needed.
+  * debian/rules
+    - Add override_dh_install target to remove badges found in other packages
+      and fix resulting broken symlinks.  This function was previously
+      performed by dh-exec using debian/install, but this was harder to
+      maintain.
+
+ -- Doug Torrance <[e-mail]>  Sat, 28 Feb 2015 07:30:52 -0600
+
 unity-greeter-badges (0.3-0ubuntu1) vivid; urgency=medium
 
   * New upstream release.
 
=== modified file 'debian/control'
--- debian/control	2015-01-18 12:53:25 +0000
+++ debian/control	2015-02-28 14:28:23 +0000
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Ubuntu Developers <[e-mail]>
 XSBC-Original-Maintainer: Doug Torrance <[e-mail]>
-Build-Depends: debhelper (>= 9), dh-exec
+Build-Depends: debhelper (>= 9)
 Standards-Version: 3.9.6
 Homepage: http://gnome-look.org/content/show.php/?content=158764
 Vcs-Git: https://github.com/d-torrance/unity-greeter-badges.git
 
=== modified file 'debian/install' (properties changed: +x to -x)
--- debian/install	2015-01-18 12:53:25 +0000
+++ debian/install	2015-02-28 14:28:23 +0000
@@ -1,61 +1,2 @@
-#!/usr/bin/dh-exec
-# Some badges are already provided by packages in Ubuntu -- these are not
-# installed.  There are a few badges not provided in other packages which
-# link to them.  We rename them instead.
-custom_afterstep_badge.png usr/share/unity-greeter
-custom_amiwm_badge.png usr/share/unity-greeter
-custom_awesome_badge.png usr/share/unity-greeter
-custom_blackbox_badge.png usr/share/unity-greeter
-# custom_cairo-dock_badge.png provided by cairo-dock-data
-custom_cairo-dock_badge.png => usr/share/unity-greeter/custom_cairo-dock-fallback_badge.png
-custom_cairo-dock_badge.png => usr/share/unity-greeter/custom_cairo-dock-unity_badge.png
-custom_chromium_badge.png usr/share/unity-greeter
-custom_cinnamon_badge.png usr/share/unity-greeter
-custom_cinnamon2d_badge.png usr/share/unity-greeter
-custom_dwm_badge.png usr/share/unity-greeter
-custom_enlightenment_badge.png usr/share/unity-greeter
-custom_etoile_badge.png usr/share/unity-greeter
-custom_evilwm_badge.png usr/share/unity-greeter
-custom_fluxbox_badge.png usr/share/unity-greeter
-custom_fvwm1_badge.png usr/share/unity-greeter
-custom_fvwm_badge.png usr/share/unity-greeter
-custom_fvwm-crystal_badge.png usr/share/unity-greeter
-custom_gnome-xmonad_badge.png usr/share/unity-greeter
-custom_gnustep_badge.png usr/share/unity-greeter
-custom_herbstluftwm_badge.png usr/share/unity-greeter
-custom_i3_badge.png usr/share/unity-greeter
-custom_IceWM_badge.png usr/share/unity-greeter
-custom_IceWM-Experimental_badge.png usr/share/unity-greeter
-custom_IceWM-Lite_badge.png usr/share/unity-greeter
-custom_icewm-session_badge.png usr/share/unity-greeter
-custom_larswm_badge.png usr/share/unity-greeter
-# custom_Lubuntu_badge.png and custom_LXDE_badge.png provided by lubuntu-artwork
-custom_LXDE_badge.png => usr/share/unity-greeter/custom_Lubuntu-Netbook_badge
-custom_mate_badge.png usr/share/unity-greeter
-custom_mythbuntu_badge.png usr/share/unity-greeter
-custom_openbox_badge.png usr/share/unity-greeter
-custom_openbox-gnome_badge.png usr/share/unity-greeter
-custom_openbox-kde_badge.png usr/share/unity-greeter
-custom_openbsd-cwm_badge.png usr/share/unity-greeter
-custom_pantheon_badge.png usr/share/unity-greeter
-custom_pekwm_badge.png usr/share/unity-greeter
-custom_ratpoison_badge.png usr/share/unity-greeter
-custom_razor_badge.png usr/share/unity-greeter
-custom_sawfish_badge.png usr/share/unity-greeter
-custom_stumpwm_badge.png usr/share/unity-greeter
-custom_subtle_badge.png usr/share/unity-greeter
-custom_sugar-session-0.84_badge.png usr/share/unity-greeter
-custom_sugar-session-0.86_badge.png usr/share/unity-greeter
-custom_sugar-session-0.88_badge.png usr/share/unity-greeter
-custom_sugar-session-0.90_badge.png usr/share/unity-greeter
-custom_trinity_badge.png usr/share/unity-greeter
-custom_twm_badge.png usr/share/unity-greeter
-custom_ubuntustudio_badge.png usr/share/unity-greeter
-custom_usr_badge.png usr/share/unity-greeter
-# custom_wmaker-common_badge.png provided by wmaker-common
-custom_wmii_badge.png usr/share/unity-greeter
-custom_XBMC_badge.png usr/share/unity-greeter
-custom_xmonad_badge.png usr/share/unity-greeter
-# custom_xubuntu_badge.png provided by xubuntu-artwork
-custom_xubuntu_badge.png => /usr/share/unity-greeter/custom_xfce_badge.png
-debian/custom_mwm_badge.png usr/share/unity-greeter
+custom_*_badge.png usr/share/unity-greeter
+debian/custom_*_badge.png usr/share/unity-greeter
 
=== modified file 'debian/rules'
--- debian/rules	2015-01-18 12:53:25 +0000
+++ debian/rules	2015-02-28 14:28:23 +0000
@@ -1,7 +1,34 @@
 #!/usr/bin/make -f
 
+DATADIR=$(CURDIR)/debian/unity-greeter-badges/usr/share/unity-greeter
+
+# Badges found in other packages
+BADGESTOREMOVE = cairo-dock #cairo-dock-data
+BADGESTOREMOVE += LXDE Lubuntu #lubuntu-artwork
+BADGESTOREMOVE += wmaker-common #wmaker-common
+BADGESTOREMOVE += xubuntu #xubuntu-artwork
+
+# But if we remove these, we break some symbolic links
+BROKENLINKS = cairo-dock-fallback cairo-dock-unity #cairo-dock
+BROKENLINKS += Lubuntu-Netbook lubuntu-nexus7 lxgames QLubuntu #LXDE
+BROKENLINKS += xfce #xubuntu
+
 %:
 	dh $@
 
+override_dh_install:
+	dh_install
+
+# Remove badges provided in other packages
+	for BADGE in $(BADGESTOREMOVE); do \
+		rm $(DATADIR)/custom_$$BADGE\_badge.png; \
+	done
+
+# Fix broken symlinks
+	for BADGE in $(BROKENLINKS); do \
+		rm $(DATADIR)/custom_$$BADGE\_badge.png; \
+		cp -L $(CURDIR)/custom_$$BADGE\_badge.png $(DATADIR); \
+	done
+
 get-orig-source:
 	uscan --verbose --force-download --rename