Dear Rodolfo, dear Yadickson, my name is Markus Koschany and i'm working on a new official Debian package for wbar. While i prepared the package i discovered some license issues thus i am contacting you in the hope that you can help resolving them.
Please keep the bug reports cc'ed and the information public because i think this would help other distributions, too. I've also attached a few patches which fix minor spelling errors and typos. 1. Unoffical Debian packages First of all thanks for supporting Debian. Unfortunately some users confused your unoffical package with the offical but alas outdated package in Debian and filed bug reports against them. See [1] and [2] Please consider removing the unoffical packages from the project homepage as soon as the official version gets updated. 2. GPL The old Debian package states the source code is licensed under GPL-2. I can find the same statement on your offical project homepage. [3] Your source tarball respectively the svn repo contains a COPYRIGHT file which says the code is licensed under GPL-3. So my question is: Which one is it? 3. Icons In the past we had to remove non-free icons and a font file. Obviously you don't use the iconpack folder anymore. Would it be possible to remove it completly from the svn repo? I would like to use the new icons in /pixmaps but i can't find any information about where they came from. I recognize the Anjuta logo which is licensed under GPL-2 but the licenses for the other icons remain vague. Could you clarify this situation? 4. Toolchain You are using a very helpful autogen.sh file to create the build toolchain. Would it be possible to include it in the next source tarball release? I personally prefer rebuilding the toolchain myself and i think this would also make it easier to spot changes in the source files. It also reduces the size of the source tarball. 5. Patches I've attached a few patches which correct, in my opinion, spelling errors and typos in wbar. I'm not a native speaker myself but i had the feeling "inverting icons growth" sounds better than "investing icons growth". If you disagree with my changes, please let me know. If i made a mistake myself i will revert the changes of course. I've also increased the default icon size to 64. It makes wbar more visible for starters and easier to spot. Thanks for reading this far. I'm looking forward to your answers. Best regards Markus Koschany 1. http://bugs.debian.org/637354 2. http://bugs.debian.org/630876 3. http://code.google.com/p/wbar/
Description: Fix typos in manpages and correct the name of the original author of wbar This fix corrects multiple spelling mistakes in wbar.1 and wbar-config.1 and credits the original author of wbar Rodolfo Granata. Author: Markus Koschany <a...@gambaru.de> Origin: vendor Last-Update: 2012-08-19 --- This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ --- a/doc/man/wbar.1 +++ b/doc/man/wbar.1 @@ -10,12 +10,12 @@ This manual page documents briefly the .B wbar command. .PP -\fBwbar\fP is a quick launch bar. Its fast, light and cool eye-candy. +\fBwbar\fP is a quick launch bar. It's fast, light and cool eye-candy. .PP The config file format is described in -.BR wbar-config (1) . +.BR wbar-config (1)\. .SH OPTIONS -A summary of options is included below. +A summary of the options is included below. .TP .B \-\-help Show summary of options. @@ -27,7 +27,7 @@ Show version of program. Config file path (ie: $HOME/.wbar). .TP .B \-\-above-desk -Run over a desktop app (ie: xfdesktop). +Run above a desktop app (ie: xfdesktop). .TP .B \-\-taskbar Enable taskbar. @@ -54,10 +54,10 @@ Set jump factor (eg: 1.0 or 0.0). Set position. Choose from top, bottom, left, right, center, <bot|top>-<right|left>. .TP .B \-\-grow -Investing icons growth. +Inverting icons growth. .TP .B \-\-dblclk <value in ms> -Set ms for double click (0: single click). +Set time in ms for double click (0: single click). .TP .B \-\-bpress Icon gets pressed. @@ -90,7 +90,7 @@ If set disables font rendering. .SH AUTHORS wbar was written by: .TP -\- Krzysztof Burghardt <krzysz...@burghardt.pl> +\- Rodolfo Granata <warlock...@gmail.com> .PP \- Yadickson Soto <yadick...@gmail.com> .PP --- a/doc/man/wbar-config.1 +++ b/doc/man/wbar-config.1 @@ -1,18 +1,18 @@ .\" Hey, EMACS: -*- nroff -*- .TH WBAR-CONFIG 1 "January 14, 2012" .SH NAME -wbar-config \- gui from settings for wbar +wbar-config \- GUI to customize wbar .SH SYNOPSIS .B wbar-config .SH DESCRIPTION \fBwbar-config\fP is a program that creates and configures the settings for -.BR wbar (1) . +.BR wbar (1)\&. The config file consists of blocks of three lines each of the following format: .PP i: /path/to/file.png .br -c: command --args +c: command \-\-args .br t: description for mouseover .PP @@ -25,18 +25,18 @@ that shall be shown to the user when the icon. .PP The first block is different, it describes general settings. -Here the "i: " argument is the path the file used as background image. -The "c: " argument has the default arguments for wbar. +Here the "i: " argument is the path to a file which is used as the background image. +The "c: " argument defines the default settings for wbar. The "t: " line contains the path to the font that shall be used -followed by slash and the font size. +followed by a slash and the font size. .PP For example: .PP -i: PREFIX/share/pixmaps/wbar/osxbarback.png +i: /usr/share/pixmaps/wbar/osxbarback.png .br -c: wbar --bpress --above-desk --vbar --pos right --isize 32 --idist 5 --nanim 4 --falfa 65 +c: wbar \-\-bpress \-\-above-desk \-\-vbar \-\-pos right \-\-isize 32 \-\-idist 5 \-\-nanim 4 \-\-falfa 65 .br -t: /usr/pkg/lib/X11/fonts/TTF/DejaVuSans/10 +t: /usr/share/fonts/truetype/ttf-dejavu/DejaVuSans/10 .SH SEE ALSO .BR wbar (1) .SH AUTHORS
Description: Fix errors in the german translation Author: Markus Koschany <a...@gambaru.de> Origin: vendor Last-Update: 2012-08-19 --- This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ --- a/po/de.po +++ b/po/de.po @@ -22,7 +22,7 @@ msgid "<b>Icon</b>" msgstr "<b>Symbol</b>" msgid "<b>Title</b>" -msgstr "<b>Title</b>" +msgstr "<b>Titel</b>" msgid "Bar alfa level" msgstr "Transparenz der Leiste" @@ -73,7 +73,7 @@ msgid "Icon size" msgstr "SymbolgröÃe" msgid "Icons" -msgstr "Symbols" +msgstr "Symbole" msgid "Investing icons growth" msgstr "Umgekehrte Symbolanimation" @@ -151,7 +151,7 @@ msgid "bottom" msgstr "Unten" msgid "left" -msgstr "links" +msgstr "Links" msgid "right" msgstr "Rechts" @@ -193,7 +193,7 @@ msgid "Fields must not be empty" msgstr "Felder müssen ausgefüllt sein" msgid "Open exec file" -msgstr "Ãffnen einer ausführbare Datei" +msgstr "Ãffnen einer ausführbaren Datei" msgid "Open image file" msgstr "Ãffnen einer Bilddatei"
Description: Fix typos in wbar-config and on the commandline Author: Markus Koschany <a...@gambaru.de> Origin: vendor Last-Update: 2012-08-20 --- This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ --- a/src/core/Main.cc +++ b/src/core/Main.cc @@ -124,7 +124,7 @@ int main(int argc, char **argv) std::cout << " --help " << _("this help") << std::endl; std::cout << " --version " << _("show version") << std::endl; std::cout << " --config filepath " << _("conf-file (eg: $HOME/.wbar)") << std::endl; - std::cout << " --above-desk " << _("run over a desktop app (ie: xfdesktop)") << std::endl; + std::cout << " --above-desk " << _("run above a desktop app (ie: xfdesktop)") << std::endl; std::cout << " --taskbar " << _("enable taskbar") << std::endl; std::cout << " --noreload " << _("right click does not force reload anymore") << std::endl; std::cout << " --offset i " << _("offset bar (eg: 20)") << std::endl; @@ -135,12 +135,12 @@ int main(int argc, char **argv) std::cout << " --pos p " << _("position:") << std::endl; std::cout << " " << "top | bottom | left | right | " << std::endl; std::cout << " " << "center | <bot|top>-<right|left>" << std::endl; - std::cout << " --grow " << _("investing icons growth") << std::endl; - std::cout << " --dblclk ms " << _("ms for double click (0: single click)") << std::endl; + std::cout << " --grow " << _("inverting icons growth") << std::endl; + std::cout << " --dblclk ms " << _("time in ms for double click (0: single click)") << std::endl; std::cout << " --bpress " << _("icon gets pressed") << std::endl; std::cout << " --vbar " << _("vertical bar") << std::endl; std::cout << " --balfa i " << _("bar alfa (0-100)") << std::endl; - std::cout << " --rsize i " << _("Reflection size in percents (0-100)") << std::endl; + std::cout << " --rsize i " << _("reflection size in percents (0-100)") << std::endl; std::cout << " --falfa i " << _("unfocused bar alfa (0-100)") << std::endl; std::cout << " --filter i " << _("color filter (0: none 1: hovered 2: others, 3: all)") << std::endl; std::cout << " --fc 0xAARRGGBB " << _("filter color (default green 0xff00c800)") << std::endl; --- a/po/de.po +++ b/po/de.po @@ -75,7 +75,7 @@ msgstr "SymbolgröÃe" msgid "Icons" msgstr "Symbole" -msgid "Investing icons growth" +msgid "Inverting icons growth" msgstr "Umgekehrte Symbolanimation" msgid "Jump factor" @@ -99,7 +99,7 @@ msgstr "Einstellungen" msgid "Reflection percentage" msgstr "Symbol (Icon) spiegeln" -msgid "Run over the desktop" +msgid "Run above the desktop" msgstr "Wbar oberhalb eines Desktopmanagers" msgid "Settings" --- a/po/es.po +++ b/po/es.po @@ -76,7 +76,7 @@ msgstr "Tamaño de icono" msgid "Icons" msgstr "Iconos" -msgid "Investing icons growth" +msgid "Inverting icons growth" msgstr "Invertir crecimineto de iconos" msgid "Jump factor" @@ -100,7 +100,7 @@ msgstr "Preferencias" msgid "Reflection percentage" msgstr "Porcentaje de reflexión" -msgid "Run over the desktop" +msgid "Run above the desktop" msgstr "Ejecutar sobre el escritorio" msgid "Settings" --- a/po/fi.po +++ b/po/fi.po @@ -76,7 +76,7 @@ msgstr "Kuvakkeen koko" msgid "Icons" msgstr "Kuvakes" -msgid "Investing icons growth" +msgid "Inverting icons growth" msgstr "" msgid "Jump factor" @@ -100,7 +100,7 @@ msgstr "" msgid "Reflection percentage" msgstr "" -msgid "Run over the desktop" +msgid "Run above the desktop" msgstr "Suorita työpöytäsovellusten yllä" msgid "Settings" --- a/share/wbar.glade +++ b/share/wbar.glade @@ -861,7 +861,7 @@ </child> <child> <widget class="GtkCheckButton" id="checkbutton_above_desk"> - <property name="label" translatable="yes">Run over the desktop</property> + <property name="label" translatable="yes">Run above the desktop</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -994,7 +994,7 @@ </child> <child> <widget class="GtkCheckButton" id="checkbutton_grow"> - <property name="label" translatable="yes">Investing icons growth</property> + <property name="label" translatable="yes">Inverting icons growth</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property>
Description: Fix lintian warnings about desktop entry Encoding key is deprecated and all strings must be encoded in UTF-8. Furthermore there is no indication why the desktop entry should be limited to Gnome and Xfce. Author: Markus Koschany <a...@gambaru.de> Origin: vendor Last-Update: 2012-08-20 --- This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ --- a/etc/wbar.desktop.in.in +++ b/etc/wbar.desktop.in.in @@ -1,5 +1,4 @@ [Desktop Entry] -Encoding=UTF-8 _Name=Warlock Bar Type=Application Exec=@BINDIR@/@PACKAGE_NAME@ @@ -7,7 +6,6 @@ Terminal=false Icon=@PIXMAPDIR@/@PACKAGE_NAME@.png _Comment=A light and fast launch bar. Categories=Utility; -OnlyShowIn=GNOME;XFCE; X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=@PACKAGE_NAME@ X-GNOME-Bugzilla-Component=general
Description: Change default icon size to 64 Increase default icon size from 32 to 64 to improve the visibility of wbar. Author: Markus Koschany <a...@gambaru.de> Origin: vendor Last-Update: 2012-08-20 --- This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ --- a/configure.ac +++ b/configure.ac @@ -55,7 +55,7 @@ AC_DEFINE_UNQUOTED(GLADE_PACKAGE_DIR, "$ AC_SUBST(GLADE_PACKAGE_NAME, "$GLADE_PACKAGE_DIR/AC_PACKAGE_NAME.glade") AC_DEFINE_UNQUOTED(GLADE_PACKAGE_NAME, "$GLADE_PACKAGE_NAME" , [ The glade package name ]) -AC_SUBST(DEFAULT_ARGV, "--bpress --above-desk --vbar --pos right --isize 32 --idist 5 --nanim 4 --falfa 65") +AC_SUBST(DEFAULT_ARGV, "--bpress --above-desk --vbar --pos right --isize 64 --idist 5 --nanim 4 --falfa 65") AC_DEFINE_UNQUOTED(DEFAULT_ARGV, "$DEFAULT_ARGV" , [ The default argv ]) AC_PROG_INTLTOOL()
signature.asc
Description: OpenPGP digital signature
