[Pkg-xfce-commits] r2261 - desktop/branches/svn-snapshots/xfce4-panel/debian

corsac at alioth.debian.org corsac at alioth.debian.org
Sun Aug 24 12:00:08 UTC 2008


Author: corsac
Date: 2008-08-24 12:00:07 +0000 (Sun, 24 Aug 2008)
New Revision: 2261

Added:
   desktop/branches/svn-snapshots/xfce4-panel/debian/xfce4-panel.lintian-overrides
Removed:
   desktop/branches/svn-snapshots/xfce4-panel/debian/lintian
Modified:
   desktop/branches/svn-snapshots/xfce4-panel/debian/changelog
   desktop/branches/svn-snapshots/xfce4-panel/debian/compat
   desktop/branches/svn-snapshots/xfce4-panel/debian/control
   desktop/branches/svn-snapshots/xfce4-panel/debian/rules
   desktop/branches/svn-snapshots/xfce4-panel/debian/xfce4-panel.install
Log:
make package lintian ~clean


Modified: desktop/branches/svn-snapshots/xfce4-panel/debian/changelog
===================================================================
--- desktop/branches/svn-snapshots/xfce4-panel/debian/changelog	2008-08-24 11:19:43 UTC (rev 2260)
+++ desktop/branches/svn-snapshots/xfce4-panel/debian/changelog	2008-08-24 12:00:07 UTC (rev 2261)
@@ -3,8 +3,14 @@
   * New upstream alpha release.
   * debian/rules:
     - fail if dh_install misses files.
+    - don't mess with config.{guess,sub} anymore.
+    - call dh_lintian
+    - don't use quilt rules.
+  * debian/control:
+    - drop build-dep on quilt.
+    - update build-dep on debhelper for dh_lintian support. 
 
- -- Yves-Alexis Perez <corsac at debian.org>  Sun, 24 Aug 2008 01:04:10 +0200
+ -- Yves-Alexis Perez <corsac at debian.org>  Sun, 24 Aug 2008 13:56:00 +0200
 
 xfce4-panel (4.4.2-6) unstable; urgency=low
 

Modified: desktop/branches/svn-snapshots/xfce4-panel/debian/compat
===================================================================
--- desktop/branches/svn-snapshots/xfce4-panel/debian/compat	2008-08-24 11:19:43 UTC (rev 2260)
+++ desktop/branches/svn-snapshots/xfce4-panel/debian/compat	2008-08-24 12:00:07 UTC (rev 2261)
@@ -1 +1 @@
-5
+6

Modified: desktop/branches/svn-snapshots/xfce4-panel/debian/control
===================================================================
--- desktop/branches/svn-snapshots/xfce4-panel/debian/control	2008-08-24 11:19:43 UTC (rev 2260)
+++ desktop/branches/svn-snapshots/xfce4-panel/debian/control	2008-08-24 12:00:07 UTC (rev 2261)
@@ -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 (>> 5.0.0), libgtk2.0-dev (>= 2.10.6), bison, libxft-dev, libxml2-dev, chrpath, quilt, libxfce4util-dev (>= 4.5.80), libxfcegui4-dev (>= 4.5.80), libexo-0.3-dev (>= 0.3.80), libwnck-dev
+Build-Depends: debhelper (>> 6.0.7), libgtk2.0-dev (>= 2.10.6), bison, libxft-dev, libxml2-dev, chrpath, libxfce4util-dev (>= 4.5.80), libxfcegui4-dev (>= 4.5.80), libexo-0.3-dev (>= 0.3.80), libwnck-dev
 Standards-Version: 3.8.0
 Homepage: http://www.xfce.org/
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/xfce4-panel/

Deleted: desktop/branches/svn-snapshots/xfce4-panel/debian/lintian
===================================================================
--- desktop/branches/svn-snapshots/xfce4-panel/debian/lintian	2008-08-24 11:19:43 UTC (rev 2260)
+++ desktop/branches/svn-snapshots/xfce4-panel/debian/lintian	2008-08-24 12:00:07 UTC (rev 2261)
@@ -1,2 +0,0 @@
-#Panel includes its library
-xfce4-panel: package-name-doesnt-match-sonames libxfce4panel1

Modified: desktop/branches/svn-snapshots/xfce4-panel/debian/rules
===================================================================
--- desktop/branches/svn-snapshots/xfce4-panel/debian/rules	2008-08-24 11:19:43 UTC (rev 2260)
+++ desktop/branches/svn-snapshots/xfce4-panel/debian/rules	2008-08-24 12:00:07 UTC (rev 2261)
@@ -1,5 +1,5 @@
 #!/usr/bin/make -f
-include /usr/share/quilt/quilt.make
+#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)
@@ -12,7 +12,7 @@
 	CFLAGS += -O2
 endif
 
-config.status: patch configure
+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
@@ -24,7 +24,7 @@
 	$(MAKE)
 	touch build-stamp
 
-clean: unpatch
+clean:
 	
 	dh_testdir
 	dh_testroot
@@ -32,13 +32,6 @@
 	
 	[ ! -f Makefile ] || $(MAKE) distclean
 	
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
-	cp -f /usr/share/misc/config.sub config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
-	cp -f /usr/share/misc/config.guess config.guess
-endif
-
 	dh_clean
 
 install: build
@@ -63,13 +56,8 @@
 	rm -f $(CURDIR)/debian/tmp/usr/lib/xfce4/mcs-plugins/*.a
 	rm -f $(CURDIR)/debian/tmp/usr/lib/libxfce4panel.la
 
-	install -D -p -o root -g root -m 644 $(CURDIR)/debian/lintian \
-	$(CURDIR)/debian/tmp/usr/share/lintian/overrides/xfce4-panel
+	dh_lintian
 
-	#we don't need no empty files in our packages !
-	rm -f $(CURDIR)/debian/tmp/usr/bin/xftaskbar4
-	rm -f $(CURDIR)/debian/tmp/usr/bin/xfce4-iconbox
-
 	chrpath -d -k $(CURDIR)/debian/tmp/usr/bin/xfce4-panel \
 		$(CURDIR)/debian/tmp/usr/bin/xfce4-popup-windowlist \
 		$(CURDIR)/debian/tmp/usr/lib/xfce4/*/* \

Modified: desktop/branches/svn-snapshots/xfce4-panel/debian/xfce4-panel.install
===================================================================
--- desktop/branches/svn-snapshots/xfce4-panel/debian/xfce4-panel.install	2008-08-24 11:19:43 UTC (rev 2260)
+++ desktop/branches/svn-snapshots/xfce4-panel/debian/xfce4-panel.install	2008-08-24 12:00:07 UTC (rev 2261)
@@ -4,7 +4,6 @@
 etc/
 usr/share/applications/
 usr/share/icons/hicolor/
-usr/share/lintian
 usr/share/locale/
 usr/share/xfce4/
 usr/share/man/

Copied: desktop/branches/svn-snapshots/xfce4-panel/debian/xfce4-panel.lintian-overrides (from rev 2259, desktop/branches/svn-snapshots/xfce4-panel/debian/lintian)
===================================================================
--- desktop/branches/svn-snapshots/xfce4-panel/debian/xfce4-panel.lintian-overrides	                        (rev 0)
+++ desktop/branches/svn-snapshots/xfce4-panel/debian/xfce4-panel.lintian-overrides	2008-08-24 12:00:07 UTC (rev 2261)
@@ -0,0 +1,2 @@
+#Panel includes its library
+xfce4-panel: package-name-doesnt-match-sonames libxfce4panel1


Property changes on: desktop/branches/svn-snapshots/xfce4-panel/debian/xfce4-panel.lintian-overrides
___________________________________________________________________
Name: svn:mergeinfo
   + 




More information about the Pkg-xfce-commits mailing list