[Pkg-xfce-commits] r4099 - in desktop/branches/experimental/exo/debian: . patches

Lionel Le Folgoc mrpouit-guest at alioth.debian.org
Mon May 24 11:31:39 UTC 2010 

Author: mrpouit-guest
Date: 2010-05-24 11:31:39 +0000 (Mon, 24 May 2010)
New Revision: 4099

Added:
   desktop/branches/experimental/exo/debian/exo-utils.manpages
Modified:
   desktop/branches/experimental/exo/debian/changelog
   desktop/branches/experimental/exo/debian/compat
   desktop/branches/experimental/exo/debian/control
   desktop/branches/experimental/exo/debian/patches/01_fix-treeview-gtk2.20.patch
   desktop/branches/experimental/exo/debian/rules
Log:
* debian/exo-utils.manpages: added.
* debian/control: b-deps on debhelper >= 7.0.50~.
* debian/rules: switch to rules.tiny + overrides.
* debian/compat: bump to 7.

Modified: desktop/branches/experimental/exo/debian/changelog
===================================================================
--- desktop/branches/experimental/exo/debian/changelog	2010-05-23 17:21:19 UTC (rev 4098)
+++ desktop/branches/experimental/exo/debian/changelog	2010-05-24 11:31:39 UTC (rev 4099)
@@ -11,6 +11,12 @@
     - add build-dep on libxfce4util-dev.
     - add dep on ${misc:Depends} for libexo-1-dev.
 
+  [ Lionel Le Folgoc ]
+  * debian/exo-utils.manpages: added.
+  * debian/control: b-deps on debhelper >= 7.0.50~.
+  * debian/rules: switch to rules.tiny + overrides.
+  * debian/compat: bump to 7.
+
  -- Lionel Le Folgoc <mrpouit at gmail.com>  Tue, 11 May 2010 21:44:39 +0200
 
 exo (0.3.106-2) unstable; urgency=low

Modified: desktop/branches/experimental/exo/debian/compat
===================================================================
--- desktop/branches/experimental/exo/debian/compat	2010-05-23 17:21:19 UTC (rev 4098)
+++ desktop/branches/experimental/exo/debian/compat	2010-05-24 11:31:39 UTC (rev 4099)
@@ -1 +1 @@
-5
+7

Modified: desktop/branches/experimental/exo/debian/control
===================================================================
--- desktop/branches/experimental/exo/debian/control	2010-05-23 17:21:19 UTC (rev 4098)
+++ desktop/branches/experimental/exo/debian/control	2010-05-24 11:31:39 UTC (rev 4099)
@@ -5,7 +5,7 @@
 Uploaders: 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>,
  Lionel Le Folgoc <mrpouit at gmail.com>
-Build-Depends: debhelper (>= 7), libxfce4util-dev, libxfce4ui-1-dev (>= 4.7.0),
+Build-Depends: debhelper (>= 7.0.50~), libxfce4util-dev, libxfce4ui-1-dev (>= 4.7.0),
  liburi-perl, chrpath, libhal-storage-dev [!hurd-i386], libnotify-dev,
  intltool
 Standards-Version: 3.8.4

Added: desktop/branches/experimental/exo/debian/exo-utils.manpages
===================================================================
--- desktop/branches/experimental/exo/debian/exo-utils.manpages	                        (rev 0)
+++ desktop/branches/experimental/exo/debian/exo-utils.manpages	2010-05-24 11:31:39 UTC (rev 4099)
@@ -0,0 +1,5 @@
+debian/exo-preferred-applications.1
+debian/exo-desktop-item-edit.1
+debian/exo-mount.1
+debian/exo-unmount.1
+debian/exo-eject.1

Modified: desktop/branches/experimental/exo/debian/patches/01_fix-treeview-gtk2.20.patch
===================================================================
--- desktop/branches/experimental/exo/debian/patches/01_fix-treeview-gtk2.20.patch	2010-05-23 17:21:19 UTC (rev 4098)
+++ desktop/branches/experimental/exo/debian/patches/01_fix-treeview-gtk2.20.patch	2010-05-24 11:31:39 UTC (rev 4099)
@@ -4,6 +4,12 @@
 Subject: Make the treeview work again with gtk 2.20 (bug #6230).
 
 ---
+Index: po/POTFILES.skip
+===================================================================
+--- a/po/POTFILES.skip    (revision 0)
++++ b/po/POTFILES.skip    (revision 0)
+@@ -0,0 +1 @@
++.pc/01_fix-treeview-gtk2.20.patch/exo/exo-tree-view.c
 diff --git a/exo/exo-tree-view.c b/exo/exo-tree-view.c
 index f7baa56..159f5b1 100644
 --- a/exo/exo-tree-view.c

Modified: desktop/branches/experimental/exo/debian/rules
===================================================================
--- desktop/branches/experimental/exo/debian/rules	2010-05-23 17:21:19 UTC (rev 4098)
+++ desktop/branches/experimental/exo/debian/rules	2010-05-24 11:31:39 UTC (rev 4099)
@@ -1,46 +1,23 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+LDFLAGS+=-Wl,-z,defs -Wl,--as-needed
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+	CFLAGS += -O0
+else
+	CFLAGS += -O2
+endif
 
 EXO_LIBNAME=1
 EXO_SOVERSION=0
 EXO_SONAME=libexo-$(EXO_LIBNAME)-$(EXO_SOVERSION)
 
-config.status: configure
-	dh_testdir
-	# Add here commands to configure the package.
-	 ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --sysconfdir=/etc --libexecdir=/usr/lib/$(EXO_SONAME) --disable-gtk-doc --disable-python --enable-notifications
+%:
+	dh $@
 
-build: build-stamp
-build-stamp:  config.status
-	dh_testdir
+override_dh_auto_configure:
+	dh_auto_configure -- --libexecdir=/usr/lib/$(EXO_SONAME) --disable-gtk-doc --disable-python --enable-notifications
 
-	# Add here commands to compile the package.
-	$(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_clean -k 
-	dh_installdirs
-
-	# Add here commands to install the package into debian/tmp
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
-
+override_dh_install:
 	# delete the unneeded .a and .la files
 	rm -f debian/tmp/usr/lib/libexo-hal-$(EXO_LIBNAME).la
 	rm -f debian/tmp/usr/lib/libexo-$(EXO_LIBNAME).la
@@ -64,32 +41,9 @@
 		<debian/tmp/usr/share/xfce4/helpers/mutt.desktop \
 		>debian/tmp/usr/share/xfce4/helpers/muttng.desktop
 
-# Build architecture-independent files here.
-binary-indep: build install
-
-# Build architecture-dependent files here.
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs ChangeLog
-	dh_installdocs
-	dh_installman -pexo-utils debian/exo-preferred-applications.1\
-		debian/exo-desktop-item-edit.1 debian/exo-mount.1 \
-		debian/exo-unmount.1 debian/exo-eject.1
-	dh_installexamples
 	dh_install --fail-missing --sourcedir=debian/tmp
-	dh_link
+
+override_dh_strip:
 	dh_strip -p $(EXO_SONAME) --dbg-package=$(EXO_SONAME)-dbg
 	dh_strip -p exo-utils --dbg-package=exo-utils-dbg
 	dh_strip --remaining-packages
-	dh_compress
-	dh_fixperms
-	dh_makeshlibs
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install

More information about the Pkg-xfce-commits mailing list