[Pkg-xfce-commits] r1844 - in desktop/trunk/xfprint4/debian: . patches

[corsac at alioth.debian.org]

Author: corsac
Date: 2008-04-08 21:43:25 +0000 (Tue, 08 Apr 2008)
New Revision: 1844

Added:
   desktop/trunk/xfprint4/debian/patches/
   desktop/trunk/xfprint4/debian/patches/01_debug-lpr-command.patch
   desktop/trunk/xfprint4/debian/patches/series
Modified:
   desktop/trunk/xfprint4/debian/changelog
   desktop/trunk/xfprint4/debian/control
   desktop/trunk/xfprint4/debian/rules
Log:
* debian/rules: 
  - use /etc/ as sysconfdir so xfprint4 finds printcap file 
  - use quilt for patching sources.
  - add build-dep on quilt.
  - add back dependency on a2ps, it's required to be able to print.
* debian/patches:
  - 01_debug-lpr-command added, to help debug stuff.

Modified: desktop/trunk/xfprint4/debian/changelog
===================================================================
--- desktop/trunk/xfprint4/debian/changelog	2008-04-07 23:32:19 UTC (rev 1843)
+++ desktop/trunk/xfprint4/debian/changelog	2008-04-08 21:43:25 UTC (rev 1844)
@@ -1,18 +1,24 @@
 xfprint4 (4.4.2-2) UNRELEASED; urgency=low
 
-  * debian/rules: use /etc/ as sysconfdir so xfprint4 finds printcap file
-    correctly.                                                  closes: #471117
+  * debian/rules: 
+    - use /etc/ as sysconfdir so xfprint4 finds printcap file 
+      correctly.                                                closes: #471117
+    - use quilt for patching sources.
   * debian/control:
     - update standards version to 3.7.3.
     - use my new email address.
     - add dependency on xfce4-mcs-manager because we can call xfce-setting-show.
+    - add build-dep on quilt.
+    - add back dependency on a2ps, it's required to be able to print.
   * debian/lintian:
     - add override for command not in package now we depend on the package.
     - remove override for private category, now correctly handled by lintian.
   * debian/copyright:
     - add © sign.
+  * debian/patches:
+    - 01_debug-lpr-command added, to help debug stuff.
 
- -- Yves-Alexis Perez <corsac at debian.org>  Mon, 17 Mar 2008 08:24:19 +0100
+ -- Yves-Alexis Perez <corsac at debian.org>  Tue, 08 Apr 2008 23:42:52 +0200
 
 xfprint4 (4.4.2-1) unstable; urgency=low
 

Modified: desktop/trunk/xfprint4/debian/control
===================================================================
--- desktop/trunk/xfprint4/debian/control	2008-04-07 23:32:19 UTC (rev 1843)
+++ desktop/trunk/xfprint4/debian/control	2008-04-08 21:43:25 UTC (rev 1844)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
 Uploaders: Martin Loschwitz <madkiss at debian.org>, Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>, Yves-Alexis Perez <corsac at debian.org>
-Build-Depends: debhelper (>> 4.0.0), libgtk2.0-dev (>= 2.10.6), libxft-dev, xfce4-mcs-manager-dev (>= 4.4.2), a2ps, lpr, libcupsys2-dev, chrpath, sharutils
+Build-Depends: debhelper (>> 4.0.0), libgtk2.0-dev (>= 2.10.6), libxft-dev, xfce4-mcs-manager-dev (>= 4.4.2), a2ps, lpr, libcupsys2-dev, chrpath, sharutils, quilt
 Standards-Version: 3.7.3
 Homepage: http://www.xfce.org/
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/xfprint4/
@@ -11,7 +11,7 @@
 
 Package: xfprint4
 Architecture: any
-Depends: ${shlibs:Depends}, xfce4-mcs-manager
+Depends: ${shlibs:Depends}, xfce4-mcs-manager, a2ps
 Suggests: psutils
 Description: Printer GUI for Xfce4
  xfprint4 is a printer manager for the Xfce4 desktop environment. It allows

Added: desktop/trunk/xfprint4/debian/patches/01_debug-lpr-command.patch
===================================================================
--- desktop/trunk/xfprint4/debian/patches/01_debug-lpr-command.patch	                        (rev 0)
+++ desktop/trunk/xfprint4/debian/patches/01_debug-lpr-command.patch	2008-04-08 21:43:25 UTC (rev 1844)
@@ -0,0 +1,10 @@
+--- xfprint-4.4.2/printing-systems/bsd-lpr/bsdlpr.c.orig	2007-11-17 20:31:59.000000000 +0100
++++ xfprint-4.4.2/printing-systems/bsd-lpr/bsdlpr.c	2008-03-22 19:28:54.000000000 +0100
+@@ -257,6 +257,7 @@
+   base_name = g_path_get_basename (original_name);
+ 
+   cmd = g_strdup_printf ("lpr -P%s -T %s %s", printer, base_name, file);
++  DBG ("executing '%s'", cmd);
+   ret = xfce_exec_sync (cmd, FALSE, FALSE, NULL);
+ 
+   if (remove_file)

Added: desktop/trunk/xfprint4/debian/patches/series
===================================================================
--- desktop/trunk/xfprint4/debian/patches/series	                        (rev 0)
+++ desktop/trunk/xfprint4/debian/patches/series	2008-04-08 21:43:25 UTC (rev 1844)
@@ -0,0 +1 @@
+01_debug-lpr-command.patch

Modified: desktop/trunk/xfprint4/debian/rules
===================================================================
--- desktop/trunk/xfprint4/debian/rules	2008-04-07 23:32:19 UTC (rev 1843)
+++ desktop/trunk/xfprint4/debian/rules	2008-04-08 21:43:25 UTC (rev 1844)
@@ -1,4 +1,5 @@
 #!/usr/bin/make -f
+include /usr/share/quilt/quilt.make
 
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
@@ -11,7 +12,7 @@
 	CFLAGS += -O2
 endif
 
-config.status:
+config.status: patch configure
 	
 	dh_testdir
 	./configure \
@@ -29,7 +30,7 @@
 	$(MAKE)
 	touch build-stamp
 
-clean:
+clean: unpatch
 	
 	dh_testdir
 	dh_testroot
@@ -111,4 +112,4 @@
 	dh_builddeb
 
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install 
+.PHONY: build clean binary-indep binary-arch binary install patch unpatch