← Back to team overview

xubuntu-dev team mailing list archive

[Merge] lp:~xubuntu-dev/ubuntu/utopic/xubuntu-meta/add-inxi into lp:ubuntu/xubuntu-meta

 

Sean Davis has proposed merging lp:~xubuntu-dev/ubuntu/utopic/xubuntu-meta/add-inxi into lp:ubuntu/xubuntu-meta.

Commit message:
* Refreshed dependencies
* Added firefox to desktop-recommends [arm64]
* Added inxi to desktop-recommends

Requested reviews:
  Ubuntu branches (ubuntu-branches)

For more details, see:
https://code.launchpad.net/~xubuntu-dev/ubuntu/utopic/xubuntu-meta/add-inxi/+merge/225243

xubuntu-meta (2.181) utopic; urgency=medium

  * Refreshed dependencies
  * Added firefox to desktop-recommends [arm64]
  * Added inxi to desktop-recommends

 -- Sean Davis <smd.seandavis@xxxxxxxxx>  Tue, 01 Jul 2014 20:18:25 -0400
-- 
https://code.launchpad.net/~xubuntu-dev/ubuntu/utopic/xubuntu-meta/add-inxi/+merge/225243
Your team Xubuntu Developers is subscribed to branch lp:~xubuntu-dev/ubuntu/utopic/xubuntu-meta/add-inxi.
=== modified file 'debian/changelog'
--- debian/changelog	2014-04-09 21:59:07 +0000
+++ debian/changelog	2014-07-02 00:26:49 +0000
@@ -1,3 +1,11 @@
+xubuntu-meta (2.181) UNRELEASED; urgency=medium
+
+  * Refreshed dependencies
+  * Added firefox to desktop-recommends [arm64]
+  * Added inxi to desktop-recommends
+
+ -- Sean Davis <smd.seandavis@xxxxxxxxx>  Tue, 01 Jul 2014 20:18:25 -0400
+
 xubuntu-meta (2.180) trusty; urgency=low
 
   * Refreshed dependencies

=== modified file 'debootstrap-version'
--- debootstrap-version	2014-03-08 01:12:25 +0000
+++ debootstrap-version	2014-07-02 00:26:49 +0000
@@ -1,1 +1,1 @@
-1.0.59
+1.0.59ubuntu0.1

=== modified file 'desktop-recommends-amd64'
--- desktop-recommends-amd64	2014-04-09 21:59:07 +0000
+++ desktop-recommends-amd64	2014-07-02 00:26:49 +0000
@@ -58,6 +58,7 @@
 indicator-messages
 indicator-power
 indicator-sound
+inxi
 kerneloops-daemon
 laptop-detect
 libnotify-bin

=== modified file 'desktop-recommends-arm64'
--- desktop-recommends-arm64	2014-04-09 21:59:07 +0000
+++ desktop-recommends-arm64	2014-07-02 00:26:49 +0000
@@ -21,6 +21,7 @@
 espeak
 evince
 file-roller
+firefox
 fonts-droid
 fonts-kacst-one
 fonts-khmeros-core
@@ -56,6 +57,7 @@
 indicator-messages
 indicator-power
 indicator-sound
+inxi
 kerneloops-daemon
 laptop-detect
 libnotify-bin

=== modified file 'desktop-recommends-armhf'
--- desktop-recommends-armhf	2014-04-09 21:59:07 +0000
+++ desktop-recommends-armhf	2014-07-02 00:26:49 +0000
@@ -57,6 +57,7 @@
 indicator-messages
 indicator-power
 indicator-sound
+inxi
 kerneloops-daemon
 laptop-detect
 libnotify-bin

=== modified file 'desktop-recommends-i386'
--- desktop-recommends-i386	2014-04-09 21:59:07 +0000
+++ desktop-recommends-i386	2014-07-02 00:26:49 +0000
@@ -58,6 +58,7 @@
 indicator-messages
 indicator-power
 indicator-sound
+inxi
 kerneloops-daemon
 laptop-detect
 libnotify-bin

=== modified file 'desktop-recommends-powerpc'
--- desktop-recommends-powerpc	2014-04-09 21:59:07 +0000
+++ desktop-recommends-powerpc	2014-07-02 00:26:49 +0000
@@ -55,6 +55,7 @@
 indicator-messages
 indicator-power
 indicator-sound
+inxi
 kerneloops-daemon
 laptop-detect
 libnotify-bin

=== modified file 'desktop-recommends-ppc64el'
--- desktop-recommends-ppc64el	2014-04-09 21:59:07 +0000
+++ desktop-recommends-ppc64el	2014-07-02 00:26:49 +0000
@@ -56,6 +56,7 @@
 indicator-messages
 indicator-power
 indicator-sound
+inxi
 kerneloops-daemon
 laptop-detect
 libnotify-bin

=== modified file 'update.cfg'
--- update.cfg	2013-12-30 12:34:11 +0000
+++ update.cfg	2014-07-02 00:26:49 +0000
@@ -1,7 +1,7 @@
 [DEFAULT]
-dist: trusty
+dist: utopic
 
-[trusty]
+[utopic]
 seeds: desktop
 architectures: i386 amd64 powerpc ppc64el armhf arm64
 seed_base: http://people.ubuntu.com/~ubuntu-archive/seeds/
@@ -15,6 +15,6 @@
 archive_base/arm64: %(archive_base/ports)s
 components: main restricted universe
 
-[trusty/bzr]
+[utopic/bzr]
 seed_base: bzr+ssh://bazaar.launchpad.net/~xubuntu-dev/ubuntu-seeds/ bzr+ssh://bazaar.launchpad.net/~ubuntu-core-dev/ubuntu-seeds/
 seed_dist: xubuntu.%(dist)s


References