Hi!
Yesterday I updated the debian wmmixer package. The new package
includes the copyrigth and the patches in format DEP-3 and DEP-5. I
changed the changelog with this info.
I created a new patch (upstream) to avoid the warnings about C++
strings.
Both patches are attached, please, check it and update the dockapps
repo if you think they are ok.
In some time, after test more wmmixer, I will create a new debian
package with the changes of the upstream patch.
Best
kix
--
||// //\\// Rodolfo "kix" Garcia
||\\// //\\ http://www.kix.es/
diff --git a/wmmixer/debian/changelog b/wmmixer/debian/changelog
index 7fd0fd4..73d4166 100644
--- a/wmmixer/debian/changelog
+++ b/wmmixer/debian/changelog
@@ -1,3 +1,10 @@
+wmmixer (1.6-2) unstable; urgency=low
+
+ * debian/copyright is now DEP-5
+ * debian/patches/* are now DEP-3
+
+ -- Rodolfo GarcÃa Peñas (kix) <[email protected]> Mon, 8 Aug 2011 17:28:42 +0200
+
wmmixer (1.6-1) unstable; urgency=low
* New upstream version 1.6
diff --git a/wmmixer/debian/copyright b/wmmixer/debian/copyright
index 8912bb0..ce6a633 100644
--- a/wmmixer/debian/copyright
+++ b/wmmixer/debian/copyright
@@ -1,38 +1,53 @@
-This package was first debianized by Marcelo E. Magallon
-<[email protected]> on Sun, 5 Mar 1998 23:00:00 -0600.
-Additional modifications by Neale Pickett <[email protected]>
-and Gordon Fraser <[email protected]>
-
-It is now maintained by Sandro Tosi <[email protected]>
-
-It was downloaded from http://www.dockapps.org/
-
-Upstream Authors:
-
- Sam Hawker <[email protected]>
- Gordon Fraser <[email protected]>
-
-Copyright:
-
- 1998 Sam Hawker <[email protected]>
- 2002 Gordon Fraser <[email protected]>
-
-License:
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
- MA 02110-1301, USA.
-
-On a Debian system the complete text of the GNU General Public License
-can be found in the file `/usr/share/common-licenses/GPL-2'
+Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?view=co&pathrev=174
+Upstream-Name: wmmixer
+Upstream-Contact: Sam Hawker <[email protected]>
+Upstream-Contact: Gordon Fraser <[email protected]>
+Source: http://repo.or.cz/w/dockapps.git
+
+Files: *
+Copyright: 1998, Sam Hawker <[email protected]>
+ 2002, Gordon Fraser <[email protected]>
+License: GPL-2+
+
+Files: debian/*
+Copyright: 1998, Marcelo E. Magallon <[email protected]>
+ 1999, Neale Pickett <[email protected]>
+ 1999, Sean E. Perry <[email protected]>
+ 2000, Sean 'Shaleh' Perry <[email protected]>
+ 2001, LaMont Jones <[email protected]>
+ 2002, Gordon Fraser <[email protected]>
+ 2003, Gordon Fraser <[email protected]>
+ 2004, Gordon Fraser <[email protected]>
+ 2005, Gordon Fraser <[email protected]>
+ 2006, Gordon Fraser <[email protected]>
+ 2006, Aurelien Jarno <[email protected]>
+ 2007, Gordon Fraser <[email protected]>
+ 2007, Matej Vela <[email protected]>
+ 2007, Sandro Tosi <[email protected]>
+ 2008, Sandro Tosi <[email protected]>
+ 2009, Sandro Tosi <[email protected]>
+ 2010, Sandro Tosi <[email protected]>
+ 2011, Rodolfo GarcÃa Peñas (kix) <[email protected]>
+License: GPL-2+
+
+License: GPL-2+
+ This program is free software; you can redistribute it
+ and/or modify it under the terms of the GNU General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later
+ version.
+ .
+ This program is distributed in the hope that it will be
+ useful, but WITHOUT ANY WARRANTY; without even the implied
+ warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ PURPOSE. See the GNU General Public License for more
+ details.
+ .
+ You should have received a copy of the GNU General Public
+ License along with this package; if not, write to the Free
+ Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ Boston, MA 02110-1301 USA
+ .
+ On Debian systems, the full text of the GNU General Public
+ License version 2 can be found in the file
+ `/usr/share/common-licenses/GPL-2'.
diff --git a/wmmixer/debian/patches/01_debian_paths.patch b/wmmixer/debian/patches/01_debian_paths.patch
index d2a94f1..f89d000 100644
--- a/wmmixer/debian/patches/01_debian_paths.patch
+++ b/wmmixer/debian/patches/01_debian_paths.patch
@@ -1,4 +1,6 @@
-This patch changes the installation path to /usr
+Description: This patch changes the installation path to /usr
+Author: Sandro Tosi <[email protected]>
+Last-Update: 2007-10-08
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,10 @@
diff --git a/wmmixer/debian/patches/02_Makefile_optimization.patch b/wmmixer/debian/patches/02_Makefile_optimization.patch
index 330ac7a..471c93e 100644
--- a/wmmixer/debian/patches/02_Makefile_optimization.patch
+++ b/wmmixer/debian/patches/02_Makefile_optimization.patch
@@ -1,4 +1,6 @@
-This patch includes the optimization parameters for g++
+Description: This patch includes the optimization parameters for g++
+Author: Sandro Tosi <[email protected]>
+Last-Update: 2007-10-08
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,14 @@
diff --git a/wmmixer/XPM/.xvpics/norec.xpm b/wmmixer/XPM/.xvpics/norec.xpm
deleted file mode 100644
index a24c8f2..0000000
--- a/wmmixer/XPM/.xvpics/norec.xpm
+++ /dev/null
@@ -1,5 +0,0 @@
-P7 332
-#IMGINFO:10x9 RGB (221 bytes)
-#END_OF_COMMENTS
-10 9 255
-¶²¶²·µ±·¶²¶²·µ±·¶²E(E(·²¶¶²(%I$E)¶¶¶²(%I$E)¶¶¶²(%I$E)¶¶¶²E(E(·²¶¶²¶²·µ±·¶²¶²·µ±·
\ No newline at end of file
diff --git a/wmmixer/XPM/.xvpics/wmmixer.xpm b/wmmixer/XPM/.xvpics/wmmixer.xpm
deleted file mode 100644
index 7f099c5..0000000
Binary files a/wmmixer/XPM/.xvpics/wmmixer.xpm and /dev/null differ
diff --git a/wmmixer/XPM/.xvpics/wmmixer_new.xpm b/wmmixer/XPM/.xvpics/wmmixer_new.xpm
deleted file mode 100644
index 90e97ac..0000000
Binary files a/wmmixer/XPM/.xvpics/wmmixer_new.xpm and /dev/null differ
diff --git a/wmmixer/XPM/.xvpics/wmmixer_new2.xpm b/wmmixer/XPM/.xvpics/wmmixer_new2.xpm
deleted file mode 100644
index 4b98c9c..0000000
Binary files a/wmmixer/XPM/.xvpics/wmmixer_new2.xpm and /dev/null differ
diff --git a/wmmixer/XPM/icons.xpm b/wmmixer/XPM/icons.xpm
index d34aac7..ff6b56c 100644
--- a/wmmixer/XPM/icons.xpm
+++ b/wmmixer/XPM/icons.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char * icons_xpm[] = {
+static char const* icons_xpm[] = {
"220 22 4 1",
" c #282828 s back_color",
". c #00ffff s led_color_high",
diff --git a/wmmixer/XPM/norec.xpm b/wmmixer/XPM/norec.xpm
index eaf0106..47c6608 100644
--- a/wmmixer/XPM/norec.xpm
+++ b/wmmixer/XPM/norec.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char * norec_xpm[] = {
+static char const* norec_xpm[] = {
"10 9 3 1",
" c None",
". c #AEAAAE",
diff --git a/wmmixer/XPM/tile.xpm b/wmmixer/XPM/tile.xpm
index e65c234..6ef8ac7 100644
--- a/wmmixer/XPM/tile.xpm
+++ b/wmmixer/XPM/tile.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char *tile_xpm[] = {
+static char const *tile_xpm[] = {
"64 64 54 1",
" c #F3CEF3CEF3CE",
". c #000000000000",
diff --git a/wmmixer/XPM/wmmixer.xpm b/wmmixer/XPM/wmmixer.xpm
index d3ec49c..bcfc0ce 100644
--- a/wmmixer/XPM/wmmixer.xpm
+++ b/wmmixer/XPM/wmmixer.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char * wmmixer_xpm[] = {
+static char const* wmmixer_xpm[] = {
"64 64 10 1",
" c None",
". c #000000",
diff --git a/wmmixer/debian/changelog b/wmmixer/debian/changelog
index 7fd0fd4..73d4166 100644
--- a/wmmixer/debian/changelog
+++ b/wmmixer/debian/changelog
@@ -1,3 +1,10 @@
+wmmixer (1.6-2) unstable; urgency=low
+
+ * debian/copyright is now DEP-5
+ * debian/patches/* are now DEP-3
+
+ -- Rodolfo GarcÃa Peñas (kix) <[email protected]> Mon, 8 Aug 2011 17:28:42 +0200
+
wmmixer (1.6-1) unstable; urgency=low
* New upstream version 1.6
diff --git a/wmmixer/debian/copyright b/wmmixer/debian/copyright
index 8912bb0..ce6a633 100644
--- a/wmmixer/debian/copyright
+++ b/wmmixer/debian/copyright
@@ -1,38 +1,53 @@
-This package was first debianized by Marcelo E. Magallon
-<[email protected]> on Sun, 5 Mar 1998 23:00:00 -0600.
-Additional modifications by Neale Pickett <[email protected]>
-and Gordon Fraser <[email protected]>
-
-It is now maintained by Sandro Tosi <[email protected]>
-
-It was downloaded from http://www.dockapps.org/
-
-Upstream Authors:
-
- Sam Hawker <[email protected]>
- Gordon Fraser <[email protected]>
-
-Copyright:
-
- 1998 Sam Hawker <[email protected]>
- 2002 Gordon Fraser <[email protected]>
-
-License:
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
- MA 02110-1301, USA.
-
-On a Debian system the complete text of the GNU General Public License
-can be found in the file `/usr/share/common-licenses/GPL-2'
+Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?view=co&pathrev=174
+Upstream-Name: wmmixer
+Upstream-Contact: Sam Hawker <[email protected]>
+Upstream-Contact: Gordon Fraser <[email protected]>
+Source: http://repo.or.cz/w/dockapps.git
+
+Files: *
+Copyright: 1998, Sam Hawker <[email protected]>
+ 2002, Gordon Fraser <[email protected]>
+License: GPL-2+
+
+Files: debian/*
+Copyright: 1998, Marcelo E. Magallon <[email protected]>
+ 1999, Neale Pickett <[email protected]>
+ 1999, Sean E. Perry <[email protected]>
+ 2000, Sean 'Shaleh' Perry <[email protected]>
+ 2001, LaMont Jones <[email protected]>
+ 2002, Gordon Fraser <[email protected]>
+ 2003, Gordon Fraser <[email protected]>
+ 2004, Gordon Fraser <[email protected]>
+ 2005, Gordon Fraser <[email protected]>
+ 2006, Gordon Fraser <[email protected]>
+ 2006, Aurelien Jarno <[email protected]>
+ 2007, Gordon Fraser <[email protected]>
+ 2007, Matej Vela <[email protected]>
+ 2007, Sandro Tosi <[email protected]>
+ 2008, Sandro Tosi <[email protected]>
+ 2009, Sandro Tosi <[email protected]>
+ 2010, Sandro Tosi <[email protected]>
+ 2011, Rodolfo GarcÃa Peñas (kix) <[email protected]>
+License: GPL-2+
+
+License: GPL-2+
+ This program is free software; you can redistribute it
+ and/or modify it under the terms of the GNU General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later
+ version.
+ .
+ This program is distributed in the hope that it will be
+ useful, but WITHOUT ANY WARRANTY; without even the implied
+ warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ PURPOSE. See the GNU General Public License for more
+ details.
+ .
+ You should have received a copy of the GNU General Public
+ License along with this package; if not, write to the Free
+ Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ Boston, MA 02110-1301 USA
+ .
+ On Debian systems, the full text of the GNU General Public
+ License version 2 can be found in the file
+ `/usr/share/common-licenses/GPL-2'.
diff --git a/wmmixer/debian/patches/01_debian_paths.patch b/wmmixer/debian/patches/01_debian_paths.patch
index d2a94f1..f89d000 100644
--- a/wmmixer/debian/patches/01_debian_paths.patch
+++ b/wmmixer/debian/patches/01_debian_paths.patch
@@ -1,4 +1,6 @@
-This patch changes the installation path to /usr
+Description: This patch changes the installation path to /usr
+Author: Sandro Tosi <[email protected]>
+Last-Update: 2007-10-08
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,10 @@
diff --git a/wmmixer/debian/patches/02_Makefile_optimization.patch b/wmmixer/debian/patches/02_Makefile_optimization.patch
index 330ac7a..471c93e 100644
--- a/wmmixer/debian/patches/02_Makefile_optimization.patch
+++ b/wmmixer/debian/patches/02_Makefile_optimization.patch
@@ -1,4 +1,6 @@
-This patch includes the optimization parameters for g++
+Description: This patch includes the optimization parameters for g++
+Author: Sandro Tosi <[email protected]>
+Last-Update: 2007-10-08
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,14 @@
diff --git a/wmmixer/mixctl.cc b/wmmixer/mixctl.cc
index 10de39d..10a40b3 100644
--- a/wmmixer/mixctl.cc
+++ b/wmmixer/mixctl.cc
@@ -23,8 +23,8 @@ MixCtl::MixCtl(char *device_name) throw(MixerDeviceException)
if((mixfd = open(device_,O_RDONLY | O_NONBLOCK)) != -1)
{
num_devices_ = SOUND_MIXER_NRDEVICES;
- char *devnames[] = SOUND_DEVICE_NAMES;
- char *devlabels[] = SOUND_DEVICE_LABELS;
+ const char *devnames[] = SOUND_DEVICE_NAMES;
+ const char *devlabels[] = SOUND_DEVICE_LABELS;
ioctl(mixfd, SOUND_MIXER_READ_DEVMASK, &devmask);
ioctl(mixfd, SOUND_MIXER_READ_STEREODEVS, &stmask);
ioctl(mixfd, SOUND_MIXER_READ_RECMASK, &recmask);
@@ -39,8 +39,8 @@ MixCtl::MixCtl(char *device_name) throw(MixerDeviceException)
mixer_devices_[count].stereo = stmask & mixmask;
mixer_devices_[count].records = recmask & mixmask;
mixer_devices_[count].mask = mixmask;
- mixer_devices_[count].name = devnames[count];
- mixer_devices_[count].label = devlabels[count];
+ mixer_devices_[count].name = (char *) devnames[count];
+ mixer_devices_[count].label = (char *) devlabels[count];
mixer_devices_[count].muted = 0;
mixmask*=2;
}
diff --git a/wmmixer/xhandler.cc b/wmmixer/xhandler.cc
index 2d56813..506bf18 100644
--- a/wmmixer/xhandler.cc
+++ b/wmmixer/xhandler.cc
@@ -403,22 +403,22 @@ void XHandler::initGraphicsContext()
//--------------------------------------------------------------------
void XHandler::initPixmaps(int display_depth)
{
- XpmColorSymbol xpmcsym[4]={{"back_color", NULL, colors_[0]},
- {"led_color_high", NULL, colors_[1]},
- {"led_color_med", NULL, colors_[2]},
- {"led_color_low", NULL, colors_[3]}};
+ XpmColorSymbol const xpmcsym[4]={{(char *)"back_color", NULL, colors_[0]},
+ {(char *)"led_color_high", NULL, colors_[1]},
+ {(char *)"led_color_med", NULL, colors_[2]},
+ {(char *)"led_color_low", NULL, colors_[3]}};
XpmAttributes xpmattr;
xpmattr.numsymbols = 4;
- xpmattr.colorsymbols = xpmcsym;
+ xpmattr.colorsymbols = (XpmColorSymbol *)xpmcsym;
xpmattr.exactColors = false;
xpmattr.closeness = 40000;
xpmattr.valuemask = XpmColorSymbols | XpmExactColors | XpmCloseness;
- XpmCreatePixmapFromData(display_default_, window_root_, wmmixer_xpm, &pixmap_main, &pixmap_mask, &xpmattr);
- XpmCreatePixmapFromData(display_default_, window_root_, tile_xpm, &pixmap_tile, NULL, &xpmattr);
- XpmCreatePixmapFromData(display_default_, window_root_, icons_xpm, &pixmap_icon, NULL, &xpmattr);
- XpmCreatePixmapFromData(display_default_, window_root_, norec_xpm, &pixmap_nrec, NULL, &xpmattr);
+ XpmCreatePixmapFromData(display_default_, window_root_, (char **)wmmixer_xpm, &pixmap_main, &pixmap_mask, &xpmattr);
+ XpmCreatePixmapFromData(display_default_, window_root_, (char **)tile_xpm, &pixmap_tile, NULL, &xpmattr);
+ XpmCreatePixmapFromData(display_default_, window_root_, (char **)icons_xpm, &pixmap_icon, NULL, &xpmattr);
+ XpmCreatePixmapFromData(display_default_, window_root_, (char **)norec_xpm, &pixmap_nrec, NULL, &xpmattr);
pixmap_disp = XCreatePixmap(display_default_, window_root_, 64, 64, display_depth);
}
@@ -461,8 +461,8 @@ void XHandler::initWindow(int argc, char** argv)
window_root_ = RootWindow(display_default_, screen);
- back_pix = getColor("white");
- fore_pix = getColor("black");
+ back_pix = getColor((char *)"white");
+ fore_pix = getColor((char *)"black");
window_main_ = XCreateSimpleWindow(display_default_, window_root_, shints.x, shints.y,
shints.width, shints.height, 0, fore_pix, back_pix);
@@ -495,7 +495,7 @@ void XHandler::initWindow(int argc, char** argv)
wmhints.flags = WindowGroupHint | StateHint;
}
- classHint.res_name=NAME;
+ classHint.res_name=(char *)NAME;
classHint.res_class = window_class_;
XSetClassHint(display_default_, window_main_, &classHint);
