Merge lp:~sergiusens/demo-assets/1182549 into lp:demo-assets

[Sergio Schvezov]

Splitting all the packages into smaller ones and changing the contact address tool to be python3

[lp:~sergiusens/demo-assets/1182549]

40. By Sergio Schvezov on 2013-05-23

Marking for release

41. By Sergio Schvezov on 2013-05-23

Adding demo-assets-pictures

[Bill Filler (bfiller)]

approve

review: Approve

[lp:~sergiusens/demo-assets/1182549]

42. By Sergio Schvezov on 2013-05-23

Changing demo-assets-shell description

43. By Sergio Schvezov on 2013-05-24

Making the transition package depend on the binary:Version of what it builds

[Ricardo Salveti (rsalveti)]

Good, built and tested fine.

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'debian/changelog'
--- debian/changelog	2013-05-10 05:53:01 +0000
+++ debian/changelog	2013-05-24 18:06:38 +0000
@@ -1,3 +1,11 @@
+demo-assets (0.24-0ubuntu1) raring; urgency=low
+
+  * Splitting up into multiple packages (LP: #1182549).
+  * Updating packaging standards.
+  * Updating contacts creation script to python3
+
+ -- Sergio Schvezov <[e-mail]>  Thu, 23 May 2013 17:00:47 -0300
+
 demo-assets (0.24) raring; urgency=low
 
   * drop users xml data and move backgrounds to /usr/share

=== modified file 'debian/control'
--- debian/control	2013-02-20 20:29:58 +0000
+++ debian/control	2013-05-24 18:06:38 +0000
@@ -4,11 +4,44 @@
 Maintainer: Ubuntu Developers <[e-mail]>
 XSBC-Original-Maintainer: Ricardo Mendoza <[e-mail]>
 Build-Depends: debhelper (>= 9.0.0)
-Standards-Version: 3.9.3
+Standards-Version: 3.9.4
 
 Package: demo-assets
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, unity-lens-mock
-Description: Demo Assets
- DEMO ONLY: Videos and images for demo applications
-
+Depends: demo-assets-shell (= ${binary:Version}),
+         demo-assets-contacts (= ${binary:Version}),
+         demo-assets-music (= ${binary:Version}),
+         demo-assets-videos (= ${binary:Version}),
+         demo-assets-pictures (= ${binary:Version}),
+Description: Demo Assets transitionary package
+ DEMO ONLY: Transition package that depends on all others.
+
+Package: demo-assets-shell
+Architecture: all
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Demo Assets for Shell
+ DEMO ONLY: infographics and backgrounds for greeter
+
+Package: demo-assets-contacts
+Architecture: all
+Depends: ${shlibs:Depends}, ${misc:Depends}, python3
+Description: Demo Assets for Contacts
+ DEMO ONLY: Contacts and fake conversations for demoing.
+
+Package: demo-assets-music
+Architecture: all
+Depends: ${shlibs:Depends}, ${misc:Depends}, unity-lens-mock
+Description: Demo Assets for Music
+ DEMO ONLY: Music mocks for the shell.
+
+Package: demo-assets-videos
+Architecture: all
+Depends: ${shlibs:Depends}, ${misc:Depends}, unity-lens-mock
+Description: Demo Assets for Video
+ DEMO ONLY: Video mocks for the shell.
+
+Package: demo-assets-pictures
+Architecture: all
+Depends: ${shlibs:Depends}, ${misc:Depends}, python3
+Description: Demo Assets for Gallery
+ DEMO ONLY: Fake pictures for demoing.

=== added file 'debian/demo-assets-contacts.install'
--- debian/demo-assets-contacts.install	1970-01-01 00:00:00 +0000
+++ debian/demo-assets-contacts.install	2013-05-24 18:06:38 +0000
@@ -0,0 +1,3 @@
+contacts-data /usr/share/demo-assets/
+telephony-app /usr/share/demo-assets/
+/usr/bin

=== added file 'debian/demo-assets-music.install'
--- debian/demo-assets-music.install	1970-01-01 00:00:00 +0000
+++ debian/demo-assets-music.install	2013-05-24 18:06:38 +0000
@@ -0,0 +1,2 @@
+services/com.canonical.Unity.Lens.MockMusic.service /usr/share/dbus-1/services
+lenses/mockmusic /usr/share/unity/lenses

=== added file 'debian/demo-assets-pictures.install'
--- debian/demo-assets-pictures.install	1970-01-01 00:00:00 +0000
+++ debian/demo-assets-pictures.install	2013-05-24 18:06:38 +0000
@@ -0,0 +1,1 @@
+pictures.tgz /usr/share/demo-assets/

=== added file 'debian/demo-assets-shell.install'
--- debian/demo-assets-shell.install	1970-01-01 00:00:00 +0000
+++ debian/demo-assets-shell.install	2013-05-24 18:06:38 +0000
@@ -0,0 +1,2 @@
+shell/backgrounds/* /usr/share/backgrounds/
+shell/infographics /usr/share/demo-assets/shell/

=== added file 'debian/demo-assets-videos.install'
--- debian/demo-assets-videos.install	1970-01-01 00:00:00 +0000
+++ debian/demo-assets-videos.install	2013-05-24 18:06:38 +0000
@@ -0,0 +1,3 @@
+videos /usr/share/demo-assets/
+services/com.canonical.Unity.Lens.MockVideos.service /usr/share/dbus-1/services
+lenses/mockvideos /usr/share/unity/lenses

=== removed file 'debian/demo-assets.install'
--- debian/demo-assets.install	2013-05-10 05:53:01 +0000
+++ debian/demo-assets.install	1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
-pictures.tgz /usr/share/demo-assets/
-videos /usr/share/demo-assets/
-telephony-app /usr/share/demo-assets/
-contacts-data /usr/share/demo-assets/
-shell/backgrounds/* /usr/share/backgrounds/
-shell/infographics /usr/share/demo-assets/shell/
-/usr/bin
-services/* /usr/share/dbus-1/services
-lenses/* /usr/share/unity/lenses

=== renamed file 'usr/bin/inject-data-into-friends-model.py' => 'usr/bin/inject-data-into-friends-model'
--- usr/bin/inject-data-into-friends-model.py	2013-02-21 01:01:40 +0000
+++ usr/bin/inject-data-into-friends-model	2013-05-24 18:06:38 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/python3
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
 # Copyright 2013 Canonical
 #

=== renamed file 'usr/bin/manage-address-books.py' => 'usr/bin/manage-address-books'
--- usr/bin/manage-address-books.py	2013-02-21 01:01:40 +0000
+++ usr/bin/manage-address-books	2013-05-24 18:06:38 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python3
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
 # Copyright 2013 Canonical
 #
@@ -51,7 +51,7 @@
 	return create_eds_source(book_name)
 
 def create_eds_source(book_name):
-	print("Create EDS source %s", book_name)
+	print(("Create EDS source %s", book_name))
 	source = EDataServer.Source.new(None, None)
 	source.set_display_name(book_name)
 	source.set_parent('local-stub')
@@ -67,12 +67,12 @@
 		source_registry.set_default_address_book(source)
 		return source.get_uid()
 	else:
-		print("Error CREATING ADDRESS BOOK %s", book_name)
+		print(("Error CREATING ADDRESS BOOK %s", book_name))
 		sys.exit()
 
 def prep_data():
 	print("prep_data")
-	ifile  = open('/usr/share/demo-assets/contacts-data/data.csv', "rb")
+	ifile  = open('/usr/share/demo-assets/contacts-data/data.csv', "r")
 	reader = csv.reader(ifile)
 	rownum = 0
 	for row in reader:
@@ -92,12 +92,12 @@
 	for filename in os.listdir("/usr/share/demo-assets/contacts-data/avatars"):
 		parts = os.path.splitext(filename)[0].split("_")
 		if int(parts[-1]) == int(facebook_id):
-			f = open("/usr/share/demo-assets/contacts-data/avatars/" + filename, 'r')
+			f = open("/usr/share/demo-assets/contacts-data/avatars/" + filename, 'rb')
 			p = EBook.ContactPhoto.new()
 			p.set_mime_type("image/jpeg")
 			p.set_inlined(f.read())
 			contact.set_property("photo", p)
-			print("found {} for {} who has id {} {}	".format(filename, name, facebook_id, str(contact.inline_local_photos())))
+			print(("found {} for {} who has id {} {}	".format(filename, name, facebook_id, str(contact.inline_local_photos()))))
 			f.close()
 
 
@@ -106,7 +106,7 @@
 	source_match = source_registry.ref_source(source_uid)
 
 	if(source_match is None):
-		print("No source match from reg %s", source_uid)
+		print(("No source match from reg %s", source_uid))
 		sys.exit()
 
 
@@ -131,7 +131,7 @@
 		name = c["Name"]
 		param.add_value(name)
 		vcard_attr.add_param(param);
-		if ("FacebookID" in c.keys()):
+		if ("FacebookID" in list(c.keys())):
 			param = EBook.VCardAttributeParam.new('facebook-id')
 			param.add_value(c["FacebookID"])
 			vcard_attr.add_param(param)
@@ -144,27 +144,27 @@
 
 		contact = EBook.Contact.new_from_vcard(vcard.to_string(EBook.VCardFormat(1)))
 
-		for key,value in c.items():
+		for key,value in list(c.items()):
 			if key == "Name":
 				contact.set_property("full-name", value)
 			elif key == "Favorite" and value == "1":
 				print("Favorite = TRUE")
 				contact.set_property("categories", 'Favorites')
 			elif (key.find("E-mail 1") > -1):
-				print("email 1 = {}".format(value))
+				print(("email 1 = {}".format(value)))
 				contact.set_property("email-1", value)
 			elif (key.find("E-mail 2") > -1):
-				print("email 2 = {}".format(value))
+				print(("email 2 = {}".format(value)))
 				contact.set_property("email-2", value)
 			elif (key.find("Phone 1 - Value") > -1):
-				print("phone 1 = {}".format(value))
+				print(("phone 1 = {}".format(value)))
 				contact.set_property("home-phone", value)
 			elif (key.find("Phone 2 - Value") > -1):
-				print("phone 2 = {}".format(value))
+				print(("phone 2 = {}".format(value)))
 				contact.set_property("home-phone-2", value)
 			elif (key.find("FacebookID") > -1):
 				if (value.isdigit()):
-					print("facebookid = {}".format(value))
+					print(("facebookid = {}".format(value)))
 					find_and_set_image_path(contact, value, name)
 		client.add_contact_sync(contact, None)
 	ml.quit()
@@ -173,17 +173,17 @@
 	client = EBook.BookClient.new(source)
 	client.open_sync(False, None)
 	if client is None:
-		print "cannot create bookclient!"
+		print("cannot create bookclient!")
 		sys.exit()
 	query = EBook.book_query_any_field_contains('')
 	success, results = client.get_contacts_sync(query.to_string(), None)
 	if not success:
 		log.error('EDS search for delete all contacts failed')
 		sys.exit()
-	print('Found {} contacts to delete'.format(len(results)))
+	print(('Found {} contacts to delete'.format(len(results))))
 	for contact in results:
-		print('Deleting contact {}'.format(
-		       contact.get_property('full-name')))
+		print(('Deleting contact {}'.format(
+		       contact.get_property('full-name'))))
 		client.remove_contact_sync(contact, None)
 
 def create(ml):
@@ -194,7 +194,7 @@
 def delete(a_book_name, ml):
 	book = address_book_name if a_book_name is None else a_book_name
 	source_uid = get_source(book)
-	print "delete book {}".format(book)
+	print("delete book {}".format(book))
 	source_match = source_registry.ref_source(source_uid)
 	delete_contacts(source_match)
 	ml.quit()
@@ -207,7 +207,7 @@
 else:
 	book_name = book_name[0]
 
-print("Carry out '{}'' action on '{}' book".format(action, book_name))
+print(("Carry out '{}'' action on '{}' book".format(action, book_name)))
 
 ml = GLib.MainLoop()