[Pkg-xfce-commits] r2443 - desktop/branches/svn-snapshots/xfce4-appfinder/debian

[ncommander-guest at alioth.debian.org]

Author: ncommander-guest
Date: 2008-10-19 06:54:48 +0000 (Sun, 19 Oct 2008)
New Revision: 2443

Modified:
   desktop/branches/svn-snapshots/xfce4-appfinder/debian/changelog
   desktop/branches/svn-snapshots/xfce4-appfinder/debian/control
   desktop/branches/svn-snapshots/xfce4-appfinder/debian/rules
Log:
Backed out 2440-2441. Although the same bug appears to exist, the existing patch needs porting.

Modified: desktop/branches/svn-snapshots/xfce4-appfinder/debian/changelog
===================================================================
--- desktop/branches/svn-snapshots/xfce4-appfinder/debian/changelog	2008-10-19 06:48:13 UTC (rev 2442)
+++ desktop/branches/svn-snapshots/xfce4-appfinder/debian/changelog	2008-10-19 06:54:48 UTC (rev 2443)
@@ -1,6 +1,5 @@
 xfce4-appfinder (4.5.91-1) UNRELEASED; urgency=low
 
-  [ Yves-Alexis Perez ]
   [ Xfce 4.6 Alpha “Pinkie”]                                                    
   * new upstream alpha release.
   * debian/control:
@@ -16,19 +15,8 @@
   * debian/rules:
     - stop messing with config.{guess,sub}.
 
-  [ Michael Casadevall ]
-  * debian/patches/00_enable-label-word-wrap.patch
-    - Prevents windows from being drawn too wide
-    - Corrects Xfce 3632 and LP #94284
-  * debian/control:
-    - bumped standards to 3.8.0
-    - added myself to uploaders
-    - added quilt to build-dep
-  * debian/rules:
-    - added quilt rules
+ -- Yves-Alexis Perez <corsac at debian.org>  Thu, 16 Oct 2008 08:25:02 +0200
 
- -- Michael Casadevall <sonicmctails at gmail.com>  Sun, 19 Oct 2008 02:42:55 -0400
-
 xfce4-appfinder (4.4.2-1) unstable; urgency=low
 
   [ Yves-Alexis Perez ]

Modified: desktop/branches/svn-snapshots/xfce4-appfinder/debian/control
===================================================================
--- desktop/branches/svn-snapshots/xfce4-appfinder/debian/control	2008-10-19 06:48:13 UTC (rev 2442)
+++ desktop/branches/svn-snapshots/xfce4-appfinder/debian/control	2008-10-19 06:54:48 UTC (rev 2443)
@@ -2,10 +2,10 @@
 Section: x11
 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>, Michael Casadevall <sonicmctails at gmail.com>
+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), libxfcegui4-dev (>= 4.5.90), libxft-dev,
  libxml-parser-perl, libxfce4menu-0.1-dev, libgtk2.0-dev, libxfconf-0-dev,
- libthunar-vfs-1-dev (>= 0.9.91), quilt
+ libthunar-vfs-1-dev (>= 0.9.91)
 Standards-Version: 3.8.0
 Homepage: http://www.xfce.org/
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/xfce4-appfinder/

Modified: desktop/branches/svn-snapshots/xfce4-appfinder/debian/rules
===================================================================
--- desktop/branches/svn-snapshots/xfce4-appfinder/debian/rules	2008-10-19 06:48:13 UTC (rev 2442)
+++ desktop/branches/svn-snapshots/xfce4-appfinder/debian/rules	2008-10-19 06:54:48 UTC (rev 2443)
@@ -1,8 +1,6 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
 
-include /usr/share/quilt/quilt.make
-
 # These are used for cross-compiling and for saving the configure script
 # from having to guess our platform (since we know it already)
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
@@ -16,7 +14,7 @@
 	CFLAGS += -O2
 endif
 
-config.status: configure $(QUILT_STAMPFN)
+config.status: configure
 	dh_testdir
 	# Add here commands to configure the package.
 	CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --sysconfdir=/etc --enable-final
@@ -29,7 +27,7 @@
 	$(MAKE)
 	touch build-stamp
 
-clean: unpatch
+clean:
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp