Ubuntu

Merge lp:~scarneiro/ubuntu/quantal/adept/fix-invalid-brace.expansions into lp:ubuntu/quantal/adept

Proposed by Sebastian Carneiro on 2012-06-21
Status: Rejected
Rejected by: Stéphane Graber on 2012-07-05
Proposed branch: lp:~scarneiro/ubuntu/quantal/adept/fix-invalid-brace.expansions
Merge into: lp:ubuntu/quantal/adept
Diff against target: 51 lines (+16/-4) 4 files modified
To merge this branch: bzr merge lp:~scarneiro/ubuntu/quantal/adept/fix-invalid-brace.expansions
Reviewer Review Type Date Requested Status
Dimitri John Ledkov Disapprove on 2012-07-05
Ubuntu branches 2012-06-21 Pending
Review via email: mp+111331@code.launchpad.net

Description of the Change

Replaced invalid brace expansions from debhelper config files:
debian/adept-common.install, and debian/adept-updater.install

To post a comment you must log in.
Dimitri John Ledkov (xnox) wrote :

The fix is very good, and the changelog enty and the version numbers are correct.

Unfortunately adept is no longer developed and has been removed from Debian.
It is no longer shipped in Ubuntu either, and we are removing the package from the archive, so this fix no longer applicable to quantal.

review: Disapprove

Unmerged revisions

81. By Sebastian Carneiro on 2012-06-21

debian/adept-common.install,
debian/adept-updater.install: Removed invalid brace expansion from
debhelper config files.

Preview Diff

1=== modified file 'debian/adept-common.install'
2--- debian/adept-common.install 2008-08-15 15:24:22 +0000
3+++ debian/adept-common.install 2012-06-21 04:17:19 +0000
4@@ -1,3 +1,5 @@
5-debian/tmp/usr/share/icons/crystalsvg/*/actions/adept_{c,d,i,k,p,r,s,u}*.{png,svgz}
6-debian/tmp/usr/share/icons/crystalsvg/*/actions/extender_*.{png,svgz}
7+debian/tmp/usr/share/icons/crystalsvg/*/actions/adept_[cdikprsu]*.png
8+debian/tmp/usr/share/icons/crystalsvg/*/actions/adept_[cdikprsu]*.svgz
9+debian/tmp/usr/share/icons/crystalsvg/*/actions/extender_*.png
10+debian/tmp/usr/share/icons/crystalsvg/*/actions/extender_*.svgz
11 debian/tmp/usr/share/apps/adept/*.svg
12
13=== modified file 'debian/adept-updater.install'
14--- debian/adept-updater.install 2006-05-25 20:58:11 +0000
15+++ debian/adept-updater.install 2012-06-21 04:17:19 +0000
16@@ -1,4 +1,5 @@
17 debian/tmp/usr/bin/adept_updater
18-debian/tmp/usr/share/icons/hicolor/*/apps/adept_updater.{png,svgz}
19+debian/tmp/usr/share/icons/hicolor/*/apps/adept_updater.png
20+debian/tmp/usr/share/icons/hicolor/*/apps/adept_updater.svgz
21 debian/tmp/usr/share/apps/adept_updater/adept_updaterui.rc
22 debian/tmp/usr/share/applications/kde/adept_updater.desktop
23
24=== modified file 'debian/changelog'
25--- debian/changelog 2012-05-03 21:54:12 +0000
26+++ debian/changelog 2012-06-21 04:17:19 +0000
27@@ -1,3 +1,11 @@
28+adept (3.0~beta7.2+qa2ubuntu1) quantal; urgency=low
29+
30+ * debian/adept-common.install,
31+ debian/adept-updater.install: Removed invalid brace expansion from
32+ debhelper config files.
33+
34+ -- Sebastian Carneiro <scarneiro@fibertel.com.ar> Wed, 20 Jun 2012 23:59:52 -0300
35+
36 adept (3.0~beta7.2+qa2) unstable; urgency=low
37
38 * QA upload.
39
40=== modified file 'debian/control'
41--- debian/control 2012-01-11 00:40:14 +0000
42+++ debian/control 2012-06-21 04:17:19 +0000
43@@ -1,7 +1,8 @@
44 Source: adept
45 Section: kde
46 Priority: optional
47-Maintainer: Debian QA Group <packages@qa.debian.org>
48+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
49+XSBC-Original-Maintainer: Debian QA Group <packages@qa.debian.org>
50 Build-Depends: debhelper (>= 8), kdelibs5-dev, cmake, pkg-config, libwibble-dev (>= 0.1.22), libwibble-dev (<< 0.2), libtagcoll2-dev (>= 2.0.6), libtagcoll2-dev (<< 2.1), libapt-pkg-dev (>= 0.7.26~exp10), libxapian-dev (>= 1.0.5)
51 Standards-Version: 3.9.2
52

Subscribers

People subscribed via source and target branches