[Foo2zjs-commits] r113 - trunk/foo2zjs_20070718dfsg/debian

[white at alioth.debian.org]

Author: white
Date: 2007-10-07 06:19:20 +0000 (Sun, 07 Oct 2007)
New Revision: 113

Modified:
   trunk/foo2zjs_20070718dfsg/debian/changelog
   trunk/foo2zjs_20070718dfsg/debian/control
   trunk/foo2zjs_20070718dfsg/debian/rules
Log:
Improve the clean call and add package relations to debian/control

Modified: trunk/foo2zjs_20070718dfsg/debian/changelog
===================================================================
--- trunk/foo2zjs_20070718dfsg/debian/changelog	2007-10-07 06:06:04 UTC (rev 112)
+++ trunk/foo2zjs_20070718dfsg/debian/changelog	2007-10-07 06:19:20 UTC (rev 113)
@@ -1,5 +1,6 @@
 foo2zjs (20070718dfsg-4) experimental; urgency=low
 
+  [ Luca Bedogni ]
   * Now hannah is a standalone package
    - Moved debian/hannah to debian/hannah-package
    - Added the clean call for hannah-package in debian/rules
@@ -7,8 +8,15 @@
   * Modified menu file for opening hannah with kdesu or gksu
     (Closes: #444850)
 
- -- Luca Bedogni <me at lucabedogni.it>  Fri, 05 Oct 2007 11:00:43 +1000
+  [ Steffen Joeris ]
+  * Fix cleanup for hannah and call it with make distclean
+  * Remove dependency against kdebase-bin | gksu from foo2zjs, because
+    this is satisfied via hannah now
+  * Add hannah as a suggests for foo2zjs
+  * Add foo2zjs as a depends to hannah
 
+ -- Luca Bedogni <me at lucabedogni.it>  Sun, 07 Oct 2007 16:24:58 +1000
+
 foo2zjs (20070718dfsg-3) experimental; urgency=low
 
   * Include first version of Hannah (GUI for downloading and installing

Modified: trunk/foo2zjs_20070718dfsg/debian/control
===================================================================
--- trunk/foo2zjs_20070718dfsg/debian/control	2007-10-07 06:06:04 UTC (rev 112)
+++ trunk/foo2zjs_20070718dfsg/debian/control	2007-10-07 06:19:20 UTC (rev 113)
@@ -8,9 +8,9 @@
 
 Package: foo2zjs
 Architecture: any
-Depends: ${shlibs:Depends}, kdebase-bin | gksu
+Depends: ${shlibs:Depends}
 Recommends: foomatic-db-engine
-Suggests: psutils
+Suggests: psutils, hannah
 Description: Support for printing to ZjStream-based printers
  foo2zjs is an open source printer driver for printers that use the
  Zenographics ZjStream wire protocol for their print data, such as the
@@ -26,7 +26,7 @@
 
 Package: hannah
 Architecture: any
-Depends: ${shlibs:Depends}, kdebase-bin | gksu
+Depends: ${shlibs:Depends}, kdebase-bin | gksu, foo2zjs
 Description: Graphical firmware downloader for the foo2zjs package
  Hannah is a graphical firmware downloader for the foo2zjs package. You
  can select one or more firmware(s) from a list, and let hannah download

Modified: trunk/foo2zjs_20070718dfsg/debian/rules
===================================================================
--- trunk/foo2zjs_20070718dfsg/debian/rules	2007-10-07 06:06:04 UTC (rev 112)
+++ trunk/foo2zjs_20070718dfsg/debian/rules	2007-10-07 06:19:20 UTC (rev 113)
@@ -38,7 +38,7 @@
 	rm -f build-stamp configure-stamp
 	dpatch deapply-all
 	rm -rf debian/patched
-	cd debian/hannah-package/ && make clean
+	[ ! -f debian/hannah-package/Makefile ] || (cd debian/hannah-package/ && $(MAKE) distclean)
 	rm -rf debian/hannah-package/hannah
 	[ ! -f Makefile ] || $(MAKE) clean
 	-rm -f foo2hp