[Pkg-xfce-commits] r2260 - desktop/branches/svn-snapshots/xfce4-mixer/debian
corsac at alioth.debian.org
corsac at alioth.debian.org
Sun Aug 24 11:19:46 UTC 2008
Author: corsac
Date: 2008-08-24 11:19:43 +0000 (Sun, 24 Aug 2008)
New Revision: 2260
Added:
desktop/branches/svn-snapshots/xfce4-mixer/debian/xfce4-mixer.lintian-overrides
Removed:
desktop/branches/svn-snapshots/xfce4-mixer/debian/lintian-override
Modified:
desktop/branches/svn-snapshots/xfce4-mixer/debian/changelog
desktop/branches/svn-snapshots/xfce4-mixer/debian/rules
Log:
make package lintian clean, and revert to previous rules
Modified: desktop/branches/svn-snapshots/xfce4-mixer/debian/changelog
===================================================================
--- desktop/branches/svn-snapshots/xfce4-mixer/debian/changelog 2008-08-24 10:32:26 UTC (rev 2259)
+++ desktop/branches/svn-snapshots/xfce4-mixer/debian/changelog 2008-08-24 11:19:43 UTC (rev 2260)
@@ -3,10 +3,14 @@
* new upstream alpha release.
- drop the two packages -oss and -alsa.
* debian/rules:
- - switch to dh7 now that we only have one binary package.
+ - remove the two-variants build.
+ - use dh_lintian.
+ - remove call to quilt.
* debian/patches: all patches dropped.
+ * debian/control:
+ - drop build-dep on quilt.
- -- Yves-Alexis Perez <corsac at debian.org> Sun, 24 Aug 2008 12:24:07 +0200
+ -- Yves-Alexis Perez <corsac at debian.org> Sun, 24 Aug 2008 12:53:01 +0200
xfce4-mixer (4.4.2-3) unstable; urgency=low
Deleted: desktop/branches/svn-snapshots/xfce4-mixer/debian/lintian-override
===================================================================
--- desktop/branches/svn-snapshots/xfce4-mixer/debian/lintian-override 2008-08-24 10:32:26 UTC (rev 2259)
+++ desktop/branches/svn-snapshots/xfce4-mixer/debian/lintian-override 2008-08-24 11:19:43 UTC (rev 2260)
@@ -1,5 +0,0 @@
-# These are private libs so this isn't really evil
-xfce4-mixer binary: binary-or-shlib-defines-rpath ./usr/lib/xfce4/panel-plugins/libmixer.so /usr/lib/xfce4/modules
-xfce4-mixer binary: binary-or-shlib-defines-rpath ./usr/lib/xfce4/mcs-plugins/sound_settings.so /usr/lib/xfce4/modules
-xfce4-mixer binary: binary-or-shlib-defines-rpath ./usr/bin/xfce4-mixer /usr/lib/xfce4/modules
-xfce4-mixer binary: binary-or-shlib-defines-rpath ./usr/lib/xfce4/panel-plugins/xfce4-mixer-plugin /usr/lib/xfce4/modules
Modified: desktop/branches/svn-snapshots/xfce4-mixer/debian/rules
===================================================================
--- desktop/branches/svn-snapshots/xfce4-mixer/debian/rules 2008-08-24 10:32:26 UTC (rev 2259)
+++ desktop/branches/svn-snapshots/xfce4-mixer/debian/rules 2008-08-24 11:19:43 UTC (rev 2260)
@@ -1,3 +1,84 @@
#!/usr/bin/make -f
-%:
- dh $@
+
+DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
+
+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 --enable-final --libexecdir=\$${prefix}/lib
+
+ touch config.status
+
+build: build-stamp
+build-stamp: config.status
+
+ dh_testdir
+
+ $(MAKE)
+
+ touch build-stamp
+
+clean:
+
+ dh_testdir
+ dh_testroot
+ rm -f build-stamp config.status
+
+ [ ! -f Makefile ] || $(MAKE) distclean
+
+install: build
+
+ dh_testdir
+ dh_testroot
+ dh_clean -k
+ dh_installdirs
+
+ $(MAKE) install DESTDIR=$(CURDIR)/debian/xfce4-mixer
+
+ # install menu pixmap
+ install -d $(CURDIR)/debian/xfce4-mixer/usr/share/pixmaps
+ install -c -m 644 $(CURDIR)/debian/xfce4-mixer.xpm \
+ $(CURDIR)/debian/xfce4-mixer/usr/share/pixmaps
+
+
+ rm -f $(CURDIR)/debian/xfce4-mixer/usr/lib/xfce4/panel-plugins/*.la
+ rm -f $(CURDIR)/debian/xfce4-mixer/usr/lib/xfce4/panel-plugins/*.a
+ rm -f $(CURDIR)/debian/xfce4-mixer*/usr/lib/xfce4/modules/*.la
+ rm -f $(CURDIR)/debian/xfce4-mixer*/usr/lib/xfce4/modules/*.a
+
+binary-indep: build install
+binary-arch: build install
+
+ dh_testdir
+ dh_testroot
+
+ dh_installchangelogs ChangeLog
+ dh_installdocs README debian/NEWS.Debian
+ dh_installman debian/xfce4-mixer.1
+ dh_lintian
+
+ dh_strip
+ dh_compress
+
+ dh_fixperms
+ dh_installdeb
+
+ dh_shlibdeps -l$(CURDIR)/debian/xfce4-mixer/usr/lib/xfce4/modules/
+ dh_gencontrol -s
+
+ dh_md5sums -s
+ dh_builddeb -s
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install
Copied: desktop/branches/svn-snapshots/xfce4-mixer/debian/xfce4-mixer.lintian-overrides (from rev 2259, desktop/branches/svn-snapshots/xfce4-mixer/debian/lintian-override)
===================================================================
--- desktop/branches/svn-snapshots/xfce4-mixer/debian/xfce4-mixer.lintian-overrides (rev 0)
+++ desktop/branches/svn-snapshots/xfce4-mixer/debian/xfce4-mixer.lintian-overrides 2008-08-24 11:19:43 UTC (rev 2260)
@@ -0,0 +1,5 @@
+# These are private libs so this isn't really evil
+xfce4-mixer binary: binary-or-shlib-defines-rpath ./usr/lib/xfce4/panel-plugins/libmixer.so /usr/lib/xfce4/modules
+xfce4-mixer binary: binary-or-shlib-defines-rpath ./usr/lib/xfce4/mcs-plugins/sound_settings.so /usr/lib/xfce4/modules
+xfce4-mixer binary: binary-or-shlib-defines-rpath ./usr/bin/xfce4-mixer /usr/lib/xfce4/modules
+xfce4-mixer binary: binary-or-shlib-defines-rpath ./usr/lib/xfce4/panel-plugins/xfce4-mixer-plugin /usr/lib/xfce4/modules
Property changes on: desktop/branches/svn-snapshots/xfce4-mixer/debian/xfce4-mixer.lintian-overrides
___________________________________________________________________
Name: svn:mergeinfo
+
More information about the Pkg-xfce-commits
mailing list