ubuntukylin-members team mailing list archive
-
ubuntukylin-members team
-
Mailing list archive
-
Message #03144
[Merge] lp:~xnox/ubuntu-kylin-software-center/14.04-release into lp:ubuntu-kylin-software-center
Dimitri John Ledkov has proposed merging lp:~xnox/ubuntu-kylin-software-center/14.04-release into lp:ubuntu-kylin-software-center.
Requested reviews:
Ubuntu Kylin Members (ubuntukylin-members)
For more details, see:
https://code.launchpad.net/~xnox/ubuntu-kylin-software-center/14.04-release/+merge/215258
--
https://code.launchpad.net/~xnox/ubuntu-kylin-software-center/14.04-release/+merge/215258
Your team Ubuntu Kylin Members is requested to review the proposed merge of lp:~xnox/ubuntu-kylin-software-center/14.04-release into lp:ubuntu-kylin-software-center.
=== modified file 'debian/changelog'
--- debian/changelog 2014-04-10 13:07:00 +0000
+++ debian/changelog 2014-04-10 17:06:12 +0000
@@ -1,3 +1,13 @@
+ubuntu-kylin-software-center (0.2.9.1) trusty; urgency=medium
+
+ * Switch package to native, remove broken watch file
+ * Unsplit the package into a single package, it's all arch:all
+ * Add missing dependencies on: language-pack-zh-hans and
+ ubuntukylin-keyring
+ * Drop ${shlibs:Depends}
+
+ -- Dimitri John Ledkov <xnox@xxxxxxxxxx> Thu, 10 Apr 2014 18:04:59 +0100
+
ubuntu-kylin-software-center (0.2.9-0ubuntu1) trusty; urgency=low
* Solve navigation problem (bug#1291787,bug#1294425).
@@ -20,7 +30,6 @@
-- Jun Ma <maclin@xxxxxxxxxxxxxxx> Wed, 26 Mar 2014 00:36:29 +0800
-
ubuntu-kylin-software-center (0.2.7-0ubuntu1) trusty; urgency=low
* Initial release (LP: #1293299).
=== modified file 'debian/control'
--- debian/control 2014-04-04 08:51:45 +0000
+++ debian/control 2014-04-10 17:06:12 +0000
@@ -10,9 +10,10 @@
Vcs-Bzr: lp:ubuntu-kylin-software-center
Package: ubuntu-kylin-software-center
-Architecture: any
-Depends: ${misc:Depends}, ${python:Depends}, ${shlibs:Depends}, python-qt4,
- ubuntu-kylin-software-center-common (= ${source:Version})
+Architecture: all
+Depends: ${misc:Depends}, ${python:Depends}, python-qt4, ubuntukylin-keyring, language-pack-zh-hans
+Breaks: ubuntu-kylin-software-center-common
+Replaces: ubuntu-kylin-software-center-common
Description: Integrated tool to aid in routine system maintenance tasks
Ubuntu Kylin Software Center is a newly built software center client
for Ubuntu Kylin. The aim is to improve localization experience. The
@@ -24,20 +25,3 @@
* Newly designed user interface
* Work with Ubuntu software center and hold special packages from
Ubuntu Kylin archive
-
-Package: ubuntu-kylin-software-center-common
-Architecture: all
-Depends: ${misc:Depends}
-Description: Integrated tool to aid in routine system maintenance tasks - common files
- Ubuntu Kylin Software Center is a newly built software center client
- for Ubuntu Kylin. The aim is to improve localization experience. The
- applications and related data come from both Ubuntu and Ubuntu Kylin
- repositories.
- .
- Features:
- * Categorized and selected applications for users
- * Newly designed user interface
- * Work with Ubuntu software center and hold special packages from
- Ubuntu Kylin archive
- .
- This package provides architecture independent files.
=== modified file 'debian/links'
--- debian/links 2014-03-12 18:54:00 +0000
+++ debian/links 2014-04-10 17:06:12 +0000
@@ -1,2 +1,1 @@
/usr/share/ubuntu-kylin-software-center-daemon/start_systemdbus.py /usr/bin/ubuntu-kylin-software-center-daemon
-
=== modified file 'debian/source/format'
--- debian/source/format 2014-03-12 18:54:00 +0000
+++ debian/source/format 2014-04-10 17:06:12 +0000
@@ -1,1 +1,1 @@
-3.0 (quilt)
+3.0 (native)
=== removed file 'debian/ubuntu-kylin-software-center-common.install'
--- debian/ubuntu-kylin-software-center-common.install 2014-03-25 16:40:16 +0000
+++ debian/ubuntu-kylin-software-center-common.install 1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-usr/share/ubuntu-kylin-software-center/data/*
=== removed file 'debian/ubuntu-kylin-software-center.install'
--- debian/ubuntu-kylin-software-center.install 2014-03-25 16:40:16 +0000
+++ debian/ubuntu-kylin-software-center.install 1970-01-01 00:00:00 +0000
@@ -1,16 +0,0 @@
-etc/*
-usr/lib/*
-usr/bin/*
-usr/share/applications/*
-usr/share/polkit-1/*
-usr/share/dbus-1/*
-usr/share/pixmaps/*
-usr/share/ubuntu-kylin-software-center-daemon/*
-usr/share/ubuntu-kylin-software-center/backend/*
-usr/share/ubuntu-kylin-software-center/models/*
-usr/share/ubuntu-kylin-software-center/res/*
-usr/share/ubuntu-kylin-software-center/test/*
-usr/share/ubuntu-kylin-software-center/ui/*
-usr/share/ubuntu-kylin-software-center/utils/*
-usr/share/ubuntu-kylin-software-center/ReadMe
-usr/share/ubuntu-kylin-software-center/*.py
=== removed file 'debian/watch'
--- debian/watch 2014-03-24 09:08:55 +0000
+++ debian/watch 1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-version=3
-https://launchpad.net/ubuntu-kylin-software-center/+download https://launchpad.net/ubuntu-kylin-software-center/.*/ubuntu-kylin-software-center-(.*)\.tar\.g
-
Follow ups