Merge lp:~baltix/ubuntu/precise/app-install-data-partner/fix-for-missing-applications-flashplugin-skype into lp:ubuntu/precise/app-install-data-partner

[Mantas Kriaučiūnas]

Please merge my fixes and improvements to app-install-data-partner package for Ubuntu 12.04 LTS, which is completely broken (empty) in 12.04 LTS release. I've fixed several important bugs, including:
Bug #1005209 - Package empty (no desktop files) High Triaged
Bug #875683 - software center tries to install adobe-flashplugin:i386 even if amd64 environment

Also I've fixed desktop/skype.desktop - changed Exec line to "Exec=skype" instead "Exec=skype-wrapper", this problem exists even in Ubuntu 12.10 branch ( lp:ubuntu/quantal-proposed/app-install-data-partner )

[Dimitri John Ledkov (xnox)]

I have looked into this. There is one SRU pending in quantal-proposed. After that one is verified we can publish this one across all supported & affected releases as SRUs.

[Mathieu Trudel-Lapierre (cyphermox)]

So as to not lose time while the other SRU is being verified (and really, I think we should carry on the SRU to precise anyway), can you please follow http://wiki.ubuntu.com/StableReleaseUpdates#Procedure and update the bugs descriptions accordingly?

All the changes should map directly to bugs being fixed for a SRU, so you should also add the bug links for the addition of skype and acroread to the changelog.

review: Needs Fixing

[Stéphane Graber (stgraber)]

Removing from sponsoring report for now. Please switch status back to Needs Review once the bug has been updated and the package is ready for upload.

Unmerged revisions

17. By Mantas Kriaučiūnas on 2012-11-14

fixed skype.desktop - changed Exec line to 'Exec=skype'; added desktop/acroread.desktop and icons/acroread.png from lp:app-install-data-commercial rev.45 (12.11.04.2)

16. By Mantas Kriaučiūnas on 2012-11-14

Fixed desktop/flash10.desktop: changed 'Name=Adobe Flash Plugin 11', added 'Comment' line and ',amd64' to line 'X-AppInstall-Architectures=i386'; debian/install: Enabled installation of .desktop and icon files; Added skype.desktop

15. By Martin Pitt on 2012-10-08

releasing version 12.12.10

14. By Martin Pitt on 2012-10-08

debian/control: Drop Vcs-Bzr:, the branch doesn't exist, and we want to
move to the UDD branch.

13. By Martin Pitt on 2012-10-08

debian/control: added 'Depends: ${misc:Depends'}

=== modified file 'debian/changelog'
--- debian/changelog	2012-03-14 20:33:26 +0000
+++ debian/changelog	2012-11-15 06:07:23 +0000
@@ -1,3 +1,28 @@
+app-install-data-partner (12.12.04.2) precise; urgency=low
+
+  [ Mantas Kriaučiūnas ]
+  * Fixed desktop/flash10.desktop: changed "Name=Adobe Flash Plugin 11", added
+    "Comment" line and ",amd64" to line "X-AppInstall-Architectures=i386" 
+    (LP: #875683)
+  * debian/install: Enabled installation of .desktop and icon files (LP: #1005209)
+  * Added desktop/skype.desktop from lp:ubuntu/quantal-proposed/app-install-data-partner
+    and fixed "Exec=skype-wrapper" line
+  * Added desktop/acroread.desktop and icons/acroread.png from
+    app-install-data-partner 12.11.04.2 (lp:app-install-data-commercial rev. 45)
+
+ -- Mantas Kriaučiūnas <[e-mail]>  Wed, 14 Nov 2012 15:16:00 +0200
+
+app-install-data-partner (12.12.10) quantal; urgency=low
+
+  [ Verica Lazova ]
+  * debian/control: added 'Depends: ${misc:Depends'}
+
+  [ Martin Pitt ]
+  * debian/control: Drop Vcs-Bzr:, the branch doesn't exist, and we want to
+    move to the UDD branch.
+
+ -- Verica Lazova <[e-mail]>  Mon, 08 Oct 2012 15:42:42 +0200
+
 app-install-data-partner (12.12.04.1) precise; urgency=low
 
   * Add desktop file and icon for VMware View Client (LP: #950993)

=== modified file 'debian/control'
--- debian/control	2011-12-12 11:57:33 +0000
+++ debian/control	2012-11-15 06:07:23 +0000
@@ -4,10 +4,10 @@
 Maintainer: Michael Vogt <[e-mail]>
 Build-Depends: debhelper (>= 8)
 Standards-Version: 3.8.0
-Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-core-dev/app-install-data-commercial/trunk
 
 Package: app-install-data-partner
 Architecture: all
+Depends: ${misc:Depends} 
 Replaces: app-install-data-commercial (<< 11.9.04)
 Description: Application Installer (data files for partner applications/repositories)
  A pretty application installer.
@@ -17,6 +17,7 @@
 
 Package: app-install-data-commercial
 Architecture: all
+Depends: ${misc:Depends}
 Description: Transitional package
  This dummy package is provided for a smooth transition.
  .

=== modified file 'debian/install'
--- debian/install	2011-12-12 11:57:33 +0000
+++ debian/install	2012-11-15 06:07:23 +0000
@@ -1,3 +1,3 @@
 channels/*.{key,list,eula}	/usr/share/app-install/channels
-#desktop/*.desktop	/usr/share/app-install/desktop
-#icons/*	/usr/share/app-install/icons
+desktop/*.desktop	/usr/share/app-install/desktop
+icons/*	/usr/share/app-install/icons

=== added file 'desktop/acroread.desktop'
--- desktop/acroread.desktop	1970-01-01 00:00:00 +0000
+++ desktop/acroread.desktop	2012-11-15 06:07:23 +0000
@@ -0,0 +1,14 @@
+[Desktop Entry]
+X-AppInstall-Package=acroread
+X-AppInstall-Proprietary=true
+X-AppInstall-Channel=precise-partner
+X-AppInstall-LicenseUri=/usr/share/app-install/channels/precise-partner.eula
+X-AppInstall-Architectures=i386,amd64
+Encoding=UTF-8
+Name=Adobe Reader 9
+Comment=Adobe Reader allows view, navigate and print PDF documents, also fill PDF forms
+Icon=acroread.png
+Terminal=false
+Type=Application
+Categories=Application;Office;Viewer;
+StartupNotify=true

=== modified file 'desktop/flash10.desktop'
--- desktop/flash10.desktop	2011-12-12 11:57:33 +0000
+++ desktop/flash10.desktop	2012-11-15 06:07:23 +0000
@@ -3,9 +3,10 @@
 X-AppInstall-Proprietary=true
 X-AppInstall-Channel=precise-partner
 X-AppInstall-LicenseUri=/usr/share/app-install/channels/precise-partner.eula
-X-AppInstall-Architectures=i386
+X-AppInstall-Architectures=i386,amd64
 Encoding=UTF-8
-Name=Adobe Flash Plugin 10
+Name=Adobe Flash Plugin 11 for browsers
+Comment=Adobe Flash Player Plugin for Internet browsers (Firefox, Chromium) for playing of media and other dynamic content online
 Icon=flash.png
 Terminal=false
 Type=Application

=== added file 'desktop/skype.desktop'
--- desktop/skype.desktop	1970-01-01 00:00:00 +0000
+++ desktop/skype.desktop	2012-11-15 06:07:23 +0000
@@ -0,0 +1,13 @@
+[Desktop Entry]
+X-AppInstall-Package=skype
+X-AppInstall-Proprietary=true
+X-AppInstall-Channel=precise-partner
+X-AppInstall-LicenseUri=/usr/share/app-install/channels/precise-partner.eula
+Name=Skype
+Comment=Skype Internet Telephony
+Exec=skype
+Icon=skype.png
+Terminal=false
+Type=Application
+Encoding=UTF-8
+Categories=Network;Application;

=== added file 'icons/acroread.png'
Binary files icons/acroread.png	1970-01-01 00:00:00 +0000 and icons/acroread.png	2012-11-15 06:07:23 +0000 differ