diff -Nru wmstickynotes-0.7/debian/changelog wmstickynotes-0.7/debian/changelog --- wmstickynotes-0.7/debian/changelog 2018-04-03 12:51:11.000000000 +0000 +++ wmstickynotes-0.7/debian/changelog 2021-08-31 01:04:30.000000000 +0000 @@ -1,8 +1,41 @@ -wmstickynotes (0.7-2build1) bionic; urgency=high +wmstickynotes (0.7-3) unstable; urgency=medium - * No change rebuild to pick up -fPIE compiler default + [ Doug Torrance ] + * debian/control + - Update Maintainer email address to tracker.d.o. + - Bump Standards-Version to 4.6.0. + - Use https for Homepage. + - Update Vcs-* after migration to Salsa. + - Add Rules-Requires-Root field (no). + * debian/copyright + - Update Format and Source urls to https. + * debian/gbp.conf + - Add git-buildpackage config file; set pristine-tar to True. + * debian/menu + - Remove deprecated Debian menu file. + * debian/patches/add-colors.patch + - New patch by Carlos Hernández to add text colors to the notes and + colorscheme menu. + * debian/rules + - Export all hardening flags. + * debian/salsa-ci.yml + - Add Salsa pipeline config file. + * debian/watch + - Bump to version 4 format. + - Use special strings for regular expressions matching version number + and archive extension. + - Use https for download link. - -- Balint Reczey Tue, 03 Apr 2018 12:51:11 +0000 + [ Debian Janitor ] + * Bump debhelper from deprecated 9 to 12. + * Set debhelper-compat version in Build-Depends. + * Set upstream metadata fields: Archive, Repository. + * Drop unnecessary dependency on dh-autoreconf. + * Remove unnecessary get-orig-source-target. + * Bump debhelper from old 12 to 13. + * Avoid explicitly specifying -Wl,--as-needed linker flag. + + -- Doug Torrance Mon, 30 Aug 2021 21:04:30 -0400 wmstickynotes (0.7-2) unstable; urgency=medium diff -Nru wmstickynotes-0.7/debian/compat wmstickynotes-0.7/debian/compat --- wmstickynotes-0.7/debian/compat 2015-08-25 02:24:13.000000000 +0000 +++ wmstickynotes-0.7/debian/compat 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -9 diff -Nru wmstickynotes-0.7/debian/control wmstickynotes-0.7/debian/control --- wmstickynotes-0.7/debian/control 2018-04-03 12:51:11.000000000 +0000 +++ wmstickynotes-0.7/debian/control 2021-08-31 00:49:51.000000000 +0000 @@ -1,18 +1,17 @@ Source: wmstickynotes Section: x11 Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Debian Window Maker Team +Maintainer: Debian Window Maker Team Uploaders: Doug Torrance -Build-Depends: debhelper (>= 9), - dh-autoreconf, +Build-Depends: debhelper-compat (= 13), libgtk2.0-dev, libx11-dev, libxext-dev -Standards-Version: 3.9.6 -Homepage: http://sourceforge.net/projects/wmstickynotes/ -Vcs-Git: https://anonscm.debian.org/git/pkg-wmaker/wmstickynotes.git -Vcs-Browser: http://anonscm.debian.org/cgit/pkg-wmaker/wmstickynotes.git +Standards-Version: 4.6.0 +Homepage: https://sourceforge.net/projects/wmstickynotes/ +Vcs-Git: https://salsa.debian.org/wmaker-team/wmstickynotes.git +Vcs-Browser: https://salsa.debian.org/wmaker-team/wmstickynotes +Rules-Requires-Root: no Package: wmstickynotes Architecture: any diff -Nru wmstickynotes-0.7/debian/copyright wmstickynotes-0.7/debian/copyright --- wmstickynotes-0.7/debian/copyright 2015-08-25 02:26:06.000000000 +0000 +++ wmstickynotes-0.7/debian/copyright 2021-08-31 00:49:51.000000000 +0000 @@ -1,6 +1,6 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: wmstickynotes -Source: http://sourceforge.net/projects/wmstickynotes/ +Source: https://sourceforge.net/projects/wmstickynotes/ Files: * Copyright: 2009 Heath Caldwell diff -Nru wmstickynotes-0.7/debian/gbp.conf wmstickynotes-0.7/debian/gbp.conf --- wmstickynotes-0.7/debian/gbp.conf 1970-01-01 00:00:00.000000000 +0000 +++ wmstickynotes-0.7/debian/gbp.conf 2021-08-31 00:53:47.000000000 +0000 @@ -0,0 +1,2 @@ +[DEFAULT] +pristine-tar = True diff -Nru wmstickynotes-0.7/debian/menu wmstickynotes-0.7/debian/menu --- wmstickynotes-0.7/debian/menu 2015-08-25 02:24:13.000000000 +0000 +++ wmstickynotes-0.7/debian/menu 1970-01-01 00:00:00.000000000 +0000 @@ -1,5 +0,0 @@ -?package(wmstickynotes):\ - needs="X11"\ - section="Applications/Editors"\ - title="wmstickynotes"\ - command="/usr/bin/wmstickynotes" diff -Nru wmstickynotes-0.7/debian/patches/add-colors.patch wmstickynotes-0.7/debian/patches/add-colors.patch --- wmstickynotes-0.7/debian/patches/add-colors.patch 1970-01-01 00:00:00.000000000 +0000 +++ wmstickynotes-0.7/debian/patches/add-colors.patch 2021-08-31 00:49:51.000000000 +0000 @@ -0,0 +1,195 @@ +Description: Added text color to the notes and colorscheme menu + I expanded the text color options for improve the contrast between + background and text. +Author: Carlos Hernández +Origin: https://salsa.debian.org/wmaker-team/wmstickynotes/-/merge_requests/1 +Origin: https://github.com/d-torrance/wmstickynotes/pull/1 +Last-Update: 2021-05-25 + +--- a/wmstickynotes.c ++++ b/wmstickynotes.c +@@ -65,8 +65,10 @@ + GtkWidget *color_menu; + GtkWidget *item; + GtkWidget *label; +- GtkWidget *color_box; +- GtkWidget *hbox; ++ GtkWidget *color_box1; ++ GtkWidget *color_box2; ++ GtkWidget *color_box3; ++ GtkWidget *hbox; + GdkColor gcolor; + char *wmstickynotes_dir = NULL; + gboolean use_default_dir = TRUE; +@@ -161,17 +163,36 @@ + for(i=0; i < num_color_schemes; i++) { + item = gtk_menu_item_new(); + label = gtk_label_new(color_schemes[i].name); +- color_box = gtk_event_box_new(); +- gtk_widget_set_size_request(color_box, 15, -1); +- hbox = gtk_hbox_new(FALSE, 4); +- +- gdk_color_parse(color_schemes[i].top, &gcolor); +- gtk_widget_modify_bg(color_box, GTK_STATE_NORMAL, &gcolor); +- gtk_widget_modify_bg(color_box, GTK_STATE_PRELIGHT, &gcolor); ++ //color box1 ++ color_box1 = gtk_event_box_new(); ++ gtk_widget_set_size_request(color_box1, 15, -1); ++ gdk_color_parse(color_schemes[i].top, &gcolor); ++ gtk_widget_modify_bg(color_box1, GTK_STATE_NORMAL, &gcolor); ++ gtk_widget_modify_bg(color_box1, GTK_STATE_PRELIGHT, &gcolor); ++ // ++ ++ //color box2 ++ color_box2 = gtk_event_box_new(); ++ gtk_widget_set_size_request(color_box2, 15, -1); ++ gdk_color_parse(color_schemes[i].background, &gcolor); ++ gtk_widget_modify_bg(color_box2, GTK_STATE_NORMAL, &gcolor); ++ gtk_widget_modify_bg(color_box2, GTK_STATE_PRELIGHT, &gcolor); ++ // ++ ++ //color box3 ++ color_box3 = gtk_event_box_new(); ++ gtk_widget_set_size_request(color_box3, 15, -1); ++ gdk_color_parse(color_schemes[i].text, &gcolor); ++ gtk_widget_modify_bg(color_box3, GTK_STATE_NORMAL, &gcolor); ++ gtk_widget_modify_bg(color_box3, GTK_STATE_PRELIGHT, &gcolor); ++ // + ++ hbox = gtk_hbox_new(FALSE, 4); + gtk_container_add(GTK_CONTAINER(item), hbox); +- gtk_box_pack_start(GTK_BOX(hbox), color_box, FALSE, FALSE, 0); +- gtk_box_pack_start(GTK_BOX(hbox), label, TRUE, TRUE, 0); ++ gtk_box_pack_start(GTK_BOX(hbox), color_box1, FALSE, FALSE, 0); ++ gtk_box_pack_start(GTK_BOX(hbox), color_box2, FALSE, FALSE, 0); ++ gtk_box_pack_start(GTK_BOX(hbox), color_box3, FALSE, FALSE, 0); ++ gtk_box_pack_start(GTK_BOX(hbox), label, TRUE, TRUE, 0); + + gtk_menu_shell_append(GTK_MENU_SHELL(color_menu), item); + g_signal_connect(G_OBJECT(item), "activate", G_CALLBACK(new_note_from_menu), &color_schemes[i]); +@@ -521,13 +542,15 @@ + GtkWidget *color_item; + GtkWidget *item; + GtkWidget *label; +- GtkWidget *color_box; ++ GtkWidget *color_box1; ++ GtkWidget *color_box2; ++ GtkWidget *color_box3; + GtkWidget *hbox; + GdkColor gcolor; + int i; + + color_menu = gtk_menu_new(); +- color_item = gtk_menu_item_new_with_label("Color"); ++ color_item = gtk_menu_item_new_with_label("Scheme"); + + gtk_menu_item_set_submenu(GTK_MENU_ITEM(color_item), color_menu); + gtk_menu_shell_prepend(GTK_MENU_SHELL(menu), color_item); +@@ -536,16 +559,35 @@ + for(i=0; i < num_color_schemes; i++) { + item = gtk_menu_item_new(); + label = gtk_label_new(color_schemes[i].name); +- color_box = gtk_event_box_new(); +- gtk_widget_set_size_request(color_box, 15, -1); +- hbox = gtk_hbox_new(FALSE, 4); +- +- gdk_color_parse(color_schemes[i].top, &gcolor); +- gtk_widget_modify_bg(color_box, GTK_STATE_NORMAL, &gcolor); +- gtk_widget_modify_bg(color_box, GTK_STATE_PRELIGHT, &gcolor); ++ //color box1 ++ color_box1 = gtk_event_box_new(); ++ gtk_widget_set_size_request(color_box1, 15, -1); ++ gdk_color_parse(color_schemes[i].top, &gcolor); ++ gtk_widget_modify_bg(color_box1, GTK_STATE_NORMAL, &gcolor); ++ gtk_widget_modify_bg(color_box1, GTK_STATE_PRELIGHT, &gcolor); ++ // ++ ++ //color box2 ++ color_box2 = gtk_event_box_new(); ++ gtk_widget_set_size_request(color_box2, 15, -1); ++ gdk_color_parse(color_schemes[i].background, &gcolor); ++ gtk_widget_modify_bg(color_box2, GTK_STATE_NORMAL, &gcolor); ++ gtk_widget_modify_bg(color_box2, GTK_STATE_PRELIGHT, &gcolor); ++ // ++ ++ //color box3 ++ color_box3 = gtk_event_box_new(); ++ gtk_widget_set_size_request(color_box3, 15, -1); ++ gdk_color_parse(color_schemes[i].text, &gcolor); ++ gtk_widget_modify_bg(color_box3, GTK_STATE_NORMAL, &gcolor); ++ gtk_widget_modify_bg(color_box3, GTK_STATE_PRELIGHT, &gcolor); ++ // + ++ hbox = gtk_hbox_new(FALSE, 4); + gtk_container_add(GTK_CONTAINER(item), hbox); +- gtk_box_pack_start(GTK_BOX(hbox), color_box, FALSE, FALSE, 0); ++ gtk_box_pack_start(GTK_BOX(hbox), color_box1, FALSE, FALSE, 0); ++ gtk_box_pack_start(GTK_BOX(hbox), color_box2, FALSE, FALSE, 0); ++ gtk_box_pack_start(GTK_BOX(hbox), color_box3, FALSE, FALSE, 0); + gtk_box_pack_start(GTK_BOX(hbox), label, TRUE, TRUE, 0); + + gtk_menu_shell_append(GTK_MENU_SHELL(color_menu), item); +@@ -580,4 +622,7 @@ + gtk_widget_modify_base(note->text_widget, GTK_STATE_NORMAL, &gcolor); + gtk_widget_modify_bg(note->window, GTK_STATE_NORMAL, &gcolor); + gtk_widget_modify_bg(note->resize_button_box, GTK_STATE_NORMAL, &gcolor); ++ ++ gdk_color_parse(scheme->text, &gcolor); ++ gtk_widget_modify_text(note->text_widget,GTK_STATE_NORMAL, &gcolor); + } +--- a/wmstickynotes.h ++++ b/wmstickynotes.h +@@ -12,6 +12,7 @@ + char *name; + char *top; + char *background; ++ char *text; + } ColorScheme; + + typedef struct { +@@ -32,16 +33,36 @@ + /* The default directory under $HOME in which to store notes */ + const char *default_wmstickynotes_dir = ".wmstickynotes"; + +-const num_color_schemes = 8; ++const int num_color_schemes = 19; + ColorScheme color_schemes[] = { +- {"Yellow", "#ffff00", "#ffff88"}, +- {"Green", "#66ff00", "#d0f0c0"}, +- {"Orange", "#ff7f00", "#ffe5b4"}, +- {"Pink", "#ff007f", "#ffc0cb"}, +- {"Blue", "#0000ff", "#ccccff"}, +- {"Purple", "#4b0082", "#c8a2c8"}, +- {"Brown", "#964b00", "#f0dc82"}, +- {"White", "#aaaaaa", "#ffffff"}}; ++ {"Yello/Purple", "#ffff00", "#ffff88", "#4b0082"}, ++ {"Yello/Black", "#ffff00", "#ffff88", "#000000"}, ++ ++ {"Green/Red", "#66ff00", "#d0f0c0", "#ff0000"}, ++ {"Green/White", "#66ff00", "#008a00", "#ffffff"}, ++ ++ {"Orange/Purple", "#ff7f00", "#ffe5b4", "#4b0082"}, ++ {"Orange/Black", "#ff7f00", "#ffe5b4", "#000000"}, ++ ++ {"Pink/Brown", "#ff007f", "#ffc0cb", "#964b00"}, ++ {"Pink/Black", "#ff007f", "#ffc0cb", "#000000"}, ++ ++ {"Blue/Yellow", "#ccccff", "#0000ff", "#ffee31"}, ++ {"Blue/White", "#ccccff", "#0000ff", "#ffffff"}, ++ ++ {"Purple/Orange", "#c8a2c8", "#4b0082", "#ff7f00"}, ++ {"Purple/White", "#4b0082", "#c8a2c8", "#ffffff"}, ++ ++ {"Brown/Pink", "#964b00", "#f0dc82", "#ff007f"}, ++ {"Brown/Black", "#964b00", "#f0dc82", "#000000"}, ++ ++ {"White/Blue", "#aaaaaa", "#ffffff", "#0000ff"}, ++ {"White/Black", "#aaaaaa", "#ffffff", "#000000"}, ++ {"White/Green", "#aaaaaa", "#ffffff", "#008a00"}, ++ ++ {"Black/Green", "#aaaaaa", "#000000", "#66ff00"}, ++ {"Black/White", "#aaaaaa", "#000000", "#ffffff"} ++}; + + void delete_note(GtkWidget *widget, Note *note); + void save_note(GtkWidget *widget, Note *note); diff -Nru wmstickynotes-0.7/debian/patches/series wmstickynotes-0.7/debian/patches/series --- wmstickynotes-0.7/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ wmstickynotes-0.7/debian/patches/series 2021-08-31 00:49:51.000000000 +0000 @@ -0,0 +1 @@ +add-colors.patch diff -Nru wmstickynotes-0.7/debian/rules wmstickynotes-0.7/debian/rules --- wmstickynotes-0.7/debian/rules 2015-08-25 02:24:13.000000000 +0000 +++ wmstickynotes-0.7/debian/rules 2021-08-31 00:49:51.000000000 +0000 @@ -1,9 +1,6 @@ #!/usr/bin/make -f -export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed +export DEB_BUILD_MAINT_OPTIONS = hardening=+all %: - dh $@ --with autoreconf - -get-orig-source: - uscan --verbose --force-download --rename + dh $@ diff -Nru wmstickynotes-0.7/debian/salsa-ci.yml wmstickynotes-0.7/debian/salsa-ci.yml --- wmstickynotes-0.7/debian/salsa-ci.yml 1970-01-01 00:00:00.000000000 +0000 +++ wmstickynotes-0.7/debian/salsa-ci.yml 2021-08-31 00:49:51.000000000 +0000 @@ -0,0 +1,4 @@ +--- +include: + - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml + - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml diff -Nru wmstickynotes-0.7/debian/upstream/metadata wmstickynotes-0.7/debian/upstream/metadata --- wmstickynotes-0.7/debian/upstream/metadata 1970-01-01 00:00:00.000000000 +0000 +++ wmstickynotes-0.7/debian/upstream/metadata 2021-08-31 00:49:51.000000000 +0000 @@ -0,0 +1,3 @@ +--- +Archive: SourceForge +Repository: https://svn.code.sf.net/p/wmstickynotes/code/ diff -Nru wmstickynotes-0.7/debian/watch wmstickynotes-0.7/debian/watch --- wmstickynotes-0.7/debian/watch 2015-08-25 02:24:13.000000000 +0000 +++ wmstickynotes-0.7/debian/watch 2021-08-31 00:49:51.000000000 +0000 @@ -1,2 +1,2 @@ -version=3 -http://sf.net/wmstickynotes/wmstickynotes-(.*)\.tar\.gz +version=4 +https://sf.net/wmstickynotes/wmstickynotes@ANY_VERSION@@ARCHIVE_EXT@