SVN commit 462420 by jriddell:

Sync with latest packaging
  * Copy necessary icons to global icon directory
  * Add GenericNames to .desktop files
  * Avoid repetition in description


 M  +21 -0     changelog  
 M  +5 -6      control  
 M  +1 -0      dirs  
 M  +22 -13    rules  


--- trunk/playground/base/guidance/debian/changelog #462419:462420
@@ -1,3 +1,24 @@
+kde-guidance (0.4.0-0ubuntu4) breezy; urgency=low
+
+  * Copy necessary icons to global icon directory
+  * Add GenericNames to .desktop files
+  * Avoid repetition in description
+
+ -- Jonathan Riddell <[EMAIL PROTECTED]>  Wed, 21 Sep 2005 02:44:22 +0100
+
+kde-guidance (0.4.0-0ubuntu3) breezy; urgency=low
+
+  * Move files from /usr/lib/python2.4/site-packages/guidance 
+    to just /usr/lib/python2.4/site-packages
+
+ -- Jonathan Riddell <[EMAIL PROTECTED]>  Sat, 17 Sep 2005 21:31:21 +0100
+
+kde-guidance (0.4.0-0ubuntu2) breezy; urgency=low
+
+  * Can't remove debian/docs, it's in the .orig
+
+ -- Jonathan Riddell <[EMAIL PROTECTED]>  Thu, 15 Sep 2005 02:01:07 +0100
+
 kde-guidance (0.4.0-0ubuntu1) breezy; urgency=low
 
   * New upstream version
--- trunk/playground/base/guidance/debian/control #462419:462420
@@ -7,14 +7,13 @@
 
 Package: kde-guidance
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, python-kde3
 Description: collection of KDE system administration tools for GNU/Linux
- Guidance is a collection of KDE system administration tools
- for GNU/Linux systems.
- .
- Guidance currently consists of three programs: 
+ Guidance currently consists of three programs designed to help you
+ look after your system:
   o  userconfig - User and Group administration
   o  serviceconfig - Service/daemon administration
   o  mountconfig - Disk and filesystem administration
  .
- These programs are also KControl modules.
+ These tools are available in KDE Control center or can be
+ run as standalone applications.
--- trunk/playground/base/guidance/debian/dirs #462419:462420
@@ -1,4 +1,5 @@
 usr/bin
 usr/lib
+usr/lib/python2.4/site-packages
 usr/share/apps/guidance
 usr/share/doc/kde/HTML/en/guidance
--- trunk/playground/base/guidance/debian/rules #462419:462420
@@ -56,21 +56,23 @@
        for asdf in debian/kde-guidance/usr/share/applications/kde/*; do \
                echo "Categories=Qt;KDE;X-KDE-settings-system;" >> $${asdf}; \
        done
+       echo "GenericName=Mount Point Editor" >> 
debian/kde-guidance/usr/share/applications/kde/mountconfig.desktop
+       echo "GenericName=Runlevel Editor" >> 
debian/kde-guidance/usr/share/applications/kde/serviceconfig.desktop
+       echo "GenericName=User Account Editor" >> 
debian/kde-guidance/usr/share/applications/kde/userconfig.desktop
 
        # Put Python modules in /usr/lib, Debian policy compliance
-       mkdir debian/kde-guidance/usr/lib/python2.4/site-packages/guidance
-       mv debian/kde-guidance/usr/share/apps/guidance/*py 
debian/kde-guidance/usr/lib/python2.4/site-packages/guidance
-       mv debian/kde-guidance/usr/share/apps/guidance/*pyc 
debian/kde-guidance/usr/lib/python2.4/site-packages/guidance
+       mv debian/kde-guidance/usr/share/apps/guidance/*py 
debian/kde-guidance/usr/lib/python2.4/site-packages
+       mv debian/kde-guidance/usr/share/apps/guidance/*pyc 
debian/kde-guidance/usr/lib/python2.4/site-packages
 
        # redo the link properly
-       (cd debian/kde-guidance/usr/bin; ln -sf 
../lib/python2.4/site-packages/guidance/displayconfig.py displayconfig)
-       (cd debian/kde-guidance/usr/bin; ln -sf 
../lib/python2.4/site-packages/guidance/mountconfig.py mountconfig)
-       (cd debian/kde-guidance/usr/bin; ln -sf 
../lib/python2.4/site-packages/guidance/serviceconfig.py serviceconfig)
-       (cd debian/kde-guidance/usr/bin; ln -sf 
../lib/python2.4/site-packages/guidance/userconfig.py userconfig)
+       (cd debian/kde-guidance/usr/bin; ln -sf 
../lib/python2.4/site-packages/displayconfig.py displayconfig)
+       (cd debian/kde-guidance/usr/bin; ln -sf 
../lib/python2.4/site-packages/mountconfig.py mountconfig)
+       (cd debian/kde-guidance/usr/bin; ln -sf 
../lib/python2.4/site-packages/serviceconfig.py serviceconfig)
+       (cd debian/kde-guidance/usr/bin; ln -sf 
../lib/python2.4/site-packages/userconfig.py userconfig)
 
        # remove script-not-executable
        chmod +x debian/kde-guidance/usr/lib/python2.4/site-packages/*.py
-       chmod +x 
debian/kde-guidance/usr/lib/python2.4/site-packages/guidance/*.py
+       chmod +x debian/kde-guidance/usr/lib/python2.4/site-packages/*.py
 
        # remove executable-not-elf-or-script. some remains need to be fixed in 
upstream
        chmod 0644 debian/kde-guidance/usr/share/apps/guidance/pics/*.png
@@ -78,11 +80,11 @@
        chmod 0644 debian/kde-guidance/usr/share/applications/kde/*.desktop
        chmod 0644 
debian/kde-guidance/usr/share/icons/crystalsvg/16x16/apps/*.png
 
-       chmod 0644 
debian/kde-guidance/usr/lib/python2.4/site-packages/guidance/ScanPCI.py
-       chmod 0644 
debian/kde-guidance/usr/lib/python2.4/site-packages/guidance/SimpleCommandRunner.py
-       chmod 0644 
debian/kde-guidance/usr/lib/python2.4/site-packages/guidance/SMBShareSelectDialog.py
-       chmod 0644 
debian/kde-guidance/usr/lib/python2.4/site-packages/guidance/displayconfigwidgets.py
-       chmod 0644 
debian/kde-guidance/usr/lib/python2.4/site-packages/guidance/fuser_ui.py
+       chmod 0644 
debian/kde-guidance/usr/lib/python2.4/site-packages/ScanPCI.py
+       chmod 0644 
debian/kde-guidance/usr/lib/python2.4/site-packages/SimpleCommandRunner.py
+       chmod 0644 
debian/kde-guidance/usr/lib/python2.4/site-packages/SMBShareSelectDialog.py
+       chmod 0644 
debian/kde-guidance/usr/lib/python2.4/site-packages/displayconfigwidgets.py
+       chmod 0644 
debian/kde-guidance/usr/lib/python2.4/site-packages/fuser_ui.py
 
        # until displayconfig works on debian, we remove it
        rm -f debian/kde-guidance/usr/bin/displayconfig
@@ -90,6 +92,13 @@
        rm -f 
debian/kde-guidance/usr/share/applications/kde/displayconfig.desktop
        rm -f debian/kde-guidance/usr/share/apps/guidance/displayconfig*
 
+       # copy icons to right place
+       mkdir debian/kde-guidance/usr/share/icons/crystalsvg/32x32/
+       mkdir debian/kde-guidance/usr/share/icons/crystalsvg/32x32/apps/
+       cp 
debian/kde-guidance/usr/share/apps/guidance/pics/hi32-app-daemons.png 
debian/kde-guidance/usr/share/icons/crystalsvg/32x32/apps/daemons.png
+       cp debian/kde-guidance/usr/share/apps/guidance/pics/kcmpartitions.png 
debian/kde-guidance/usr/share/icons/crystalsvg/32x32/apps/disksfilesystems.png
+       cp debian/kde-guidance/usr/share/apps/guidance/pics/hi32-user.png 
debian/kde-guidance/usr/share/icons/crystalsvg/32x32/apps/userconfig.png
+
 # Build architecture-independent files here.
 binary-indep: build install
 # We have nothing to do by default.


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Reply via email to