[Pkg-xfce-commits] r4232 - desktop/branches/lenny-backports/xfce4-appfinder/debian

Yves-Alexis Perez corsac at alioth.debian.org
Tue Aug 17 08:38:38 UTC 2010 

Author: corsac
Date: 2010-08-17 20:38:38 +0000 (Tue, 17 Aug 2010)
New Revision: 4232

Added:
   desktop/branches/lenny-backports/xfce4-appfinder/debian/manpages
Modified:
   desktop/branches/lenny-backports/xfce4-appfinder/debian/changelog
   desktop/branches/lenny-backports/xfce4-appfinder/debian/control
   desktop/branches/lenny-backports/xfce4-appfinder/debian/menu
   desktop/branches/lenny-backports/xfce4-appfinder/debian/rules
   desktop/branches/lenny-backports/xfce4-appfinder/debian/watch
Log:
merge changes from latest version in squeeze to backports

Modified: desktop/branches/lenny-backports/xfce4-appfinder/debian/changelog
===================================================================
--- desktop/branches/lenny-backports/xfce4-appfinder/debian/changelog	2010-08-17 20:16:57 UTC (rev 4231)
+++ desktop/branches/lenny-backports/xfce4-appfinder/debian/changelog	2010-08-17 20:38:38 UTC (rev 4232)
@@ -1,9 +1,26 @@
-xfce4-appfinder (4.6.1-1~bpo50+1) lenny-backports; urgency=low
+xfce4-appfinder (4.6.2-1~bpo50+1) lenny-backports; urgency=low
 
   * Rebuild for lenny-backports.
 
- -- Yves-Alexis Perez <corsac at debian.org>  Sat, 11 Jul 2009 12:06:41 +0200
+ -- Yves-Alexis Perez <corsac at debian.org>  Tue, 17 Aug 2010 22:16:38 +0200
 
+xfce4-appfinder (4.6.2-1) unstable; urgency=low
+
+  [ Stefan Ott ]
+  * debian/watch edited to track Xfce archive reorganisation.
+
+  [ Lionel Le Folgoc ]
+  * New upstream release.
+  * debian/control:
+    - add myself to Uploaders
+    - bump Standards-Version to 3.8.4
+    - build-dep on debhelper >= 7.0.50~ for overrides
+    - add dep on ${misc:Depends}.
+  * debian/rules: switch to rules.tiny + overrides.
+  * debian/menu: update section.
+
+ -- Lionel Le Folgoc <mrpouit at gmail.com>  Sat, 22 May 2010 18:48:12 +0200
+
 xfce4-appfinder (4.6.1-1) unstable; urgency=low
 
   * New upstream release.

Modified: desktop/branches/lenny-backports/xfce4-appfinder/debian/control
===================================================================
--- desktop/branches/lenny-backports/xfce4-appfinder/debian/control	2010-08-17 20:16:57 UTC (rev 4231)
+++ desktop/branches/lenny-backports/xfce4-appfinder/debian/control	2010-08-17 20:38:38 UTC (rev 4232)
@@ -2,11 +2,12 @@
 Section: xfce
 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 (>= 7), libxfcegui4-dev (>= 4.6.0), libxft-dev,
+Uploaders: Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>,
+ Yves-Alexis Perez <corsac at debian.org>, Lionel Le Folgoc <mrpouit at gmail.com>
+Build-Depends: debhelper (>= 7.0.50~), libxfcegui4-dev (>= 4.6.0), libxft-dev,
  libxml-parser-perl, libxfce4menu-0.1-dev, libgtk2.0-dev, libxfconf-0-dev,
  libthunar-vfs-1-dev (>= 1.0.0), intltool
-Standards-Version: 3.8.1
+Standards-Version: 3.8.4
 Homepage: http://www.xfce.org/
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/xfce4-appfinder/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/xfce4-appfinder/
@@ -14,7 +15,7 @@
 Package: xfce4-appfinder
 Section: xfce
 Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Application finder for the Xfce4 Desktop Environment
  This is an application finder for the Xfce4 Desktop Environment.
  It will search for installed applications on your system.

Copied: desktop/branches/lenny-backports/xfce4-appfinder/debian/manpages (from rev 4077, desktop/trunk/xfce4-appfinder/debian/manpages)
===================================================================
--- desktop/branches/lenny-backports/xfce4-appfinder/debian/manpages	                        (rev 0)
+++ desktop/branches/lenny-backports/xfce4-appfinder/debian/manpages	2010-08-17 20:38:38 UTC (rev 4232)
@@ -0,0 +1 @@
+debian/xfce4-appfinder.1

Modified: desktop/branches/lenny-backports/xfce4-appfinder/debian/menu
===================================================================
--- desktop/branches/lenny-backports/xfce4-appfinder/debian/menu	2010-08-17 20:16:57 UTC (rev 4231)
+++ desktop/branches/lenny-backports/xfce4-appfinder/debian/menu	2010-08-17 20:38:38 UTC (rev 4232)
@@ -1,6 +1,6 @@
 ?package(xfce4-appfinder):\
  needs="X11"\
- section="System/Administration"\
+ section="Applications/System/Administration"\
  command="xfce4-appfinder"\
  title="Xfce Application Finder"\
  longtitle="An application finder for the Xfce4 desktop environment"\

Modified: desktop/branches/lenny-backports/xfce4-appfinder/debian/rules
===================================================================
--- desktop/branches/lenny-backports/xfce4-appfinder/debian/rules	2010-08-17 20:16:57 UTC (rev 4231)
+++ desktop/branches/lenny-backports/xfce4-appfinder/debian/rules	2010-08-17 20:38:38 UTC (rev 4232)
@@ -1,86 +1,11 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
 
-# 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)
-DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-LDFLAGS+=-Wl,-z,defs -Wl,--as-needed
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
-
-config.status: configure
-	dh_testdir
-	./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
-
-
-build: build-stamp
-
-build-stamp:  config.status
-	dh_testdir
-	$(MAKE)
-	touch build-stamp
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp 
-
-	# Add here commands to clean up after the build process.
-	[ ! -f Makefile ] || $(MAKE) distclean
-
-	dh_clean 
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_prep
-	dh_installdirs
-
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/xfce4-appfinder
-
-	# install manual page
-	dh_installman debian/xfce4-appfinder.1
-
+override_dh_install:
 	# install menu pixmap
 	install -d $(CURDIR)/debian/xfce4-appfinder/usr/share/pixmaps
 	install -c -m 644 $(CURDIR)/debian/xfce4-appfinder.xpm \
 		$(CURDIR)/debian/xfce4-appfinder/usr/share/pixmaps
+	dh_install
 
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
-	
-	dh_testdir
-	dh_testroot
-	
-	dh_installchangelogs ChangeLog
-	dh_installdocs
-	
-	dh_installexamples
-	dh_installman
-	
-	dh_link
-	dh_strip
-	
-	dh_compress
-	dh_fixperms
-	
-	dh_installdeb
-	dh_shlibdeps
-	
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install 
+%:
+	dh $@

Modified: desktop/branches/lenny-backports/xfce4-appfinder/debian/watch
===================================================================
--- desktop/branches/lenny-backports/xfce4-appfinder/debian/watch	2010-08-17 20:16:57 UTC (rev 4231)
+++ desktop/branches/lenny-backports/xfce4-appfinder/debian/watch	2010-08-17 20:38:38 UTC (rev 4232)
@@ -1,3 +1,3 @@
 version=3
-http://www.xfce.org/archive/xfce-(.*)/src/ \
-	xfce4-appfinder-(.*)\.tar\.bz2
+http://archive.xfce.org/src/xfce/xfce4-appfinder/([\d\.]+)/ \
+	xfce4-appfinder-([\d\.]+)\.tar\.(?:gz|bz2)

More information about the Pkg-xfce-commits mailing list