[Pkg-wmaker-commits] [wmmixer] 14/24: Import Debian changes 1.5-8

[Doug Torrance]

This is an automated email from the git hooks/post-receive script.

dtorrance-guest pushed a commit to branch master
in repository wmmixer.

commit dda64644ed93c2c460c355a01edf98557576df87
Author: Matej Vela <vela at debian.org>
Date:   Mon Jun 18 21:24:01 2007 +0200

    Import Debian changes 1.5-8
    
    wmmixer (1.5-8) unstable; urgency=medium
    
      * QA upload.
      * Acknowledge NMU.  Closes: #174899.
      * xhandler.cc: Initialize `icon_list_'.  Thanks to Florent Bayle for
        the patch.  Closes: #429509.
      * Remove no longer necessary build dependency on x-dev.
      * Switch to debhelper 5.
      * debian/rules:
        - Add support for DEB_BUILD_OPTIONS=noopt.
        - Remove support for DEB_BUILD_OPTIONS=debug.
        - Let dh_strip handle DEB_BUILD_OPTION=nostrip.
      * Conforms to Standards version 3.7.2.
---
 debian/changelog | 16 ++++++++++++++++
 debian/compat    |  1 +
 debian/control   |  4 ++--
 debian/rules     | 43 +++++++++++++++----------------------------
 xhandler.cc      |  1 +
 5 files changed, 35 insertions(+), 30 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 866cd0a..c8f2cfc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+wmmixer (1.5-8) unstable; urgency=medium
+
+  * QA upload.
+  * Acknowledge NMU.  Closes: #174899.
+  * xhandler.cc: Initialize `icon_list_'.  Thanks to Florent Bayle for
+    the patch.  Closes: #429509.
+  * Remove no longer necessary build dependency on x-dev.
+  * Switch to debhelper 5.
+  * debian/rules:
+    - Add support for DEB_BUILD_OPTIONS=noopt.
+    - Remove support for DEB_BUILD_OPTIONS=debug.
+    - Let dh_strip handle DEB_BUILD_OPTION=nostrip.
+  * Conforms to Standards version 3.7.2.
+
+ -- Matej Vela <vela at debian.org>  Mon, 18 Jun 2007 21:24:01 +0200
+
 wmmixer (1.5-7) unstable; urgency=low
 
   * Orphan package, set maintainer to Debian QA Group
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..7ed6ff8
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+5
diff --git a/debian/control b/debian/control
index 12a2cae..c17b969 100644
--- a/debian/control
+++ b/debian/control
@@ -1,9 +1,9 @@
 Source: wmmixer
 Section: x11
 Priority: optional
-Build-Depends: debhelper (>> 3.0.0), libx11-dev, libxext-dev, libxpm-dev, x-dev
+Build-Depends: debhelper (>= 5), libx11-dev, libxext-dev, libxpm-dev
 Maintainer: Debian QA Group <packages at qa.debian.org>
-Standards-Version: 3.5.6
+Standards-Version: 3.7.2
 
 Package: wmmixer
 Architecture: any
diff --git a/debian/rules b/debian/rules
index b948c55..9ae6393 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,54 +4,44 @@
 # GNU copyright 1998 by Marcelo Magallon.
 # GNU copyright 1997 by Joey Hess.
 
-package=wmmixer
-
 #export DH_VERBOSE=1
-export DH_COMPAT=4
-
-CXXFLAGS= -Wall -O
-INSTALL = install
-INSTALL_FILE    = $(INSTALL) -D -p    -o root -g root  -m  644
-INSTALL_PROGRAM = $(INSTALL) -D -p    -o root -g root  -m  755
 
-ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
-  CXXFLAGS += -g
-endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-  INSTALL_PROGRAM += -s
+CXXFLAGS = -Wall -g
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+  CXXFLAGS += -O0
+else
+  CXXFLAGS += -O2
 endif
 
-build: stamp-build
-
-stamp-build:
+build: build-stamp
+build-stamp:
 	dh_testdir
 	$(MAKE) CXXFLAGS="$(CXXFLAGS)"
-	touch stamp-build
+	touch build-stamp
 
 clean:
 	dh_testdir
 	dh_testroot
-	-rm -f stamp-build
-	-$(MAKE) clean
+	rm -f build-stamp
+	$(MAKE) clean
 	dh_clean
 
-install:
+install: build
 	dh_testdir
 	dh_testroot
 	dh_clean -k
 	dh_installdirs
-	$(MAKE) INSTALL_PROGRAM="$(INSTALL_PROGRAM)" prefix=/usr DESTDIR=$(CURDIR)/debian/wmmixer install
+	$(MAKE) prefix=/usr DESTDIR=$(CURDIR)/debian/wmmixer install
 
 binary-indep: build install
 
 binary-arch: build install
 	dh_testdir
 	dh_testroot
+	dh_installchangelogs CHANGES
 	dh_installdocs README
 	dh_installexamples home.wmmixer
 	dh_installmenu
-	dh_installman
-	dh_installchangelogs CHANGES
 	dh_strip
 	dh_compress
 	dh_fixperms
@@ -61,8 +51,5 @@ binary-arch: build install
 	dh_md5sums
 	dh_builddeb
 
-binary:	binary-indep binary-arch
-
-.PHONY: binary binary-arch binary-indep build clean install
-
-
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install
diff --git a/xhandler.cc b/xhandler.cc
index 652335d..9c2a7b9 100644
--- a/xhandler.cc
+++ b/xhandler.cc
@@ -24,6 +24,7 @@ XHandler::XHandler()
   strcpy(backcolor_name_, BACKCOLOR);
 
   button_state_ = 0;
+  icon_list_ = NULL;
 }
 
 //--------------------------------------------------------------------

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmmixer.git