rpms/alsamixergui/devel alsamixergui.spec, 1.8, 1.9 alsamixergui_0.9.0rc2-1-9.diff, 1.1, 1.2

Mon Aug 17 18:18:14 UTC 2009

Author: spot

Update of /cvs/pkgs/rpms/alsamixergui/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10538

Modified Files:
	alsamixergui.spec alsamixergui_0.9.0rc2-1-9.diff 
Log Message:
fix debian patch so that it applies


Index: alsamixergui.spec
===================================================================
RCS file: /cvs/pkgs/rpms/alsamixergui/devel/alsamixergui.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9

--- alsamixergui.spec	17 Aug 2009 17:44:51 -0000	1.8
+++ alsamixergui.spec	17 Aug 2009 18:18:13 -0000	1.9
@@ -1,7 +1,7 @@
 Name:		alsamixergui
 Summary: 	GUI mixer for ALSA sound devices
 Version:	0.9.0
-Release:	0.7.rc2%{?dist}
+Release:	0.8.rc2%{?dist}
 License:	GPLv2+
 Group:		Applications/System
 # This is where the source used to live, but this upstream is dead.
@@ -57,6 +57,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/pixmaps/alsamixergui.png
 
 %changelog
+* Mon Aug 17 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 0.9.0-0.8.rc2
+- fix debian patch to apply (i swear, it applied just a second ago)
+
 * Mon Aug 17 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 0.9.0-0.7.rc2
 - update to rc2, last known update
 

alsamixergui_0.9.0rc2-1-9.diff:
 COPYING                     |  340 ++
 INSTALL                     |  229 +
 Makefile.in                 |  497 +++
 aclocal.m4                  | 1005 +++++++
 configure                   | 5556 ++++++++++++++++++++++++++++++++++++++++++++
 configure.in                |    5 
 debian/alsamixergui.desktop |    8 
 debian/alsamixergui.sgml    |   29 
 debian/alsamixergui.xpm     |  139 +
 debian/changelog            |   75 
 debian/compat               |    1 
 debian/control              |   24 
 debian/copyright            |    2 
 debian/manpages             |    1 
 debian/menu                 |    5 
 debian/watch                |    3 
 depcomp                     |  411 +++
 install-sh                  |  294 ++
 missing                     |  336 ++
 mkinstalldirs               |  111 
 src/Fl_AM.cxx               |    2 
 src/Fl_Pixmap_Button.H      |    2 
 src/Makefile.in             |  427 +++
 src/alsamixer.cxx           |   13 
 src/config.h.in             |   70 
 src/stamp-h                 |    1 
 src/stamp-h.in              |    1 
 27 files changed, 9549 insertions(+), 38 deletions(-)

Index: alsamixergui_0.9.0rc2-1-9.diff
===================================================================
RCS file: /cvs/pkgs/rpms/alsamixergui/devel/alsamixergui_0.9.0rc2-1-9.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- alsamixergui_0.9.0rc2-1-9.diff	17 Aug 2009 17:44:51 -0000	1.1
+++ alsamixergui_0.9.0rc2-1-9.diff	17 Aug 2009 18:18:13 -0000	1.2
@@ -220,113 +220,6 @@
 +?package(alsamixergui):needs="X11" section="Apps/Sound"\
 +  title="Alsamixergui" command="/usr/bin/alsamixergui" \
 +  icon="/usr/share/pixmaps/alsamixergui.xpm"
---- alsamixergui-0.9.0rc2-1.orig/debian/rules
-+++ alsamixergui-0.9.0rc2-1/debian/rules
-@@ -1,5 +1,4 @@
- #!/usr/bin/make -f
--
- # rules
- #
- # Robert Jordens <rjo at gmx.de>
-@@ -7,87 +6,20 @@
- # This software may be used and distributed according to the terms
- # of the GNU General Public License, incorporated herein by reference.
- #
--# $Id$
--
--# Uncomment this to turn on verbose mode.
--#export DH_VERBOSE=1
--
--# This is the debhelper compatibility version to use.
--export DH_COMPAT=3
--
--# These are used for cross-compiling and for saving the configure script
--# from having to guess our platform (since we know it already)
--DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
--DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
--
--
--ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
--	CFLAGS += -g
--endif
--ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
--	INSTALL_PROGRAM += -s
--endif
--
--configure: Makefile.am
--	-rm -f aclocal.m4 INSTALL COPYING install-sh Makefile.in configure \
--		missing mkinstalldirs src/config.h.in src/Makefile.in \
--		src/stamp-h.in config.h.in
--	aclocal
--	automake --add-missing --copy
--	autoheader
--	autoconf
-+# $Id$
-+#
- 
--config.status: configure
--	dh_testdir
--	./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info 
-+include /usr/share/cdbs/1/class/autotools.mk
-+include /usr/share/cdbs/1/rules/debhelper.mk
- 
--build: build-stamp
-+common-binary-post-install-arch::
-+	dh_buildinfo
-+	dh_install debian/alsamixergui.desktop usr/share/applications
-+	dh_install debian/alsamixergui.xpm usr/share/pixmaps
- 
--build-stamp:  config.status
--	dh_testdir
--	$(MAKE)
-+build/alsamixergui::
- 	/usr/bin/docbook-to-man debian/alsamixergui.sgml > debian/alsamixergui.1
--	touch build-stamp
--
--clean: 
--	dh_testdir
--	dh_testroot
--	rm -f build-stamp debian/alsamixergui.1
--	-$(MAKE) distclean
--	dh_clean
--
--install: build
--	dh_testdir
--	dh_testroot
--	dh_clean -k
--	dh_installdirs
--	$(MAKE) install prefix=$(CURDIR)/debian/alsamixergui/usr
--
--# Build architecture-independent files here.
--binary-indep: build install
--# We have nothing to do by default.
- 
--# Build architecture-dependent files here.
--binary-arch: build install
--	dh_testdir
--	dh_testroot
--#	dh_installdebconf	
--	dh_installdocs
--	dh_installexamples
--	dh_installmenu
--	dh_installman debian/alsamixergui.1
--	dh_installinfo
--#	dh_undocumented
--	dh_installchangelogs ChangeLog
--	dh_link
--	dh_strip
--	dh_compress
--	dh_fixperms
--	dh_installdeb
--	dh_shlibdeps
--	dh_gencontrol
--	dh_md5sums
--	dh_builddeb
-+clean::
-+	-rm -f debian/alsamixergui.1
- 
--binary: binary-indep binary-arch
--.PHONY: build clean binary-indep binary-arch binary install 
 --- alsamixergui-0.9.0rc2-1.orig/debian/compat
 +++ alsamixergui-0.9.0rc2-1/debian/compat
 @@ -0,0 +1 @@


