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

[Sebastian Carneiro]

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

[Dimitri John Ledkov (xnox)]

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.

=== modified file 'debian/adept-common.install'
--- debian/adept-common.install	2008-08-15 15:24:22 +0000
+++ debian/adept-common.install	2012-06-21 04:17:19 +0000
@@ -1,3 +1,5 @@
-debian/tmp/usr/share/icons/crystalsvg/*/actions/adept_{c,d,i,k,p,r,s,u}*.{png,svgz}
-debian/tmp/usr/share/icons/crystalsvg/*/actions/extender_*.{png,svgz}
+debian/tmp/usr/share/icons/crystalsvg/*/actions/adept_[cdikprsu]*.png
+debian/tmp/usr/share/icons/crystalsvg/*/actions/adept_[cdikprsu]*.svgz
+debian/tmp/usr/share/icons/crystalsvg/*/actions/extender_*.png
+debian/tmp/usr/share/icons/crystalsvg/*/actions/extender_*.svgz
 debian/tmp/usr/share/apps/adept/*.svg
 
=== modified file 'debian/adept-updater.install'
--- debian/adept-updater.install	2006-05-25 20:58:11 +0000
+++ debian/adept-updater.install	2012-06-21 04:17:19 +0000
@@ -1,4 +1,5 @@
 debian/tmp/usr/bin/adept_updater
-debian/tmp/usr/share/icons/hicolor/*/apps/adept_updater.{png,svgz}
+debian/tmp/usr/share/icons/hicolor/*/apps/adept_updater.png
+debian/tmp/usr/share/icons/hicolor/*/apps/adept_updater.svgz
 debian/tmp/usr/share/apps/adept_updater/adept_updaterui.rc
 debian/tmp/usr/share/applications/kde/adept_updater.desktop
 
=== modified file 'debian/changelog'
--- debian/changelog	2012-05-03 21:54:12 +0000
+++ debian/changelog	2012-06-21 04:17:19 +0000
@@ -1,3 +1,11 @@
+adept (3.0~beta7.2+qa2ubuntu1) quantal; urgency=low
+
+  * debian/adept-common.install, 
+    debian/adept-updater.install: Removed invalid brace expansion from 
+    debhelper config files.
+
+ -- Sebastian Carneiro <[e-mail]>  Wed, 20 Jun 2012 23:59:52 -0300
+
 adept (3.0~beta7.2+qa2) unstable; urgency=low
 
   * QA upload.
 
=== modified file 'debian/control'
--- debian/control	2012-01-11 00:40:14 +0000
+++ debian/control	2012-06-21 04:17:19 +0000
@@ -1,7 +1,8 @@
 Source: adept
 Section: kde
 Priority: optional
-Maintainer: Debian QA Group <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian QA Group <[e-mail]>
 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)
 Standards-Version: 3.9.2