[SCM] KDE Artwork module packaging branch, master, updated. debian/4.4.5-1-20-gf171b6e

[José Manuel Santamaría Lema]

The following commit has been merged in the master branch:
commit f171b6e8aadd56677dfa4727eba085055212d522
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date:   Fri Dec 31 00:18:50 2010 +0100

    Merge kdeartwork-kwin-styles into kdeartwork-theme-window.
---
 debian/changelog                       |    1 -
 debian/control                         |   25 +++++--------------------
 debian/kdeartwork-kwin-styles.install  |   16 ----------------
 debian/kdeartwork-theme-window.install |   18 +++++++++++++++++-
 4 files changed, 22 insertions(+), 38 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6a4427d..d103e51 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,7 +18,6 @@ kdeartwork (4:4.5.90-0r1) UNRELEASED; urgency=low
   [ José Manuel Santamaría Lema ]
   * Update installed files.
   * Bump Standards-Version to 3.9.1: add Breaks next to Replaces where needed.
-  * Add kdeartwork-kwin-styles package.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 01 Sep 2010 23:03:08 +0300
 
diff --git a/debian/control b/debian/control
index 1a91f2e..9fdc408 100644
--- a/debian/control
+++ b/debian/control
@@ -20,8 +20,7 @@ Architecture: all
 Depends: ${misc:Depends}, kdeartwork-emoticons (>= ${source:Version}),
  kdeartwork-style (>= ${source:Version}), kdeartwork-theme-icon (>= ${source:Version}) | kdelibs5-data,
  kdewallpapers (>= ${source:Version}), kscreensaver (>= ${source:Version}),
- plasma-desktopthemes-artwork (>= ${source:Version}), kdeartwork-theme-window (>= ${source:Version}),
- kdeartwork-kwin-styles (>= ${source:Version})
+ plasma-desktopthemes-artwork (>= ${source:Version}), kdeartwork-theme-window (>= ${source:Version})
 Replaces: kdeartwork-misc
 Breaks: kdeartwork-misc
 Description: themes, styles and other artwork from the official KDE release
@@ -87,8 +86,10 @@ Description: Nuvola icon theme
  This package is part of the KDE artwork module.
 
 Package: kdeartwork-theme-window
-Architecture: all
-Depends: ${misc:Depends}
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Replaces: kde-window-manager (<< 4:4.5.80)
+Breaks: kde-window-manager (<< 4:4.5.80)
 Description: window decoration for the K Window manager (KWin)
  This package contains additional window decorations for K Window Manager
  .
@@ -104,22 +105,6 @@ Description: widget styles for applications using Qt or KDE Development Platform
  .
  This package is part of the KDE artwork module.
 
-Package: kdeartwork-kwin-styles
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: kde-window-manager (<< 4:4.5.80)
-Breaks: kde-window-manager (<< 4:4.5.80)
-Description: kwin styles 
- Currently it provides the following themes:
-  * kde2
-  * keramik
-  * modernsys
-  * quartz
-  * redmond
-  * web
- .
- This package is part of the KDE artwork module.
-
 
 Package: kscreensaver
 Architecture: any
diff --git a/debian/kdeartwork-kwin-styles.install b/debian/kdeartwork-kwin-styles.install
deleted file mode 100644
index b6ab1eb..0000000
--- a/debian/kdeartwork-kwin-styles.install
+++ /dev/null
@@ -1,16 +0,0 @@
-usr/lib/kde4/kwin3_kde2.so
-usr/lib/kde4/kwin3_keramik.so
-usr/lib/kde4/kwin3_modernsys.so
-usr/lib/kde4/kwin3_quartz.so
-usr/lib/kde4/kwin3_redmond.so
-usr/lib/kde4/kwin3_web.so
-usr/lib/kde4/kwin_kde2_config.so
-usr/lib/kde4/kwin_keramik_config.so
-usr/lib/kde4/kwin_modernsys_config.so
-usr/lib/kde4/kwin_quartz_config.so
-usr/share/kde4/apps/kwin/kde2.desktop
-usr/share/kde4/apps/kwin/keramik.desktop
-usr/share/kde4/apps/kwin/modernsystem.desktop
-usr/share/kde4/apps/kwin/quartz.desktop
-usr/share/kde4/apps/kwin/redmond.desktop
-usr/share/kde4/apps/kwin/web.desktop
diff --git a/debian/kdeartwork-theme-window.install b/debian/kdeartwork-theme-window.install
index eacc8af..76c048d 100644
--- a/debian/kdeartwork-theme-window.install
+++ b/debian/kdeartwork-theme-window.install
@@ -1,3 +1,13 @@
+usr/lib/kde4/kwin3_kde2.so
+usr/lib/kde4/kwin3_keramik.so
+usr/lib/kde4/kwin3_modernsys.so
+usr/lib/kde4/kwin3_quartz.so
+usr/lib/kde4/kwin3_redmond.so
+usr/lib/kde4/kwin3_web.so
+usr/lib/kde4/kwin_kde2_config.so
+usr/lib/kde4/kwin_keramik_config.so
+usr/lib/kde4/kwin_modernsys_config.so
+usr/lib/kde4/kwin_quartz_config.so
 usr/share/kde4/apps/aurorae/themes/Air-Oxygen/air-oxygenrc
 usr/share/kde4/apps/aurorae/themes/Air-Oxygen/close.svgz
 usr/share/kde4/apps/aurorae/themes/Air-Oxygen/decoration.svgz
@@ -5,11 +15,17 @@ usr/share/kde4/apps/aurorae/themes/Air-Oxygen/maximize.svgz
 usr/share/kde4/apps/aurorae/themes/Air-Oxygen/metadata.desktop
 usr/share/kde4/apps/aurorae/themes/Air-Oxygen/minimize.svgz
 usr/share/kde4/apps/aurorae/themes/Air-Oxygen/restore.svgz
+usr/share/kde4/apps/aurorae/themes/Oxygen/Oxygenrc
 usr/share/kde4/apps/aurorae/themes/Oxygen/close.svgz
 usr/share/kde4/apps/aurorae/themes/Oxygen/decoration.svgz
 usr/share/kde4/apps/aurorae/themes/Oxygen/help.svgz
 usr/share/kde4/apps/aurorae/themes/Oxygen/maximize.svgz
 usr/share/kde4/apps/aurorae/themes/Oxygen/metadata.desktop
 usr/share/kde4/apps/aurorae/themes/Oxygen/minimize.svgz
-usr/share/kde4/apps/aurorae/themes/Oxygen/Oxygenrc
 usr/share/kde4/apps/aurorae/themes/Oxygen/restore.svgz
+usr/share/kde4/apps/kwin/kde2.desktop
+usr/share/kde4/apps/kwin/keramik.desktop
+usr/share/kde4/apps/kwin/modernsystem.desktop
+usr/share/kde4/apps/kwin/quartz.desktop
+usr/share/kde4/apps/kwin/redmond.desktop
+usr/share/kde4/apps/kwin/web.desktop

-- 
KDE Artwork module packaging