[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[Git][debian-mate-team/bamf][master] 10 commits: prepare new upstream release

Title: GitLab

Mike Gabriel pushed to branch master at Debian and Ubuntu MATE Packaging Team / bamf

Commits:

14 changed files:

Changes:

  • debian/bamfdaemon.lintian-overrides
    1 
    +# the /usr/share/applications directory is needed by bamf, even if empty
    2 
    +bamfdaemon: package-contains-empty-directory usr/share/applications/

  • debian/bamfdaemon.triggers
    1 
    -interest /usr/share/applications
    2 
    -interest gmenucache
    1 
    +interest-noawait /usr/share/applications
    2 
    +interest-noawait gmenucache

  • debian/changelog
    1 
    +bamf (0.5.4-1) unstable; urgency=medium
    2 
    +
    3 
    +  * New upstream release.
    4 
    +  * debian/patches:
    5 
    +    + Drop 0001_allow-colon-separated-values-in-XDG-CURRENT-DESKTOP.patch,
    6 
    +           1001_autotools-pkg-config-macro-not-cross-compilation-safe.patch,
    7 
    +           2002_use-dbus-run-session-instead-of-dbus-launch.patch,
    8 
    +           2003_allow-gtk3-deprecated-symbols.patch.
    9 
    +     ... now applied upstream.
    10 
    +    + Rebase 2001_build-using-mate-common.patch.
    11 
    +    + Add 1001_remove-former-mono-macros.patch. Remove SHAMROCK_EXPAND_* macros
    12 
    +      from configure.ac.
    13 
    +    + Add 1002_spelling-fix.patch. Correctly spell the word "associated".
    14 
    +  * debian/control:
    15 
    +    + Bump Standards-Version: to 4.2.1. No changes needed.
    16 
    +  * debian/rules:
    17 
    +    + Stop using dpkg-parsechangelog.
    18 
    +  * debian/libbamf3-2.symbols:
    19 
    +    + Add Build-Depends-Package: meta-info field.
    20 
    +  * lintian: Silence complaint about /usr/share/applications being an empty dir
    21 
    +    in the bamfdaemon bin:pkg.
    22 
    +  * debian/bamfdaemon.triggers:
    23 
    +    + Explicitly mark triggers as -noawait triggers.
    24 
    +
    25 
    + -- Mike Gabriel <sunweaver@debian.org>  Mon, 12 Nov 2018 21:59:45 +0100
    26 
    +
    1 27 
     bamf (0.5.3-3) unstable; urgency=medium
    2 28
    3 29 
       * debian/copyright:

  • debian/control
    ... ... @@ -17,7 +17,7 @@ Build-Depends: dbus (>= 1.8),
    17 17 
                    python-libxslt1,
    18 18 
                    valac,
    19 19 
                    xvfb,
    20 
    -Standards-Version: 4.1.5
    20 
    +Standards-Version: 4.2.1
    21 21 
     Homepage: https://launchpad.net/bamf
    22 22 
     Vcs-Browser: https://salsa.debian.org/debian-mate-team/bamf
    23 23 
     Vcs-Git: https://salsa.debian.org/debian-mate-team/bamf.git

  • debian/libbamf3-2.symbols
    ... ... @@ -69,3 +69,4 @@ libbamf3.so.2 libbamf3-2 #MINVER#
    69 69 
      bamf_window_last_active@Base 0.2.30
    70 70 
      bamf_window_maximized@Base 0.2.108
    71 71 
      bamf_window_new@Base 0.2.20
    72 
    +*Build-Depends-Package: libbamf3-dev

  • debian/patches/0001_allow-colon-separated-values-in-XDG-CURRENT-DESKTOP.patch deleted
    1 
    -Description: Adjust for XDG_CURRENT_DESKTOP containing multiple colon-separated values
    2 
    -Author: Iain Lane <iain.lane@canonical.com>
    3 
    -Origin: http://bazaar.launchpad.net/~unity-team/bamf/trunk/revision/649
    4 
    -
    5 
    -=== modified file 'src/bamf-application.c'
    6 
    ---- a/src/bamf-application.c	2016-04-08 21:54:32 +0000
    7 
    -+++ b/src/bamf-application.c	2016-09-29 14:54:26 +0000
    8 
    -@@ -673,13 +673,15 @@
    9 
    -
    10 
    -   if (curdesktop)
    11 
    -     {
    12 
    --      const gchar* show_in_list[] = { curdesktop, NULL };
    13 
    -+      gchar** show_in_list = g_strsplit (curdesktop, ":", 0);
    14 
    -       g_key_file_set_string_list (key_file, G_KEY_FILE_DESKTOP_GROUP,
    15 
    -                                   G_KEY_FILE_DESKTOP_KEY_ONLY_SHOW_IN,
    16 
    --                                  show_in_list, 1);
    17 
    -+                                  (const gchar * const *) show_in_list, 1);
    18 
    -+      g_strfreev (show_in_list);
    19 
    -     }
    20 
    -
    21 
    --  gchar *generator = g_strdup_printf ("X-%sGenerated", curdesktop ? curdesktop : "BAMF");
    22 
    -+  gchar *generator = g_strdup_printf ("X-%sGenerated", curdesktop && !g_strstr_len(curdesktop, -1, ":") ?
    23 
    -+                                                                      curdesktop : "BAMF");
    24 
    -   g_key_file_set_boolean (key_file, G_KEY_FILE_DESKTOP_GROUP, generator, TRUE);
    25 
    -   g_free (generator);
    26 
    -
    27 
    -
    28 
    -=== modified file 'src/bamf-legacy-screen.c'
    29 
    ---- a/src/bamf-legacy-screen.c	2016-06-13 22:27:18 +0000
    30 
    -+++ b/src/bamf-legacy-screen.c	2016-09-29 15:36:55 +0000
    31 
    -@@ -580,6 +580,8 @@
    32 
    - {
    33 
    -   BamfLegacyScreen *self;
    34 
    -   Display *dpy;
    35 
    -+  gchar **current_desktops = NULL;
    36 
    -+  const gchar *xdg_current_desktop;
    37 
    -
    38 
    -   if (static_screen)
    39 
    -     return static_screen;
    40 
    -@@ -613,13 +615,20 @@
    41 
    -   g_signal_connect (G_OBJECT (self->priv->legacy_screen), "active-window-changed",
    42 
    -                     (GCallback) handle_active_window_changed, self);
    43 
    -
    44 
    --  if (g_strcmp0 (g_getenv ("XDG_CURRENT_DESKTOP"), "Unity") == 0)
    45 
    -+  xdg_current_desktop = g_getenv ("XDG_CURRENT_DESKTOP");
    46 
    -+
    47 
    -+  if (xdg_current_desktop)
    48 
    -+    current_desktops = g_strsplit (xdg_current_desktop, ":", 0);
    49 
    -+
    50 
    -+  if (current_desktops && g_strv_contains ((const gchar * const *) current_desktops, "Unity"))
    51 
    -     {
    52 
    -       _COMPIZ_TOOLKIT_ACTION = XInternAtom (dpy, "_COMPIZ_TOOLKIT_ACTION", False);
    53 
    -       _COMPIZ_TOOLKIT_ACTION_WINDOW_MENU = XInternAtom (dpy, "_COMPIZ_TOOLKIT_ACTION_WINDOW_MENU", False);
    54 
    -       gdk_window_add_filter (NULL, filter_compiz_messages, self);
    55 
    -     }
    56 
    -
    57 
    -+  g_strfreev (current_desktops);
    58 
    -+
    59 
    -   return static_screen;
    60 
    - }
    61 
    -
    62 
    -
    63 
    -=== modified file 'src/bamf-matcher.c'
    64 
    ---- a/src/bamf-matcher.c	2016-06-13 22:27:18 +0000
    65 
    -+++ b/src/bamf-matcher.c	2016-09-29 15:36:55 +0000
    66 
    -@@ -827,7 +827,6 @@
    67 
    - {
    68 
    -   GDesktopAppInfo *desktop_file;
    69 
    -   gboolean no_display;
    70 
    --  const char *current_desktop;
    71 
    -   char *exec;
    72 
    -   char *path;
    73 
    -   GString *desktop_id; /* is ok... really */
    74 
    -@@ -841,9 +840,7 @@
    75 
    -       return;
    76 
    -     }
    77 
    -
    78 
    --  current_desktop = g_getenv ("XDG_CURRENT_DESKTOP");
    79 
    --
    80 
    --  if (current_desktop && !g_desktop_app_info_get_show_in (desktop_file, current_desktop))
    81 
    -+  if (!g_desktop_app_info_get_show_in (desktop_file, NULL))
    82 
    -     {
    83 
    -       g_object_unref (desktop_file);
    84 
    -       return;
    85 
    -@@ -945,7 +942,8 @@
    86 
    -   GDataInputStream *input;
    87 
    -   char *line;
    88 
    -   char *directory;
    89 
    --  const char *current_desktop;
    90 
    -+  gchar **current_desktops = NULL;
    91 
    -+  const gchar *xdg_current_desktop;
    92 
    -   gsize length;
    93 
    -
    94 
    -   file = g_file_new_for_path (index_file);
    95 
    -@@ -961,13 +959,15 @@
    96 
    -     }
    97 
    -
    98 
    -   length = 0;
    99 
    --  current_desktop = g_getenv ("XDG_CURRENT_DESKTOP");
    100 
    -+
    101 
    -+  xdg_current_desktop = g_getenv ("XDG_CURRENT_DESKTOP");
    102 
    -+
    103 
    -+  if (xdg_current_desktop)
    104 
    -+    current_desktops = g_strsplit (xdg_current_desktop, ":", 0);
    105 
    -+
    106 
    -   directory = g_path_get_dirname (index_file);
    107 
    -   input = g_data_input_stream_new (G_INPUT_STREAM (stream));
    108 
    -
    109 
    --  if (current_desktop && current_desktop[0] == '\0')
    110 
    --    current_desktop = NULL;
    111 
    --
    112 
    -   while ((line = g_data_input_stream_read_line (input, &length, NULL, NULL)))
    113 
    -     {
    114 
    -       char *exec;
    115 
    -@@ -982,7 +982,7 @@
    116 
    -
    117 
    -       show_in = parts[3];
    118 
    -
    119 
    --      if (current_desktop && show_in && show_in[0] != '\0')
    120 
    -+      if (current_desktops && show_in && show_in[0] != '\0')
    121 
    -         {
    122 
    -           gchar **sub_parts = g_strsplit (show_in, ";", -1);
    123 
    -           gboolean found_current = FALSE;
    124 
    -@@ -990,7 +990,7 @@
    125 
    -
    126 
    -           for (i = 0; sub_parts[i]; ++i)
    127 
    -             {
    128 
    --              if (g_ascii_strcasecmp (sub_parts[i], current_desktop) == 0)
    129 
    -+              if (g_strv_contains ((const gchar * const *) current_desktops, sub_parts[i]) == 0)
    130 
    -                 {
    131 
    -                   found_current = TRUE;
    132 
    -                   break;
    133 
    -@@ -1041,6 +1041,7 @@
    134 
    -   g_object_unref (input);
    135 
    -   g_object_unref (stream);
    136 
    -   g_object_unref (file);
    137 
    -+  g_strfreev (current_desktops);
    138 
    -   g_free (directory);
    139 
    - }
    140 
    -
    141 
    -

  • debian/patches/1001_autotools-pkg-config-macro-not-cross-compilation-safe.patch deleted
    1 
    -Description: Fix FTCBFS: lintian tag autotools-pkg-config-macro-not-cross-compilation-safe.
    2 
    -Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
    3 
    -
    4 
    ---- a/configure.ac
    5 
    -+++ b/configure.ac
    6 
    -@@ -23,8 +23,8 @@
    7 
    - AC_ISC_POSIX
    8 
    - AC_SUBST(ACLOCAL_AMFLAFS, "$ACLOCAL_FLAGS -I m4")
    9 
    -
    10 
    --AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
    11 
    --if test "x$PKG_CONFIG" = "xno"; then AC_MSG_ERROR([You need to install pkg-config]); fi
    12 
    -+PKG_PROG_PKG_CONFIG
    13 
    -+if test "x$PKG_CONFIG" = "x"; then AC_MSG_ERROR([You need to install pkg-config]); fi
    14 
    -
    15 
    - # Checks for programs.
    16 
    - AC_PROG_CC

  • debian/patches/1001_remove-former-mono-macros.patch
    1 
    +Description: Remove remnants of long-removed mono stuff.
    2 
    +Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
    3 
    +
    4 
    +--- a/configure.ac
    5 
    ++++ b/configure.ac
    6 
    +@@ -32,10 +32,6 @@
    7 
    + AC_PROG_INSTALL
    8 
    + AC_HEADER_STDC
    9 
    +
    10 
    +-SHAMROCK_EXPAND_LIBDIR
    11 
    +-SHAMROCK_EXPAND_BINDIR
    12 
    +-SHAMROCK_EXPAND_DATADIR
    13 
    +-
    14 
    + #
    15 
    + # pkg-config
    16 
    + #

  • debian/patches/1002_spelling-fix.patch
    1 
    +Description: Correctly spell the word "associated".
    2 
    +Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
    3 
    +
    4 
    +--- a/doc/reference/libbamf/html/BamfTab.html
    5 
    ++++ b/doc/reference/libbamf/html/BamfTab.html
    6 
    +@@ -355,7 +355,7 @@
    7 
    + <div class="refsect2">
    8 
    + <a name="BamfTab--desktop-id"></a><h3>The <code class="literal">“desktop-id”</code> property</h3>
    9 
    + <pre class="programlisting">  “desktop-id”               <a href=""><span class="type">gchar</span></a> *</pre>
    10 
    +-<p>The Desktop ID assosciated with the application hosted in the remote Tab.</p>
    11 
    ++<p>The Desktop ID associated with the application hosted in the remote Tab.</p>
    12 
    + <p>Flags: Read</p>
    13 
    + <p>Default value: NULL</p>
    14 
    + </div>
    15 
    +--- a/lib/libbamf/bamf-tab.c
    16 
    ++++ b/lib/libbamf/bamf-tab.c
    17 
    +@@ -158,7 +158,7 @@
    18 
    +                               NULL, G_PARAM_READABLE);
    19 
    +   g_object_class_install_property (obj_class, PROP_LOCATION, pspec);
    20 
    +
    21 
    +-  pspec = g_param_spec_string("desktop-id", "Desktop Name", "The Desktop ID assosciated with the application hosted in the remote Tab",
    22 
    ++  pspec = g_param_spec_string("desktop-id", "Desktop Name", "The Desktop ID associated with the application hosted in the remote Tab",
    23 
    +                               NULL, G_PARAM_READABLE);
    24 
    +   g_object_class_install_property (obj_class, PROP_DESKTOP_ID, pspec);
    25 
    +

  • debian/patches/2001_build-using-mate-common.patch
    ... ... @@ -3,7 +3,7 @@ Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
    3 3
    4 4 
     --- a/autogen.sh
    5 5 
     +++ b/autogen.sh
    6 
    -@@ -16,10 +16,10 @@
    6 
    +@@ -15,10 +15,10 @@
    7 7 
          exit 1
    8 8 
      }
    9 9
    ... ... @@ -16,8 +16,8 @@ Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
    16 16 
          exit 1
    17 17 
      }
    18 18
    19 
    --USE_GNOME2_MACROS=1 . gnome-autogen.sh
    20 
    -+USE_MATE2_MACROS=1 . mate-autogen
    19 
    +-. gnome-autogen.sh
    20 
    ++. mate-autogen
    21 21 
     --- a/configure.ac
    22 22 
     +++ b/configure.ac
    23 23 
     @@ -14,8 +14,8 @@

  • debian/patches/2002_use-dbus-run-session-instead-of-dbus-launch.patch deleted
    1 
    -Description: Stop using dbus-launch during unit tests (use dbus-run-session instead).
    2 
    -Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
    3 
    -
    4 
    ---- a/configure.ac
    5 
    -+++ b/configure.ac
    6 
    -@@ -132,10 +132,10 @@
    7 
    -
    8 
    - if test "x$enable_headless_tests" = "xyes"; then
    9 
    -   AC_PATH_PROG([XVFB],[Xvfb])
    10 
    --  AC_PATH_PROG([DBUS_LAUNCH],[dbus-launch])
    11 
    -+  AC_PATH_PROG([DBUS_RUN_SESSION],[dbus-run-session])
    12 
    -
    13 
    --  if test -z "$XVFB" -o -z "$DBUS_LAUNCH"; then
    14 
    --    AC_MSG_ERROR([Xvfb and dbus-launch are needed for headless-tests])
    15 
    -+  if test -z "$XVFB" -o -z "$DBUS_RUN_SESSION"; then
    16 
    -+    AC_MSG_ERROR([Xvfb and dbus-run-session are needed for headless-tests])
    17 
    -   fi
    18 
    - fi
    19 
    -
    20 
    ---- a/tests/Makefile.am.gtests
    21 
    -+++ b/tests/Makefile.am.gtests
    22 
    -@@ -21,14 +21,7 @@
    23 
    - 	export XDG_CURRENT_DESKTOP="Unity"; \
    24 
    - 	source $(XVFB_RUN); \
    25 
    - 	\
    26 
    --	$(DBUS_LAUNCH) > $(LOG_PATH)/sessionbus.sh; \
    27 
    --	source $(LOG_PATH)/sessionbus.sh; \
    28 
    --	\
    29 
    --	make $(AM_MAKEFLAGS) -k test;
    30 
    --	\
    31 
    --	source $(LOG_PATH)/sessionbus.sh; \
    32 
    --	rm $(LOG_PATH)/sessionbus.sh; \
    33 
    --	kill $$DBUS_SESSION_BUS_PID;
    34 
    -+	$(DBUS_RUN_SESSION) -- make $(AM_MAKEFLAGS) -k test;
    35 
    -
    36 
    - check-local: test-headless
    37 
    -

  • debian/patches/2003_allow-gtk3-deprecated-symbols.patch deleted
    1 
    -Description: Tolerate GTK3 deprecation warnings
    2 
    -Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
    3 
    -
    4 
    ---- a/configure.ac
    5 
    -+++ b/configure.ac
    6 
    -@@ -155,7 +155,7 @@
    7 
    - AM_PATH_GTK_3_0
    8 
    -
    9 
    - dnl CFLAGS
    10 
    --CFLAGS="$CFLAGS -Wall -Werror -Wempty-body -Wformat-security -Winit-self -Warray-bounds -Wimplicit-function-declaration -lm"
    11 
    -+CFLAGS="$CFLAGS -Wall -Wempty-body -Wformat-security -Winit-self -Warray-bounds -Wimplicit-function-declaration -lm"
    12 
    -
    13 
    - AC_SUBST(BAMFDAEMON_CFLAGS)
    14 
    - AC_SUBST(BAMFDAEMON_LIBS)

  • debian/patches/series
    1 
    -0001_allow-colon-separated-values-in-XDG-CURRENT-DESKTOP.patch
    1 
    +1001_remove-former-mono-macros.patch
    2 2 
     2001_build-using-mate-common.patch
    3 
    -2002_use-dbus-run-session-instead-of-dbus-launch.patch
    4 
    -2003_allow-gtk3-deprecated-symbols.patch
    5 
    -1001_autotools-pkg-config-macro-not-cross-compilation-safe.patch
    3 
    +1002_spelling-fix.patch

  • debian/rules
    ... ... @@ -5,8 +5,8 @@ export DEB_LDFLAGS_MAINT_APPEND = -Wl,-z,defs -Wl,--as-needed
    5 5 
     export DPKG_GENSYMBOLS_CHECK_LEVEL = 4
    6 6
    7 7 
     PKD   = $(word 1,$(abspath $(dir $(MAKEFILE_LIST))))
    8 
    -PKG   = $(word 2,$(shell dpkg-parsechangelog -l$(PKD)/changelog | grep ^Source))
    9 
    -UVER  = $(shell dpkg-parsechangelog -l$(PKD)/changelog | perl -ne 'print $$1 if m{^Version:\s+(?:\d+:)?(\d.*)(?:\-\d+.*)};')
    8 
    +PKG   = $(DEB_SOURCE)
    9 
    +UVER  = $(shell echo $(DEB_VERSION) | cut -d "-" -f1)
    10 10 
     DTYPE =
    11 11 
     VER  ?= $(subst $(DTYPE),,$(UVER))
    12 12

    • —
    View it on GitLab.
    You're receiving this email because of your account on salsa.debian.org. If you'd like to receive fewer emails, you can adjust your notification settings.

    Reply to: