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

[bedo-guest at alioth.debian.org]

Author: bedo-guest
Date: 2007-10-05 09:20:44 +0000 (Fri, 05 Oct 2007)
New Revision: 108

Added:
   trunk/foo2zjs_20070718dfsg/debian/hannah-package/
Removed:
   trunk/foo2zjs_20070718dfsg/debian/hannah/
Modified:
   trunk/foo2zjs_20070718dfsg/debian/changelog
   trunk/foo2zjs_20070718dfsg/debian/control
   trunk/foo2zjs_20070718dfsg/debian/rules
Log:
Initial split for hannah


Modified: trunk/foo2zjs_20070718dfsg/debian/changelog
===================================================================
--- trunk/foo2zjs_20070718dfsg/debian/changelog	2007-09-30 08:08:22 UTC (rev 107)
+++ trunk/foo2zjs_20070718dfsg/debian/changelog	2007-10-05 09:20:44 UTC (rev 108)
@@ -1,3 +1,11 @@
+foo2zjs (20070718dfsg-4) experimental; urgency=low
+
+  * Now hannah is a standalone package
+  * Moved debian/hannah to debian/hannah-package
+  * Added the clean call for hannah-package in debian/rules
+
+ -- Luca Bedogni <me at lucabedogni.it>  Fri, 05 Oct 2007 11:00:43 +1000
+
 foo2zjs (20070718dfsg-3) experimental; urgency=low
 
   * Include first version of Hannah (GUI for downloading and installing
@@ -17,6 +25,7 @@
   * Fix breaking line in 11-hplj10xx.rules to repair it
    (Closes: #443917) Thanks to Cristian Ionescu-Idbohrn for the patch
 
+
  -- Steffen Joeris <white at debian.org>  Sun, 30 Sep 2007 18:10:33 +1000
 
 foo2zjs (20070718dfsg-2) unstable; urgency=low

Modified: trunk/foo2zjs_20070718dfsg/debian/control
===================================================================
--- trunk/foo2zjs_20070718dfsg/debian/control	2007-09-30 08:08:22 UTC (rev 107)
+++ trunk/foo2zjs_20070718dfsg/debian/control	2007-10-05 09:20:44 UTC (rev 108)
@@ -23,3 +23,14 @@
  printing support.
  .
   Home Page: http://foo2zjs.rkkda.com/
+
+Package: hannah
+Architecture: any
+Depends: ${shlibs:Depends}, kdebase-bin | gksu
+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
+ and install them.
+ With this software you can potentially install non-free software, so
+ beware of that.
+

Copied: trunk/foo2zjs_20070718dfsg/debian/hannah-package (from rev 107, trunk/foo2zjs_20070718dfsg/debian/hannah)

Modified: trunk/foo2zjs_20070718dfsg/debian/rules
===================================================================
--- trunk/foo2zjs_20070718dfsg/debian/rules	2007-09-30 08:08:22 UTC (rev 107)
+++ trunk/foo2zjs_20070718dfsg/debian/rules	2007-10-05 09:20:44 UTC (rev 108)
@@ -21,7 +21,7 @@
 configure-stamp:
 	dh_testdir
 	dpatch apply-all
-	cd debian/hannah/ && $(QMAKE)
+	cd debian/hannah-package/ && $(QMAKE)
 	touch configure-stamp
 
 build: build-stamp
@@ -29,7 +29,7 @@
 build-stamp: configure-stamp 
 	dh_testdir
 	$(MAKE) CFLAGS="$(CFLAGS)"
-	cd debian/hannah && $(MAKE)
+	cd debian/hannah-package && $(MAKE)
 	touch build-stamp
 
 clean:
@@ -38,6 +38,8 @@
 	rm -f build-stamp configure-stamp
 	dpatch deapply-all
 	rm -rf debian/patched
+	cd debian/hannah-package/ && make clean
+	rm debian/hannah-package/hannah
 	[ ! -f Makefile ] || $(MAKE) clean
 	-rm -f foo2hp
 	-rm -f foo2hp.o
@@ -64,8 +66,8 @@
 	install -D -m 644 hplj10xx.rules $(CURDIR)/debian/foo2zjs/etc/udev/rules.d/11-hplj10xx.rules
 	install -m 755 hplj1000 $(CURDIR)/debian/foo2zjs/usr/sbin/hplj1000
 	install -m 755 getweb $(CURDIR)/debian/foo2zjs/usr/bin/getweb
-	install -m 755 debian/hannah/hannah $(CURDIR)/debian/foo2zjs/usr/bin/hannah
-	install -m 644 debian/hannah/hannah.desktop $(CURDIR)/debian/foo2zjs/usr/share/applications/hannah.desktop
+	install -m 755 debian/hannah-package/hannah $(CURDIR)/debian/foo2zjs/usr/bin/hannah
+	install -m 644 debian/hannah-package/hannah.desktop $(CURDIR)/debian/foo2zjs/usr/share/applications/hannah.desktop
 	touch $(CURDIR)/debian/foo2zjs/usr/share/foo2zjs/tmp/.placeholder
 
 # Build architecture-independent files here.