[Pkg-xfce-commits] r641 - in desktop/trunk: xfce4-mixer/debian xfdesktop4/debian

[Simon Huggins]

Author: huggie
Date: 2006-05-13 19:31:41 +0000 (Sat, 13 May 2006)
New Revision: 641

Modified:
   desktop/trunk/xfce4-mixer/debian/changelog
   desktop/trunk/xfce4-mixer/debian/rules
   desktop/trunk/xfdesktop4/debian/changelog
   desktop/trunk/xfdesktop4/debian/rules
Log:
Fixup libexecdir for the panel plugins.


Modified: desktop/trunk/xfce4-mixer/debian/changelog
===================================================================
--- desktop/trunk/xfce4-mixer/debian/changelog	2006-05-13 18:32:11 UTC (rev 640)
+++ desktop/trunk/xfce4-mixer/debian/changelog	2006-05-13 19:31:41 UTC (rev 641)
@@ -1,9 +1,12 @@
 xfce4-mixer (4.3.90.1-2) UNRELEASED; urgency=low
 
-  * Removed circular dependency between xfce4-mixer and xfce4-mixer-(alsa|oss)
-  * Removed explicit dependency on xfce4-panel (handled by shlibs)
+  (Yves-Alexis Perez)
+   * Removed circular dependency between xfce4-mixer and xfce4-mixer-(alsa|oss)
+   * Removed explicit dependency on xfce4-panel (handled by shlibs)
+  (Simon Huggins)
+   * Make libexedir be /usr/lib
 
- -- Yves-Alexis Perez <corsac at corsac.net>  Wed, 10 May 2006 15:22:03 +0200
+ -- Yves-Alexis Perez <corsac at corsac.net>  Sat, 13 May 2006 20:31:26 +0100
 
 xfce4-mixer (4.3.90.1-1) unstable; urgency=low
 

Modified: desktop/trunk/xfce4-mixer/debian/rules
===================================================================
--- desktop/trunk/xfce4-mixer/debian/rules	2006-05-13 18:32:11 UTC (rev 640)
+++ desktop/trunk/xfce4-mixer/debian/rules	2006-05-13 19:31:41 UTC (rev 641)
@@ -19,7 +19,7 @@
 	for variant in alsa oss; do \
 	mkdir $(CURDIR)/debian/build-$$variant && \
 	cd $(CURDIR)/debian/build-$$variant && \
-	$(CURDIR)/configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --enable-final --with-sound=$$variant;\
+	$(CURDIR)/configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --enable-final --libexecdir=/usr/lib --with-sound=$$variant;\
 	done
 
 	touch config.status

Modified: desktop/trunk/xfdesktop4/debian/changelog
===================================================================
--- desktop/trunk/xfdesktop4/debian/changelog	2006-05-13 18:32:11 UTC (rev 640)
+++ desktop/trunk/xfdesktop4/debian/changelog	2006-05-13 19:31:41 UTC (rev 641)
@@ -1,3 +1,9 @@
+xfdesktop4 (4.3.90.1-2) unstable; urgency=low
+
+  * Use the correct libexec dir.
+  
+ -- Simon Huggins <huggie at earth.li>  Sat, 13 May 2006 18:47:19 +0100
+
 xfdesktop4 (4.3.90.1-1) unstable; urgency=low
 
   * New upstream release

Modified: desktop/trunk/xfdesktop4/debian/rules
===================================================================
--- desktop/trunk/xfdesktop4/debian/rules	2006-05-13 18:32:11 UTC (rev 640)
+++ desktop/trunk/xfdesktop4/debian/rules	2006-05-13 19:31:41 UTC (rev 641)
@@ -14,7 +14,7 @@
 config.status: configure
 	
 	dh_testdir
-	./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --sysconfdir=/etc --mandir=/usr/share/man --disable-rpath --enable-final
+	./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --sysconfdir=/etc --mandir=/usr/share/man --disable-rpath --libexecdir=/usr/lib --enable-final
 
 build: build-stamp
 build-stamp: config.status