summaryrefslogtreecommitdiffstats
path: root/ubuntu/raring/tdeartwork
diff options
context:
space:
mode:
authorFrançois Andriot <albator78@libertysurf.fr>2013-07-21 12:42:38 +0200
committerFrançois Andriot <albator78@libertysurf.fr>2013-07-21 12:42:38 +0200
commitd2a5ae6eee8f77ba301f22a990fd68944c94d4ad (patch)
tree0bdfdcb57898584e87d89ab3a0172d5b6ce28ce6 /ubuntu/raring/tdeartwork
parent65166dbf185e59a4f874392b40c7f974e7ae5fb8 (diff)
parent0657be6a3626991da456db3946ed1ec316ce6fb7 (diff)
downloadtde-packaging-d2a5ae6eee8f77ba301f22a990fd68944c94d4ad.tar.gz
tde-packaging-d2a5ae6eee8f77ba301f22a990fd68944c94d4ad.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'ubuntu/raring/tdeartwork')
-rw-r--r--ubuntu/raring/tdeartwork/debian/control4
-rw-r--r--ubuntu/raring/tdeartwork/debian/tdewallpapers-trinity.install (renamed from ubuntu/raring/tdeartwork/debian/kdewallpapers-trinity.install)0
2 files changed, 2 insertions, 2 deletions
diff --git a/ubuntu/raring/tdeartwork/debian/control b/ubuntu/raring/tdeartwork/debian/control
index 09df752cf..ca1cdd6d6 100644
--- a/ubuntu/raring/tdeartwork/debian/control
+++ b/ubuntu/raring/tdeartwork/debian/control
@@ -13,7 +13,7 @@ Architecture: all
Section: tde
Replaces: kdeartwork-kde3 (<< 4:14.0.0), kdeartwork-trinity (<< 4:14.0.0)
Breaks: kdeartwork-kde3 (<< 4:14.0.0), kdeartwork-trinity (<< 4:14.0.0)
-Depends: tdeartwork-misc-trinity (>= ${Source-Version}), tdeartwork-emoticons-trinity (>= ${Source-Version}), tdeartwork-style-trinity (>= ${Source-Version}), tdeartwork-theme-icon-trinity (>= ${Source-Version}), tdeartwork-theme-window-trinity (>= ${Source-Version}), kdewallpapers-trinity (>= ${Source-Version}), tdescreensaver-trinity (>= ${Source-Version})
+Depends: tdeartwork-misc-trinity (>= ${Source-Version}), tdeartwork-emoticons-trinity (>= ${Source-Version}), tdeartwork-style-trinity (>= ${Source-Version}), tdeartwork-theme-icon-trinity (>= ${Source-Version}), tdeartwork-theme-window-trinity (>= ${Source-Version}), tdewallpapers-trinity (>= ${Source-Version}), tdescreensaver-trinity (>= ${Source-Version})
Recommends: tdescreensaver-xsavers-trinity
Description: themes, styles and more from the official Trinity release
KDE (the K Desktop Environment) is a powerful Open Source graphical
@@ -98,7 +98,7 @@ Description: window decoration themes released with Trinity
This package is part of Trinity, and a component of the KDE artwork module.
See the 'kde-trinity' and 'tdeartwork-trinity' packages for more information.
-Package: kdewallpapers-trinity
+Package: tdewallpapers-trinity
Architecture: all
Section: tde
Replaces: kdewallpapers-kde3 (<< 4:14.0.0), kdewallpapers-trinity (<< 4:14.0.0)
diff --git a/ubuntu/raring/tdeartwork/debian/kdewallpapers-trinity.install b/ubuntu/raring/tdeartwork/debian/tdewallpapers-trinity.install
index 681454953..681454953 100644
--- a/ubuntu/raring/tdeartwork/debian/kdewallpapers-trinity.install
+++ b/ubuntu/raring/tdeartwork/debian/tdewallpapers-trinity.install