[Pkg-wmaker-commits] [wmmixer] 18/24: Import Debian changes 1.5-12

Doug Torrance dtorrance-guest at moszumanska.debian.org
Sun Aug 27 13:12:53 UTC 2017


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

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

commit 52dccc6f25b4551c55b5710eb490ec6ab7743fa3
Author: Rodolfo García Peñas (kix) <kix at kix.es>
Date:   Fri Apr 8 23:38:05 2011 +0200

    Import Debian changes 1.5-12
    
    wmmixer (1.5-12) unstable; urgency=low
    
      * Support multiple config files and X Classes [Closes: #454286]
      * Debian standards version moved to 3.9.2 (from 3.8.0) and compatibility to 7
      * deleted README.source
      * dpatch removed
      * Hurd support
      * Switch to dpkg-source 3.0 (quilt) format
      * Package adoption. New Maintainer [Closes: #490739]
---
 debian/README.source                               |  4 -
 debian/changelog                                   | 12 +++
 debian/compat                                      |  2 +-
 debian/control                                     |  9 +-
 debian/copyright                                   |  2 +-
 debian/patches/00list                              |  1 -
 ..._code.dpatch => 01_restore_pristine_code.patch} |  9 +-
 debian/patches/02_multiple_config_files.patch      | 96 ++++++++++++++++++++++
 debian/patches/03_hurd_support.patch               | 13 +++
 debian/patches/04_xclass_support.patch             | 88 ++++++++++++++++++++
 debian/patches/05_debian_paths.patch               | 17 ++++
 debian/patches/06_Makefile_optimization.patch      | 19 +++++
 debian/patches/series                              |  6 ++
 debian/rules                                       | 57 +------------
 debian/source/format                               |  1 +
 debian/stamp-patched                               |  0
 debian/watch                                       |  2 +
 debian/wmmixer.changelogs                          |  1 +
 debian/wmmixer.docs                                |  1 +
 debian/wmmixer.examples                            |  1 +
 20 files changed, 269 insertions(+), 72 deletions(-)

diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index 0d0aa40..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,4 +0,0 @@
-This package uses dpatch to handle patches against upstream source code; you
-can find additional information about dpatch at
-
-    /usr/share/doc/dpatch/
diff --git a/debian/changelog b/debian/changelog
index 671a918..1272e74 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+wmmixer (1.5-12) unstable; urgency=low
+
+  * Support multiple config files and X Classes [Closes: #454286]
+  * Debian standards version moved to 3.9.2 (from 3.8.0) and compatibility to 7
+  * deleted README.source
+  * dpatch removed
+  * Hurd support
+  * Switch to dpkg-source 3.0 (quilt) format
+  * Package adoption. New Maintainer [Closes: #490739]
+
+ -- Rodolfo García Peñas (kix) <kix at kix.es>  Sun, 8 Apr 2011 23:38:05 +0200
+
 wmmixer (1.5-11) unstable; urgency=low
 
   * QA upload.
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+7
diff --git a/debian/control b/debian/control
index b504d70..1c408bf 100644
--- a/debian/control
+++ b/debian/control
@@ -1,13 +1,14 @@
 Source: wmmixer
 Section: x11
 Priority: optional
-Maintainer: Debian QA Group <packages at qa.debian.org>
-Build-Depends: debhelper (>= 5), libx11-dev, libxext-dev, libxpm-dev, dpatch
-Standards-Version: 3.8.0
+Maintainer: Rodolfo García Peñas (kix) <kix at kix.es>
+Build-Depends: debhelper (>= 7), libx11-dev, libxext-dev, libxpm-dev
+Standards-Version: 3.9.2
+Homepage: http://www.dockapps.org/
 
 Package: wmmixer
 Architecture: any
-Depends: ${shlibs:Depends}, oss-compat
+Depends: ${shlibs:Depends}, ${misc:Depends}, oss-compat
 Suggests: wmaker | afterstep
 Description: mixer application designed for WindowMaker
  There's  nothing in the  program that  makes it  require WindowMaker,
diff --git a/debian/copyright b/debian/copyright
index fbac875..8912bb0 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -5,7 +5,7 @@ and Gordon Fraser <gordon at debian.org>
 
 It is now maintained by Sandro Tosi <matrixhasu at gmail.com>
 
-It was downloaded from http://freakzone.net/gordon/wmmixer-1.3.tar.gz
+It was downloaded from http://www.dockapps.org/
 
 Upstream Authors:
 
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index b91f055..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1 +0,0 @@
-01_restore_pristine_code
diff --git a/debian/patches/01_restore_pristine_code.dpatch b/debian/patches/01_restore_pristine_code.patch
similarity index 89%
rename from debian/patches/01_restore_pristine_code.dpatch
rename to debian/patches/01_restore_pristine_code.patch
index 7c9675c..bd2f800 100644
--- a/debian/patches/01_restore_pristine_code.dpatch
+++ b/debian/patches/01_restore_pristine_code.patch
@@ -1,11 +1,4 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_restore_pristine_code.dpatch by Sandro Tosi <matrixhasu at gmail.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: New patch generated from wmmixer 1.5-8 diff.gz
-
- at DPATCH@
-
+01_restore_pristine_code.dpatch by Sandro Tosi <matrixhasu at gmail.com>
 --- wmmixer-1.5.orig/README
 +++ wmmixer-1.5/README
 @@ -82,10 +82,10 @@
diff --git a/debian/patches/02_multiple_config_files.patch b/debian/patches/02_multiple_config_files.patch
new file mode 100644
index 0000000..f311fa5
--- /dev/null
+++ b/debian/patches/02_multiple_config_files.patch
@@ -0,0 +1,96 @@
+Rodolfo García Peñas (kix) <kix at kix.es> - Support for multiple config files
+--- a/wmmixer.cc
++++ b/wmmixer.cc
+@@ -3,6 +3,7 @@
+ // Release 1.5
+ // Copyright (C) 1998  Sam Hawker <shawkie at geocities.com>
+ // Copyright (C) 2002 Gordon Fraser <gordon at debian.org>
++// Patch added by Rodolfo (kix) Garcia <kix at kix.es> to select the config file
+ // This software comes with ABSOLUTELY NO WARRANTY
+ // This software is free software, and you are welcome to redistribute it
+ // under certain conditions
+@@ -234,10 +235,13 @@
+     {"led-highcolor",  1, NULL, 'L'},
+     {"back-color", 1, NULL, 'b'},
+     {"mix-device", 1, NULL, 'm'},
++    {"config-file", 1, NULL, 'c'},
+     {"scrollwheel",1, NULL, 'r'},
+     {NULL,         0, NULL, 0  }};
+   int i, opt_index = 0;
+-  
++
++  // init the config file name
++  snprintf(config_file_, CONFIGFILELEN -1, "%s/.wmmixer", getenv("HOME"));
+ 
+   // For backward compatibility
+   for(i=1; i<argc; i++) 
+@@ -256,7 +260,7 @@
+ 	}
+     }
+ 
+-  while ((i = getopt_long(argc, argv, "hvd:g:wasl:L:b:m:r:", long_opts, &opt_index)) != -1) 
++  while ((i = getopt_long(argc, argv, "hvd:g:wasl:L:b:m:c:r:", long_opts, &opt_index)) != -1)
+     {
+       switch (i) 
+ 	{
+@@ -295,6 +299,9 @@
+ 	case 'm':
+ 	  sprintf(mixer_device_, "%s", optarg);
+ 	  break;
++	case 'c':
++	  snprintf(config_file_, CONFIGFILELEN -1, "%s", optarg);
++	  break;
+ 	case 'r':
+ 	  if(atoi(optarg)>0)
+ 	    wheel_scroll_ = atoi(optarg);
+@@ -307,14 +314,12 @@
+ void WMMixer::readConfigurationFile()
+ {
+    FILE *rcfile;
+-   char rcfilen[256];
+    char buf[256];
+    int done;
+    //   int current=-1;
+    unsigned current = mixctl_->getNrDevices() + 1;
+ 
+-   sprintf(rcfilen, "%s/.wmmixer", getenv("HOME"));
+-   if((rcfile=fopen(rcfilen, "r"))!=NULL)
++   if((rcfile=fopen(config_file_, "r"))!=NULL)
+      {
+        num_channels_=0;
+        do
+@@ -412,6 +417,7 @@
+   std::cout << "  -L,  --led-highcolor <string>  use the specified color for led shading" << std::endl;
+   std::cout << "  -b,  --back-color <string>     use the specified color for backgrounds" << std::endl;
+   std::cout << "  -m,  --mix-device              use specified device (rather than /dev/mixer)" << std::endl;
++  std::cout << "  -c,  --config-file             use specified config file (rather than $HOME/.wmmixer)" << std::endl;
+   std::cout << "  -r,  --scrollwheel <number>    volume increase/decrease with mouse wheel (default: 2)" << std::endl;
+   std::cout << "\nFor backward compatibility the following obsolete options are still supported:" << std::endl;
+   std::cout << "  -help                          display this help screen" << std::endl;
+--- a/wmmixer.h
++++ b/wmmixer.h
+@@ -3,6 +3,7 @@
+ // Release 1.5
+ // Copyright (C) 1998  Sam Hawker <shawkie at geocities.com>
+ // Copyright (C) 2002 Gordon Fraser <gordon at debian.org>
++// Patch added by Rodolfo (kix) Garcia <kix at kix.es> to select the config file
+ // This software comes with ABSOLUTELY NO WARRANTY
+ // This software is free software, and you are welcome to redistribute it
+ // under certain conditions
+@@ -31,7 +32,7 @@
+ 
+ // For repeating next and prev buttons
+ #define RPTINTERVAL   5
+-
++#define CONFIGFILELEN 256
+ 
+ class WMMixer
+ {
+@@ -41,6 +42,7 @@
+   MixCtl *mixctl_;
+ 
+   char     mixer_device_[256];
++  char     config_file_[CONFIGFILELEN];
+   unsigned num_channels_;
+   unsigned current_channel_;
+   unsigned current_channel_left_;
diff --git a/debian/patches/03_hurd_support.patch b/debian/patches/03_hurd_support.patch
new file mode 100644
index 0000000..310143b
--- /dev/null
+++ b/debian/patches/03_hurd_support.patch
@@ -0,0 +1,13 @@
+Rodolfo García Peñas (kix) <kix at kix.es> - Hurd support
+--- a/mixctl.h
++++ b/mixctl.h
+@@ -29,6 +29,9 @@
+ #ifdef __linux__
+ #include <linux/soundcard.h>
+ #endif
++#ifdef __GNU__  // Hurd
++#include <sys/soundcard.h>
++#endif
+ 
+ #include "exception.h"
+ 
diff --git a/debian/patches/04_xclass_support.patch b/debian/patches/04_xclass_support.patch
new file mode 100644
index 0000000..9f4fa50
--- /dev/null
+++ b/debian/patches/04_xclass_support.patch
@@ -0,0 +1,88 @@
+The user can select the XClass
+--- a/wmmixer.cc
++++ b/wmmixer.cc
+@@ -236,6 +236,7 @@
+     {"back-color", 1, NULL, 'b'},
+     {"mix-device", 1, NULL, 'm'},
+     {"config-file", 1, NULL, 'c'},
++    {"x-class",    1, NULL, 'x'},
+     {"scrollwheel",1, NULL, 'r'},
+     {NULL,         0, NULL, 0  }};
+   int i, opt_index = 0;
+@@ -260,7 +261,7 @@
+ 	}
+     }
+ 
+-  while ((i = getopt_long(argc, argv, "hvd:g:wasl:L:b:m:c:r:", long_opts, &opt_index)) != -1)
++  while ((i = getopt_long(argc, argv, "hvd:g:wasl:L:b:m:c:x:r:", long_opts, &opt_index)) != -1)
+     {
+       switch (i) 
+ 	{
+@@ -302,6 +303,9 @@
+ 	case 'c':
+ 	  snprintf(config_file_, CONFIGFILELEN -1, "%s", optarg);
+ 	  break;
++	case 'x':
++	  xhandler_->setWindowClass(optarg);
++	  break;
+ 	case 'r':
+ 	  if(atoi(optarg)>0)
+ 	    wheel_scroll_ = atoi(optarg);
+@@ -418,6 +422,7 @@
+   std::cout << "  -b,  --back-color <string>     use the specified color for backgrounds" << std::endl;
+   std::cout << "  -m,  --mix-device              use specified device (rather than /dev/mixer)" << std::endl;
+   std::cout << "  -c,  --config-file             use specified config file (rather than $HOME/.wmmixer)" << std::endl;
++  std::cout << "  -x,  --x-class <string>        use specified class (rather than WMMmixer)" << std::endl;
+   std::cout << "  -r,  --scrollwheel <number>    volume increase/decrease with mouse wheel (default: 2)" << std::endl;
+   std::cout << "\nFor backward compatibility the following obsolete options are still supported:" << std::endl;
+   std::cout << "  -help                          display this help screen" << std::endl;
+--- a/xhandler.cc
++++ b/xhandler.cc
+@@ -22,6 +22,7 @@
+   strcpy(ledcolor_name_, LEDCOLOR);
+   strcpy(ledcolor_high_name_, LEDCOLOR_HIGH);
+   strcpy(backcolor_name_, BACKCOLOR);
++  strcpy(window_class_, CLASS);
+ 
+   button_state_ = 0;
+   icon_list_ = NULL;
+@@ -335,6 +336,12 @@
+ }
+ 
+ //--------------------------------------------------------------------
++void XHandler::setWindowClass(char* arg)
++{
++  snprintf(window_class_, 254, "%s", arg);
++}
++
++//--------------------------------------------------------------------
+ void XHandler::setUnshaped()
+ {
+   is_ushape_ = 1;
+@@ -489,7 +496,7 @@
+     }
+   
+   classHint.res_name=NAME;
+-  classHint.res_class=CLASS;
++  classHint.res_class = window_class_;
+   
+   XSetClassHint(display_default_, window_main_, &classHint);
+   XSetClassHint(display_default_, window_icon_, &classHint);
+--- a/xhandler.h
++++ b/xhandler.h
+@@ -85,6 +85,7 @@
+   char ledcolor_name_[256];
+   char ledcolor_high_name_[256];
+   char backcolor_name_[256];
++  char window_class_[256];
+ 
+   Pixel back_pix;
+   Pixel fore_pix;
+@@ -142,6 +143,7 @@
+   void setLedColor(char* arg);
+   void setLedHighColor(char* arg);
+   void setBackColor(char* arg);
++  void setWindowClass(char* arg);
+   void setUnshaped();
+   void setWindowMaker();
+   void setAfterStep();
diff --git a/debian/patches/05_debian_paths.patch b/debian/patches/05_debian_paths.patch
new file mode 100644
index 0000000..d2a94f1
--- /dev/null
+++ b/debian/patches/05_debian_paths.patch
@@ -0,0 +1,17 @@
+This patch changes the installation path to /usr
+--- a/Makefile
++++ b/Makefile
+@@ -1,12 +1,10 @@
+ # $Id: Makefile,v 1.5 2002/06/25 22:13:09 gordon Exp $
+ 
+-prefix      = /usr/local
++prefix      = /usr
+ exec_prefix = ${prefix}
+ bindir      = ${exec_prefix}/bin
+ mandir      = ${prefix}/share/man
+ 
+-DESTDIR     =
+-
+ CXX	    = g++
+ CXXFLAGS    = -O -Wall
+ EXTRA_LIBS  = -L/usr/X11R6/lib -lX11 -lXpm -lXext
diff --git a/debian/patches/06_Makefile_optimization.patch b/debian/patches/06_Makefile_optimization.patch
new file mode 100644
index 0000000..330ac7a
--- /dev/null
+++ b/debian/patches/06_Makefile_optimization.patch
@@ -0,0 +1,19 @@
+This patch includes the optimization parameters for g++
+--- a/Makefile
++++ b/Makefile
+@@ -6,7 +6,14 @@
+ mandir      = ${prefix}/share/man
+ 
+ CXX	    = g++
+-CXXFLAGS    = -O -Wall
++CXXFLAGS    = -Wall -g
++
++ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
++	CXXFLAGS += -O0
++else
++	CXXFLAGS += -O2
++endif
++
+ EXTRA_LIBS  = -L/usr/X11R6/lib -lX11 -lXpm -lXext
+ 
+ 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..d4acd92
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,6 @@
+01_restore_pristine_code.patch
+02_multiple_config_files.patch
+03_hurd_support.patch
+04_xclass_support.patch
+05_debian_paths.patch
+06_Makefile_optimization.patch
diff --git a/debian/rules b/debian/rules
index 6c628f7..070fb44 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,57 +1,8 @@
 #!/usr/bin/make -f
-# This is a -*- makefile -*-
-# Modified from the sample debian/rules that uses debhelper.
-# GNU copyright 1998 by Marcelo Magallon.
-# GNU copyright 1997 by Joey Hess.
+# GNU Copyright 2011 Rodolfo García Peñas (kix) <kix at kix.es>
 
-#export DH_VERBOSE=1
+# export DH_VERBOSE=1
 
-include /usr/share/dpatch/dpatch.make
+%:
+	dh $@
 
-CXXFLAGS = -Wall -g
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-  CXXFLAGS += -O0
-else
-  CXXFLAGS += -O2
-endif
-
-build: build-stamp
-build-stamp: patch-stamp
-	dh_testdir
-	$(MAKE) CXXFLAGS="$(CXXFLAGS)"
-	touch build-stamp
-
-clean: unpatch
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp
-	$(MAKE) clean
-	dh_clean
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-	$(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_strip
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/stamp-patched b/debian/stamp-patched
new file mode 100644
index 0000000..e69de29
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..794d2fc
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,2 @@
+# This application can be found in http://www.dockapps.org/
+# Now we are moving to http://repo.or.cz/w/dockapps.git
diff --git a/debian/wmmixer.changelogs b/debian/wmmixer.changelogs
new file mode 100644
index 0000000..da278be
--- /dev/null
+++ b/debian/wmmixer.changelogs
@@ -0,0 +1 @@
+CHANGES
diff --git a/debian/wmmixer.docs b/debian/wmmixer.docs
new file mode 100644
index 0000000..e845566
--- /dev/null
+++ b/debian/wmmixer.docs
@@ -0,0 +1 @@
+README
diff --git a/debian/wmmixer.examples b/debian/wmmixer.examples
new file mode 100644
index 0000000..1fc3351
--- /dev/null
+++ b/debian/wmmixer.examples
@@ -0,0 +1 @@
+home.wmmixer

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



More information about the Pkg-wmaker-commits mailing list