[Pkg-xfce-commits] r2235 - in desktop/branches/svn-snapshots: . xfprint4 xfprint4/debian xfprint4/debian/patches

[corsac at alioth.debian.org]

Author: corsac
Date: 2008-08-23 22:42:23 +0000 (Sat, 23 Aug 2008)
New Revision: 2235

Added:
   desktop/branches/svn-snapshots/xfprint4/
Removed:
   desktop/branches/svn-snapshots/xfprint4/debian/patches/03_check-default-printer.patch
Modified:
   desktop/branches/svn-snapshots/xfprint4/debian/changelog
   desktop/branches/svn-snapshots/xfprint4/debian/control
   desktop/branches/svn-snapshots/xfprint4/debian/lintian
   desktop/branches/svn-snapshots/xfprint4/debian/patches/series
   desktop/branches/svn-snapshots/xfprint4/debian/rules
Log:
new 4.6 alpha release

Copied: desktop/branches/svn-snapshots/xfprint4 (from rev 2217, desktop/trunk/xfprint4)


Property changes on: desktop/branches/svn-snapshots/xfprint4
___________________________________________________________________
Name: svn:mergeinfo
   + 

Modified: desktop/branches/svn-snapshots/xfprint4/debian/changelog
===================================================================
--- desktop/trunk/xfprint4/debian/changelog	2008-08-13 21:30:11 UTC (rev 2217)
+++ desktop/branches/svn-snapshots/xfprint4/debian/changelog	2008-08-23 22:42:23 UTC (rev 2235)
@@ -1,3 +1,15 @@
+xfprint4 (4.5.80-1) UNRELEASED; urgency=low
+
+  * new upstream alpha release.
+  * debian/control:
+    - update build deps for Xfce 4.6 Alpha.
+  * debian/rules:
+    - remove references to mcs.
+  * debian/patches:
+    - 03_check-default-printer dropped, merged upstream.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Sat, 23 Aug 2008 22:38:37 +0200
+
 xfprint4 (4.4.2-6) unstable; urgency=low
 
   * debian/control: 

Modified: desktop/branches/svn-snapshots/xfprint4/debian/control
===================================================================
--- desktop/trunk/xfprint4/debian/control	2008-08-13 21:30:11 UTC (rev 2217)
+++ desktop/branches/svn-snapshots/xfprint4/debian/control	2008-08-23 22:42:23 UTC (rev 2235)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
 Uploaders: 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, libcups2-dev, chrpath, sharutils, quilt
+Build-Depends: debhelper (>> 4.0.0), libgtk2.0-dev (>= 2.10.6), libxft-dev, a2ps, lpr, libcups2-dev, chrpath, sharutils, quilt, libxfcegui4-dev, libxfconf-0-dev
 Standards-Version: 3.8.0
 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 (>= 4.4.2-3), a2ps
+Depends: ${shlibs:Depends}, a2ps
 Suggests: psutils
 Description: Printer GUI for Xfce4
  xfprint4 is a printer manager for the Xfce4 desktop environment. It allows

Modified: desktop/branches/svn-snapshots/xfprint4/debian/lintian
===================================================================
--- desktop/trunk/xfprint4/debian/lintian	2008-08-13 21:30:11 UTC (rev 2217)
+++ desktop/branches/svn-snapshots/xfprint4/debian/lintian	2008-08-23 22:42:23 UTC (rev 2235)
@@ -1,4 +1,2 @@
 #xfprint4 includes its library
 xfprint4: package-name-doesnt-match-sonames libxfprint0
-# we depend on xfce-mcs-manager
-xfprint4: desktop-command-not-in-package /usr/share/applications/xfce-xfprint-settings.desktop xfce-setting-show

Deleted: desktop/branches/svn-snapshots/xfprint4/debian/patches/03_check-default-printer.patch
===================================================================
--- desktop/trunk/xfprint4/debian/patches/03_check-default-printer.patch	2008-08-13 21:30:11 UTC (rev 2217)
+++ desktop/branches/svn-snapshots/xfprint4/debian/patches/03_check-default-printer.patch	2008-08-23 22:42:23 UTC (rev 2235)
@@ -1,13 +0,0 @@
-Index: xfce_4_4/xfprint/print_dialog.c
-===================================================================
---- xfce_4_4/xfprint/print_dialog.c	(revision 26587)
-+++ xfce_4_4/xfprint/print_dialog.c	(revision 26588)
-@@ -406,7 +406,7 @@
-                         PRINTER_NAME_COLUMN, printer_data->name, 
-                         PRINTER_ALIAS_COLUMN, printer_data->alias ? printer_data->alias : "", -1);
-     
--    if (!default_printer_found && g_ascii_strcasecmp (default_printer->name, printer_data->name) == 0) {
-+    if (default_printer && !default_printer_found && g_ascii_strcasecmp (default_printer->name, printer_data->name) == 0) {
-       default_printer_found = TRUE;
-       gtk_combo_box_set_active_iter (GTK_COMBO_BOX (priv->combobox_printer), &iter);
-     }

Modified: desktop/branches/svn-snapshots/xfprint4/debian/patches/series
===================================================================
--- desktop/trunk/xfprint4/debian/patches/series	2008-08-13 21:30:11 UTC (rev 2217)
+++ desktop/branches/svn-snapshots/xfprint4/debian/patches/series	2008-08-23 22:42:23 UTC (rev 2235)
@@ -1,3 +1,2 @@
 01_debug-lpr-command.patch
 02_refresh-new-settings.patch
-03_check-default-printer.patch

Modified: desktop/branches/svn-snapshots/xfprint4/debian/rules
===================================================================
--- desktop/trunk/xfprint4/debian/rules	2008-08-13 21:30:11 UTC (rev 2217)
+++ desktop/branches/svn-snapshots/xfprint4/debian/rules	2008-08-23 22:42:23 UTC (rev 2235)
@@ -91,8 +91,7 @@
 
 	chrpath -d -k `pwd`/debian/xfprint4/usr/lib/*.so.* \
 		`pwd`/debian/xfprint4/usr/bin/* \
-		`pwd`/debian/xfprint4/usr/lib/xfce4/xfprint-plugins/* \
-		`pwd`/debian/xfprint4/usr/lib/xfce4/mcs-plugins/*
+		`pwd`/debian/xfprint4/usr/lib/xfce4/xfprint-plugins/*
 
 binary-indep: build install
 binary-arch: build install