* Use wrap-and-sort.

* debian/control: - Add build-depends on debhelper >= 7.0.50~ for overrides.
13 years ago · b90c5a02b3
parent ba4eb0c7d1
commit b90c5a02b3
8 changed files with 267 additions and 251 deletions
--- a/debian/changelog
+++ b/debian/changelog
@ -1,5 +1,6 @@
 lubuntu-artwork (0.28) quantal; urgency=low

+  * Use wrap-and-sort.
  * usr/share/icons/lubuntu:
   - Add panel/22/nm-device-wired.svg to fix the status icon of nm-applet
     on wired and connected (LP: #976805)
@ -14,6 +15,8 @@ lubuntu-artwork (0.28) quantal; urgency=low
   - Update the text to 12.10.
  * debian/rules:
   - Rewrite using dh sequence.
+  * debian/control:
+   - Add build-depends on debhelper >= 7.0.50~ for overrides.

 -- Julien Lavergne <gilir@ubuntu.com>  Wed, 30 May 2012 22:50:54 +0200

--- a/debian/control
+++ b/debian/control
@ -2,7 +2,9 @@ Source: lubuntu-artwork
 Section: x11
 Priority: optional
 Maintainer: Julien Lavergne <gilir@ubuntu.com>
-Build-Depends: debhelper (>= 7), intltool, icon-naming-utils
+Build-Depends: debhelper (>= 7.0.50~),
+               icon-naming-utils,
+               intltool
 Standards-Version: 3.8.3
 Homepage: https://launchpad.net/~lubuntu-desktop
 Vcs-Bzr: lp:~lubuntu-desktop/+junk/lubuntu-artwork
@ -10,17 +12,21 @@ Vcs-Browser: http://bazaar.launchpad.net/~lubuntu-desktop/+junk/artwork/files

 Package: lubuntu-artwork
 Architecture: all
-Depends: ${misc:Depends}, gtk2-engines-murrine, gtk3-engines-unico, libnewt0.52 (>= 0.52.11-2ubuntu7), lubuntu-artwork-12-04
+Depends: gtk2-engines-murrine,
+         gtk3-engines-unico,
+         libnewt0.52 (>= 0.52.11-2ubuntu7),
+         lubuntu-artwork-12-04,
+         ${misc:Depends}
 Description: artwork for Lubuntu
 Artwork for Lubuntu, contained the wallpaper and others specific images and
 logos.

 Package: lubuntu-artwork-12-04
 Architecture: all
-Depends: ${misc:Depends},
-         gtk2-engines-murrine,
+Depends: gtk2-engines-murrine,
         gtk3-engines-unico,
-         libnewt0.52 (>= 0.52.11-2ubuntu7)
+         libnewt0.52 (>= 0.52.11-2ubuntu7),
+         ${misc:Depends}
 Description: artwork for Lubuntu - 12.04 version
 Artwork for Lubuntu, contained the wallpaper and others specific images and
 logos.
@ -29,10 +35,10 @@ Description: artwork for Lubuntu - 12.04 version

 Package: lubuntu-artwork-11-10
 Architecture: all
-Depends: ${misc:Depends},
-         gtk2-engines-murrine,
+Depends: gtk2-engines-murrine,
         gtk3-engines-unico,
-         libnewt0.52 (>= 0.52.11-2ubuntu7)
+         libnewt0.52 (>= 0.52.11-2ubuntu7),
+         ${misc:Depends}
 Description: artwork for Lubuntu - 11.10 version
 Artwork for Lubuntu, contained the wallpaper and others specific images and
 logos.
@ -41,9 +47,9 @@ Description: artwork for Lubuntu - 11.10 version

 Package: lubuntu-artwork-11-04
 Architecture: all
-Depends: ${misc:Depends},
-         gtk2-engines-murrine,
-         libnewt0.52 (>= 0.52.11-2ubuntu7)
+Depends: gtk2-engines-murrine,
+         libnewt0.52 (>= 0.52.11-2ubuntu7),
+         ${misc:Depends}
 Description: artwork for Lubuntu - 11.04 version
 Artwork for Lubuntu, contained the wallpaper and others specific images and
 logos.
@ -52,8 +58,8 @@ Description: artwork for Lubuntu - 11.04 version

 Package: lubuntu-artwork-10-10
 Architecture: all
-Depends: ${misc:Depends},
-         libnewt0.52 (>= 0.52.11-2ubuntu7)
+Depends: libnewt0.52 (>= 0.52.11-2ubuntu7),
+         ${misc:Depends}
 Description: artwork for Lubuntu - 10.10 version
 Artwork for Lubuntu, contained the wallpaper and others specific images and
 logos.
@ -62,8 +68,8 @@ Description: artwork for Lubuntu - 10.10 version

 Package: lubuntu-artwork-10-04
 Architecture: all
-Depends: ${misc:Depends},
-         libnewt0.52 (>= 0.52.11-2ubuntu7)
+Depends: libnewt0.52 (>= 0.52.11-2ubuntu7),
+         ${misc:Depends}
 Description: artwork for Lubuntu - 10.04 version
 Artwork for Lubuntu, contained the wallpaper and others specific images and
 logos.
@ -72,16 +78,22 @@ Description: artwork for Lubuntu - 10.04 version

 Package: plymouth-theme-lubuntu-logo
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, plymouth, plymouth-label
+Depends: plymouth, plymouth-label,
+         ${misc:Depends},
+         ${shlibs:Depends}
 Provides: plymouth-theme
-Replaces: plymouth (<< 0.8.1-1~), lubuntu-plymouth-theme
+Replaces: lubuntu-plymouth-theme,
+          plymouth (<< 0.8.1-1~)
 Conflicts: lubuntu-plymouth-theme
 Description: plymouth theme for Lubuntu
 This package contain a specific Lubuntu theme for plymouth.

 Package: plymouth-theme-lubuntu-text
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, plymouth, plymouth-label
+Depends: plymouth,
+         plymouth-label,
+         ${misc:Depends},
+         ${shlibs:Depends}
 Provides: plymouth-theme
 Replaces: plymouth (<< 0.8.1-1~)
 Description: plymouth text theme for Lubuntu
@ -90,7 +102,9 @@ Description: plymouth text theme for Lubuntu

 Package: lubuntu-icon-theme
 Architecture: all
-Depends: ${misc:Depends}, elementary-icon-theme (>= 2.6), gnome-icon-theme-symbolic
+Depends: elementary-icon-theme (>= 2.6),
+         gnome-icon-theme-symbolic,
+         ${misc:Depends}
 Description: icon theme for Lubuntu
 This package contain a specific Lubuntu icon theme. It provides specific icons
 for main menu and distributor icons.
--- a/debian/copyright
+++ b/debian/copyright
@ -380,4 +380,3 @@ Creative Commons Attribution-Share Alike 3.0 License (Complete Licence):
   compliance with Creative Commons' then-current trademark usage guidelines, as may be
   published on its website or otherwise made available upon request from time to time.
   For the avoidance of doubt, this trademark restriction does not form part of the License.
-
--- a/debian/lubuntu-artwork-10-04.install
+++ b/debian/lubuntu-artwork-10-04.install
@ -1,4 +1,4 @@
 usr/share/lubuntu/images/1004-*
 usr/share/lubuntu/wallpapers/1004-*
-usr/share/lxpanel/images/1004-*
 usr/share/lxdm/themes/1004-*
+usr/share/lxpanel/images/1004-*
--- a/debian/lubuntu-artwork-10-10.install
+++ b/debian/lubuntu-artwork-10-10.install
@ -1,5 +1,5 @@
 usr/share/lubuntu/images/1010-*
 usr/share/lubuntu/wallpapers/1010-*
-usr/share/lxpanel/images/1010-*
 usr/share/lxdm/themes/1010-*
+usr/share/lxpanel/images/1010-*
 usr/share/themes/LxDesign/
--- a/debian/lubuntu-artwork-11-04.install
+++ b/debian/lubuntu-artwork-11-04.install
@ -1,5 +1,5 @@
 usr/share/lubuntu/images/1104-*
 usr/share/lubuntu/wallpapers/1104-*
-usr/share/lxpanel/images/1104-*
 usr/share/lxdm/themes/1104-*
+usr/share/lxpanel/images/1104-*
 usr/share/themes/Ozone1/
--- a/debian/lubuntu-artwork-11-10.install
+++ b/debian/lubuntu-artwork-11-10.install
@ -1,5 +1,5 @@
 usr/share/lubuntu/images/1110-*
 usr/share/lubuntu/wallpapers/1110-*
-usr/share/lxpanel/images/1110-*
 usr/share/lxdm/themes/1110-*
+usr/share/lxpanel/images/1110-*
 usr/share/themes/Ozone2/
--- a/debian/lubuntu-artwork-12-04.install
+++ b/debian/lubuntu-artwork-12-04.install
@ -1,4 +1,4 @@
 usr/share/lubuntu/images/1204-*
 usr/share/lubuntu/wallpapers/1204-*
-usr/share/lxpanel/images/1204-*
 usr/share/lxdm/themes/1204-*
+usr/share/lxpanel/images/1204-*