[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

playground/base/guidance/debian



SVN commit 460744 by jriddell:

Update debian directory
Fix clean target
Use XDG menus (for systemsettings and general sanity)
Rename package to kde-guidance (pleases ftpmaster)
Simplify description (pleases ftpmaster)


 M  +16 -0     changelog  
 M  +8 -19     control  
 M  +0 -1      dirs  
 D             docs  
 M  +41 -16    rules  


--- trunk/playground/base/guidance/debian/changelog #460743:460744
@@ -1,3 +1,19 @@
+kde-guidance (0.4.0-0ubuntu1) breezy; urgency=low
+
+  * New upstream version
+  * Fix debian/rules for rename to kde-guidance
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 15 Sep 2005 01:07:38 +0100
+
+kde-guidance (0.3.0+svn20050911-0ubuntu1) breezy; urgency=low
+
+  * Initial Ubuntu upload
+  * Install .py files into /usr/lib/python2.4/site-packages/guidance
+  * Change source and package name to kde-guidance to 
+    reduce namespace polution
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Sun, 11 Sep 2005 23:51:52 +0100
+
 guidance (0.3.0-1) unstable; urgency=low
 
   * Initial release
--- trunk/playground/base/guidance/debian/control #460743:460744
@@ -1,31 +1,20 @@
-Source: guidance
+Source: kde-guidance
 Section: kde
 Priority: optional
 Maintainer: Fathi Boudra <fboudra@free.fr>
 Build-Depends: debhelper (>= 4.1), kdelibs4-dev (>= 3.4.2), libpythonize0-dev (>= 0.3.0), libtool (>= 1.5.6), libxml2-utils (>= 2.6.20), libxxf86vm-dev (>= 6.8.2), pykdeextensions (>= 0.3.0), pyqt-tools (>= 3.14.1), python-kde3 (>= 3.11.3), python-sip4-dev (>= 4.2.1)
 Standards-Version: 3.6.2
 
-Package: guidance
+Package: kde-guidance
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}
-Description: collection of system administration tools for Linux/KDE
- Guidance is a collection of system administration tools
- for Linux/KDE systems.
+Description: collection of KDE system administration tools for GNU/Linux
+ Guidance is a collection of KDE system administration tools
+ for GNU/Linux systems.
  .
- The tools that make up Guidance are in different stages of
- development and have only been tested on Mandrake.
- .
- Guidance currently consists of four programs: 
+ Guidance currently consists of three programs: 
   o  userconfig - User and Group administration
-     Mostly feature complete. Only supports /etc/passwd and
-     /etc/shadow right now. LDAP may be added later.
   o  serviceconfig - Service/daemon administration
-     Feature complete. But probably only works on Mandrake, Debian,
-     Gentoo and maybe Red Hat out of the box.
   o  mountconfig - Disk and filesystem administration
-     Almost feature complete. Should work ok on most distributions
-     although it may not recognise some of the more rare filesystem types.
-     (Let me know which filesystems it doesn't recognise!)
-  o  displayconfig - Screen and display configuration
-     Also feature complete except for multi-head support. Only works
-     on Mandrake right now due to the use of ldetect and it's datafiles.
+ .
+ These programs are also KControl modules.
--- trunk/playground/base/guidance/debian/dirs #460743:460744
@@ -1,5 +1,4 @@
 usr/bin
 usr/lib
-usr/share/applnk/Settings/System
 usr/share/apps/guidance
 usr/share/doc/kde/HTML/en/guidance
--- trunk/playground/base/guidance/debian/rules #460743:460744
@@ -31,6 +31,14 @@
 
 	rm -rf build
 
+	#Added jriddell
+	rm -rf doc/en/*html doc/en/*bz2
+	rm -f serviceconfig/kcm_serviceconfig.cpp 
+	rm -f mountconfig/kcm_mountconfig.cpp 
+	rm -f displayconfig/kcm_displayconfig.cpp 
+	rm -f userconfig/kcm_userconfig.cpp
+	rm -f install_log.txt
+
 	dh_clean 
 
 install: build
@@ -39,31 +47,48 @@
 	dh_clean -k 
 	dh_installdirs
 
-	/usr/bin/python setup.py install --prefix=/usr --root=$(CURDIR)/debian/guidance
+	/usr/bin/python setup.py install --prefix=/usr --root=$(CURDIR)/debian/kde-guidance
 
-	# setup.py bug, need to be fixed in upstream
-	dh_install debian/guidance/usr/share/applications/kde/*.desktop usr/share/applnk/Settings/System
-	rm -rf debian/guidance/usr/share/applications
+	#Solution to bug is not to got back to old menu system but fix the current one - jriddell
+	## setup.py bug, need to be fixed in upstream
+	#dh_install debian/kde-guidance/usr/share/applications/kde/*.desktop usr/share/applnk/Settings/System
+	#rm -rf debian/kde-guidance/usr/share/applications
+	for asdf in debian/kde-guidance/usr/share/applications/kde/*; do \
+		echo "Categories=Qt;KDE;X-KDE-settings-system;" >> $${asdf}; \
+	done
 
+	# 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
+
 	# redo the link properly
-	(cd debian/guidance/usr/bin; ln -sf ../share/apps/guidance/displayconfig.py displayconfig)
-	(cd debian/guidance/usr/bin; ln -sf ../share/apps/guidance/mountconfig.py mountconfig)
-	(cd debian/guidance/usr/bin; ln -sf ../share/apps/guidance/serviceconfig.py serviceconfig)
-	(cd debian/guidance/usr/bin; ln -sf ../share/apps/guidance/userconfig.py userconfig)
+	(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)
 
 	# remove script-not-executable
-	chmod +x debian/guidance/usr/lib/python2.4/site-packages/*.py
-	chmod +x debian/guidance/usr/share/apps/guidance/*.py
+	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
 
 	# remove executable-not-elf-or-script. some remains need to be fixed in upstream
-	chmod 0644 debian/guidance/usr/share/apps/guidance/pics/*.png
-	chmod 0644 debian/guidance/usr/share/applnk/Settings/System/*.desktop
-	chmod 0644 debian/guidance/usr/share/icons/crystalsvg/16x16/apps/*.png
+	chmod 0644 debian/kde-guidance/usr/share/apps/guidance/pics/*.png
+	##chmod 0644 debian/kde-guidance/usr/share/applnk/Settings/System/*.desktop
+	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
+
 	# until displayconfig works on debian, we remove it
-	rm -f debian/guidance/usr/bin/displayconfig
-	rm -f debian/guidance/usr/share/applnk/Settings/System/displayconfig.desktop
-	rm -f debian/guidance/usr/share/apps/guidance/displayconfig*
+	rm -f debian/kde-guidance/usr/bin/displayconfig
+	##rm -f debian/kde-guidance/usr/share/applnk/Settings/System/displayconfig.desktop
+	rm -f debian/kde-guidance/usr/share/applications/kde/displayconfig.desktop
+	rm -f debian/kde-guidance/usr/share/apps/guidance/displayconfig*
 
 # Build architecture-independent files here.
 binary-indep: build install



Reply to: