[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdeartwork/debian
From:       Ben Burton <bab () debian ! org>
Date:       2003-01-21 9:07:50
[Download RAW message or body]

CVS commit by benb: 

Sync with BRANCH.


  M +1 -1      .cvsignore   1.8
  M +4 -2      changelog   1.21
  M +6 -4      control   1.26
  M +32 -0     kscreensaver.install   1.2
  M +11 -0     kscreensaver.manpages   1.3
  M +0 -5      rules   1.16
  R            kdeartwork-screensaver.install   1.4
  R            kdeartwork-screensaver.manpages   1.3


--- kdeartwork/debian/.cvsignore  #1.7:1.8
@@ -6,6 +6,6 @@
 kdeartwork
 kdeartwork-misc
-kdeartwork-screensaver
 kdeartwork-style
 kdeartwork-theme-desktop
 kdeartwork-theme-window
+kscreensaver

--- kdeartwork/debian/changelog  #1.20:1.21
@@ -1,7 +1,9 @@
-kdeartwork (3.1.0-1) unstable; urgency=low
+kdeartwork (4:3.1.0-1) unstable; urgency=low
 
   * New upstream release.
+  * Renamed kdeartwork-screensaver to kscreensaver.
+  * Shifted epoch to 4: since kdebase used to provide kscreensaver 4:3.0.x.
 
- -- Ben Burton <bab@debian.org>  Mon, 18 Nov 2002 14:15:59 +1100
+ -- Ben Burton <bab@debian.org>  Sat,  4 Jan 2003 20:06:44 +1100
 
 kdeartwork (3.0.9-1) unstable; urgency=low

--- kdeartwork/debian/control  #1.25:1.26
@@ -3,12 +3,12 @@
 Priority: optional
 Maintainer: Ben Burton <bab@debian.org>
-Build-Depends: automake1.7, debhelper (>> 4.0.0), g++-3.2, kdebase-dev, \
kdelibs4-dev, kwin, xscreensaver-nognome | xscreensaver +Build-Depends: automake1.7, \
debhelper (>> 4.0.0), kdebase-dev, kdelibs4-dev, kwin, xscreensaver-nognome | \
xscreensaver  Build-Conflicts: nvidia-glx
-Standards-Version: 3.5.7.0
+Standards-Version: 3.5.8.0
 
 Package: kdeartwork
 Architecture: all
 Section: graphics
-Depends: kdeartwork-misc, kdeartwork-screensaver, kdeartwork-style, \
kdeartwork-theme-desktop, kdeartwork-theme-window +Depends: kdeartwork-misc, \
kscreensaver, kdeartwork-style, kdeartwork-theme-desktop, kdeartwork-theme-window  \
Description: themes, styles and more from the official KDE release  This is a \
collection of artistic goodies (themes, widget styles, screen @@ -28,9 +28,11 @@
  This package is part of the KDE artwork module.
 
-Package: kdeartwork-screensaver
+Package: kscreensaver
 Architecture: any
 Section: x11
 Depends: ${shlibs:Depends}
 Recommends: kwin, xscreensaver-nognome | xscreensaver
+Conflicts: kdeartwork-screensaver (<= 3.1.0-1)
+Replaces: kdeartwork-screensaver (<= 3.1.0-1)
 Description: screen savers released with KDE
  This package contains the screen savers that come with the official KDE

--- kdeartwork/debian/rules  #1.15:1.16
@@ -29,9 +29,4 @@
 endif
 
-# GCC 3.2 defines
-export CC=gcc-3.2
-export CXX=g++-3.2
-export CPP=cpp-3.2
-
 ifeq ($(DEB_BUILD_GNU_TYPE),alpha-linux)
   export CFLAGS +=-O0 -mieee


[prev in list] [next in list] [prev in thread] [next in thread]