[Pkg-xfce-commits] r4024 - desktop/trunk/xfce4-panel/debian

Yves-Alexis Perez corsac at alioth.debian.org
Sat May 22 01:53:37 UTC 2010 

Author: corsac
Date: 2010-05-22 13:53:36 +0000 (Sat, 22 May 2010)
New Revision: 4024

Added:
   desktop/trunk/xfce4-panel/debian/docs
   desktop/trunk/xfce4-panel/debian/xfce4-panel.manpages
Modified:
   desktop/trunk/xfce4-panel/debian/changelog
   desktop/trunk/xfce4-panel/debian/control
   desktop/trunk/xfce4-panel/debian/rules
   desktop/trunk/xfce4-panel/debian/xfce4-panel.install
Log:
* debian/rules:
  - switch to debhelper 7.
* debian/control:
  - update standards version to 3.8.4.
  - update debhelper build-dep for overrides.

Modified: desktop/trunk/xfce4-panel/debian/changelog
===================================================================
--- desktop/trunk/xfce4-panel/debian/changelog	2010-05-22 13:28:08 UTC (rev 4023)
+++ desktop/trunk/xfce4-panel/debian/changelog	2010-05-22 13:53:36 UTC (rev 4024)
@@ -8,8 +8,13 @@
   * debian/xfce4-panel.shlibs
     - conflicts against development panel.
   * Switch to 3.0 (quilt) source format.
+  * debian/rules:
+    - switch to debhelper 7.
+  * debian/control:
+    - update standards version to 3.8.4.
+    - update debhelper build-dep for overrides.
 
- -- Yves-Alexis Perez <corsac at debian.org>  Sat, 22 May 2010 15:26:37 +0200
+ -- Yves-Alexis Perez <corsac at debian.org>  Sat, 22 May 2010 15:33:37 +0200
 
 xfce4-panel (4.6.3-1) unstable; urgency=low
 

Modified: desktop/trunk/xfce4-panel/debian/control
===================================================================
--- desktop/trunk/xfce4-panel/debian/control	2010-05-22 13:28:08 UTC (rev 4023)
+++ desktop/trunk/xfce4-panel/debian/control	2010-05-22 13:53:36 UTC (rev 4024)
@@ -3,11 +3,11 @@
 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), libgtk2.0-dev (>= 2.10.6), bison,
+Build-Depends: debhelper (>= 7.0.50~), libgtk2.0-dev (>= 2.10.6), bison,
  libxft-dev, libxml2-dev, chrpath, libxfce4util-dev (>= 4.6.0),
  libxfcegui4-dev (>= 4.6.0), libexo-0.3-dev (>= 0.3.100), libwnck-dev,
  libxml-parser-perl, intltool
-Standards-Version: 3.8.3
+Standards-Version: 3.8.4
 Homepage: http://www.xfce.org/
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/xfce4-panel/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/xfce4-panel/

Added: desktop/trunk/xfce4-panel/debian/docs
===================================================================
--- desktop/trunk/xfce4-panel/debian/docs	                        (rev 0)
+++ desktop/trunk/xfce4-panel/debian/docs	2010-05-22 13:53:36 UTC (rev 4024)
@@ -0,0 +1,2 @@
+NEWS
+README

Modified: desktop/trunk/xfce4-panel/debian/rules
===================================================================
--- desktop/trunk/xfce4-panel/debian/rules	2010-05-22 13:28:08 UTC (rev 4023)
+++ desktop/trunk/xfce4-panel/debian/rules	2010-05-22 13:53:36 UTC (rev 4024)
@@ -3,11 +3,7 @@
 #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)
-
 LDFLAGS+=-Wl,-z,defs -Wl,--as-needed
-CFLAGS = -Wall -g
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
 	CFLAGS += -O0
@@ -15,41 +11,7 @@
 	CFLAGS += -O2
 endif
 
-config.status: configure
-	
-	dh_testdir
-	./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --sysconfdir=/etc --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --enable-final --libexecdir=\$${prefix}/lib
-
-build: build-stamp
-build-stamp: config.status
-	
-	dh_testdir
-	$(MAKE)
-	touch build-stamp
-
-clean:
-	
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp 
-	
-	[ ! -f Makefile ] || $(MAKE) distclean
-	
-	dh_clean
-
-install: build
-	
-	dh_testdir
-	dh_testroot
-	dh_prep
-	dh_installdirs
-
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
-
-	install -d $(CURDIR)/debian/tmp/usr/share/man/man1
-	install $(CURDIR)/debian/xfce4-panel.1 $(CURDIR)/debian/tmp/usr/share/man/man1
-	install $(CURDIR)/debian/xfce4-popup-windowlist.1 $(CURDIR)/debian/tmp/usr/share/man/man1
-
+override_dh_install:
 	perl -i -pe 's/Exec=Terminal/Exec=exo-open --launch TerminalEmulator/' $(CURDIR)/debian/tmp/etc/xdg/xfce4/panel/launcher*
 	rm -f $(CURDIR)/debian/tmp/etc/xdg/xfce4/panel/launcher-8.rc
 	sed -i '/<item name=\"launcher\" id=\"8\"\/>/d' $(CURDIR)/debian/tmp/etc/xdg/xfce4/panel/panels.xml
@@ -60,35 +22,15 @@
 	rm -f $(CURDIR)/debian/tmp/usr/lib/xfce4/mcs-plugins/*.a
 	rm -f $(CURDIR)/debian/tmp/usr/lib/libxfce4panel.la
 
-	dh_lintian
-
 	chrpath -d -k $(CURDIR)/debian/tmp/usr/bin/xfce4-panel \
 		$(CURDIR)/debian/tmp/usr/bin/xfce4-popup-windowlist \
 		$(CURDIR)/debian/tmp/usr/lib/xfce4/*/* \
 		$(CURDIR)/debian/tmp/usr/lib/libxfce4panel.so.*1
 
-binary-indep: build install
-binary-arch: build install
-	
-	dh_testdir
-	dh_testroot
-	
 	dh_install --fail-missing --sourcedir=debian/tmp
-	
-	dh_installchangelogs ChangeLog
-	dh_installdocs NEWS README
-	
+
+override_dh_strip:
 	dh_strip --dbg-package=xfce4-panel-dbg
-	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/trunk/xfce4-panel/debian/xfce4-panel.install
===================================================================
--- desktop/trunk/xfce4-panel/debian/xfce4-panel.install	2010-05-22 13:28:08 UTC (rev 4023)
+++ desktop/trunk/xfce4-panel/debian/xfce4-panel.install	2010-05-22 13:53:36 UTC (rev 4024)
@@ -6,4 +6,3 @@
 usr/share/icons/hicolor/
 usr/share/locale/
 usr/share/xfce4/
-usr/share/man/

Added: desktop/trunk/xfce4-panel/debian/xfce4-panel.manpages
===================================================================
--- desktop/trunk/xfce4-panel/debian/xfce4-panel.manpages	                        (rev 0)
+++ desktop/trunk/xfce4-panel/debian/xfce4-panel.manpages	2010-05-22 13:53:36 UTC (rev 4024)
@@ -0,0 +1,2 @@
+debian/xfce4-panel.1
+debian/xfce4-popup-windowlist.1

More information about the Pkg-xfce-commits mailing list