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

[Git][debian-mate-team/pluma][master] 10 commits: debian/watch: Convert to Version: 5



Title: GitLab

Jeremy Bícha pushed to branch master at Debian and Ubuntu MATE Packaging Team / pluma

Commits:

  • d60e9868
    by Jeremy Bícha at 2025-10-28T08:52:46-04:00
    debian/watch: Convert to Version: 5
    
  • 79e5aafe
    by Jeremy Bícha at 2025-10-28T08:53:21-04:00
    New upstream release
    
  • b3a6b687
    by Jeremy Bícha at 2025-10-28T09:06:28-04:00
    Update gir handling
    
    Closes: #1118909
    
  • 13bd0394
    by Jeremy Bícha at 2025-10-28T09:07:06-04:00
    Remove gcc-14 patch: applied in new release
    
  • aed6eb5d
    by Jeremy Bícha at 2025-10-28T09:07:18-04:00
    Refresh remaining patch
    
  • 94dcc57a
    by Jeremy Bícha at 2025-10-28T09:07:22-04:00
    Add Build-Depends: libmate-desktop-dev
    
  • fab2494a
    by Jeremy Bícha at 2025-10-28T09:08:03-04:00
    Bump Standards Version to 4.7.2
    
  • 28329dbe
    by Jeremy Bícha at 2025-10-28T09:08:19-04:00
    Remove obsolete Rules-Requires-Root: no field
    
  • 7a69e8ca
    by Jeremy Bícha at 2025-10-28T09:09:31-04:00
    Simplify debian/rules
    
  • 74543deb
    by Jeremy Bícha at 2025-10-28T09:14:13-04:00
    releasing package pluma version 1.28.0-1
    

7 changed files:

Changes:

  • debian/changelog
    1
    +pluma (1.28.0-1) unstable; urgency=medium
    
    2
    +
    
    3
    +  * Team upload
    
    4
    +  * New upstream release
    
    5
    +  * Add Build-Depends: libmate-desktop-dev
    
    6
    +  * Update gir handling (Closes: #1118909)
    
    7
    +  * Remove gcc-14 patch: applied in new release
    
    8
    +  * Simplify debian/rules
    
    9
    +  * debian/watch: Convert to Version: 5
    
    10
    +  * Bump Standards Version to 4.7.2
    
    11
    +
    
    12
    + -- Jeremy Bícha <jbicha@ubuntu.com>  Tue, 28 Oct 2025 09:13:25 -0400
    
    13
    +
    
    1 14
     pluma (1.26.1-2.1) unstable; urgency=medium
    
    2 15
     
    
    3 16
       * Non-maintainer upload, with permission.
    

  • debian/control
    ... ... @@ -7,17 +7,18 @@ Uploaders: Mike Gabriel <sunweaver@debian.org>,
    7 7
                Stefano Karapetsas <stefano@karapetsas.com>,
    
    8 8
                Vangelis Mouhtsis <vangelis@gnugr.org>,
    
    9 9
     Build-Depends: debhelper-compat (= 13),
    
    10
    +               dh-sequence-gir,
    
    10 11
                    dpkg-dev (>= 1.16.1.1),
    
    11
    -               gobject-introspection,
    
    12
    +               gir1.2-gtk-3.0-dev,
    
    13
    +               gir1.2-gtksource-4-dev,
    
    12 14
                    gtk-doc-tools,
    
    13
    -               gettext,
    
    14 15
                    gla11y <!nocheck>,
    
    15 16
                    iso-codes,
    
    16 17
                    libenchant-2-dev,
    
    17
    -               libgirepository1.0-dev,
    
    18 18
                    libglib2.0-dev,
    
    19 19
                    libgtk-3-dev,
    
    20 20
                    libgtksourceview-4-dev,
    
    21
    +               libmate-desktop-dev (>= 1.27.2),
    
    21 22
                    libpeas-dev,
    
    22 23
                    libsm-dev,
    
    23 24
                    libx11-dev,
    
    ... ... @@ -25,11 +26,10 @@ Build-Depends: debhelper-compat (= 13),
    25 26
                    mate-common (>= 1.24.0-1~),
    
    26 27
                    mate-submodules-source (>= 0.0~git20210623.f3091f9),
    
    27 28
                    yelp-tools,
    
    28
    -Standards-Version: 4.6.2
    
    29
    -Rules-Requires-Root: no
    
    29
    +Standards-Version: 4.7.2
    
    30 30
     Vcs-Browser: https://salsa.debian.org/debian-mate-team/pluma
    
    31 31
     Vcs-Git: https://salsa.debian.org/debian-mate-team/pluma.git
    
    32
    -Homepage: http://www.mate-desktop.org/
    
    32
    +Homepage: https://www.mate-desktop.org/
    
    33 33
     
    
    34 34
     Package: pluma
    
    35 35
     Architecture: any
    
    ... ... @@ -87,8 +87,9 @@ Package: pluma-dev
    87 87
     Architecture: any
    
    88 88
     Section: libdevel
    
    89 89
     Depends: pluma (= ${binary:Version}),
    
    90
    -         gir1.2-pluma-1.0 (= ${binary:Version}),
    
    90
    +         ${gir:Depends},
    
    91 91
              ${misc:Depends},
    
    92
    +Provides: ${gir:Provides},
    
    92 93
     Breaks: mate-text-editor (<< 1.5.0),
    
    93 94
     Description: official text editor of the MATE desktop environment (development files)
    
    94 95
      Pluma is a text editor which supports most standard editor features,
    
    ... ... @@ -135,7 +136,6 @@ Section: introspection
    135 136
     Architecture: any
    
    136 137
     Depends: ${gir:Depends},
    
    137 138
              ${misc:Depends},
    
    138
    -         ${shlibs:Depends},
    
    139 139
     Breaks: pluma-dev (<< 1.18.2-2),
    
    140 140
             gir1.2-pluma (<< 1.18.2-2),
    
    141 141
     Replaces: pluma-dev (<< 1.18.2-2),
    

  • debian/patches/0001-filebrowser-fix-warning-Wincompatible-pointer-types.patch deleted
    1
    -Description: Fix FTBFS with GCC 14
    
    2
    -Origin: upstream, commit:6bd34181f2490f313a835ce59f82f696c42a2d0a
    
    3
    -Bug-Debian: https://bugs.debian.org/1075392
    
    4
    -Last-Update: 2024-09-05
    
    5
    -
    
    6
    ---- a/plugins/filebrowser/pluma-file-bookmarks-store.c
    
    7
    -+++ b/plugins/filebrowser/pluma-file-bookmarks-store.c
    
    8
    -@@ -824,10 +824,8 @@ pluma_file_bookmarks_store_get_uri (PlumaFileBookmarksStore * model,
    
    9
    - 				    GtkTreeIter * iter)
    
    10
    - {
    
    11
    - 	GObject * obj;
    
    12
    --	GFile * file = NULL;
    
    13
    - 	guint flags;
    
    14
    - 	gchar * ret = NULL;
    
    15
    --	gboolean isfs;
    
    16
    - 
    
    17
    - 	g_return_val_if_fail (PLUMA_IS_FILE_BOOKMARKS_STORE (model), NULL);
    
    18
    - 	g_return_val_if_fail (iter != NULL, NULL);
    
    19
    -@@ -839,26 +837,25 @@ pluma_file_bookmarks_store_get_uri (PlumaFileBookmarksStore * model,
    
    20
    - 			    &obj,
    
    21
    - 			    -1);
    
    22
    - 
    
    23
    --	if (obj == NULL)
    
    24
    --		return NULL;
    
    25
    --
    
    26
    --	isfs = (flags & PLUMA_FILE_BOOKMARKS_STORE_IS_FS);
    
    27
    --
    
    28
    --	if (isfs && (flags & PLUMA_FILE_BOOKMARKS_STORE_IS_MOUNT))
    
    29
    --	{
    
    30
    --		file = g_mount_get_root (G_MOUNT (obj));
    
    31
    --	}
    
    32
    --	else if (!isfs)
    
    33
    -+	if (obj != NULL)
    
    34
    - 	{
    
    35
    --		file = g_object_ref (obj);
    
    36
    --	}
    
    37
    -+		if (flags & PLUMA_FILE_BOOKMARKS_STORE_IS_FS)
    
    38
    -+		{
    
    39
    -+			if (flags & PLUMA_FILE_BOOKMARKS_STORE_IS_MOUNT)
    
    40
    -+			{
    
    41
    -+				GFile * file;
    
    42
    - 
    
    43
    --	g_object_unref (obj);
    
    44
    -+				file = g_mount_get_root (G_MOUNT (obj));
    
    45
    -+				ret = g_file_get_uri (file);
    
    46
    -+				g_object_unref (file);
    
    47
    -+			}
    
    48
    -+		}
    
    49
    -+		else
    
    50
    -+		{
    
    51
    -+			ret = g_file_get_uri (G_FILE (obj));
    
    52
    -+		}
    
    53
    - 
    
    54
    --	if (file)
    
    55
    --	{
    
    56
    --		ret = g_file_get_uri (file);
    
    57
    --		g_object_unref (file);
    
    58
    -+		g_object_unref (obj);
    
    59
    - 	}
    
    60
    - 
    
    61
    - 	return ret;

  • debian/patches/2001_fix-bin-sh-path-in-shebang.patch
    1 1
     Description: Use /bin/sh instead of /usr/bin/sh in shebang.
    
    2 2
     Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
    
    3
    -Forwarded: <not-needed>, Debian-specific
    
    4 3
     
    
    5 4
     --- a/data/pluma-bugreport.sh.in
    
    6 5
     +++ b/data/pluma-bugreport.sh.in
    
    ... ... @@ -10,42 +9,3 @@ Forwarded: <not-needed>, Debian-specific
    10 9
      
    
    11 10
      PKG_CONFIG_MODULES="glib-2.0 gtk+-3.0 gtksourceview-4 enchant iso-codes"
    
    12 11
      
    13
    ---- a/plugins/externaltools/data/build.tool.in
    
    14
    -+++ b/plugins/externaltools/data/build.tool.in
    
    15
    -@@ -1,4 +1,4 @@
    
    16
    --#!/usr/bin/sh
    
    17
    -+#!/bin/sh
    
    18
    - 
    
    19
    - EHOME=`echo $HOME | sed "s/#/\#/"`
    
    20
    - DIR=$PLUMA_CURRENT_DOCUMENT_DIR
    
    21
    ---- a/plugins/externaltools/data/open-terminal-here.tool.in
    
    22
    -+++ b/plugins/externaltools/data/open-terminal-here.tool.in
    
    23
    -@@ -1,4 +1,4 @@
    
    24
    --#!/usr/bin/sh
    
    25
    -+#!/bin/sh
    
    26
    - 
    
    27
    - #TODO: use "mateconftool-2 -g /desktop/mate/applications/terminal/exec"
    
    28
    - mate-terminal --working-directory=$PLUMA_CURRENT_DOCUMENT_DIR &
    
    29
    ---- a/plugins/externaltools/data/remove-trailing-spaces.tool.in
    
    30
    -+++ b/plugins/externaltools/data/remove-trailing-spaces.tool.in
    
    31
    -@@ -1,3 +1,3 @@
    
    32
    --#!/usr/bin/sh
    
    33
    -+#!/bin/sh
    
    34
    - 
    
    35
    - sed 's/[[:blank:]]*$//'
    
    36
    ---- a/plugins/externaltools/data/run-command.tool.in
    
    37
    -+++ b/plugins/externaltools/data/run-command.tool.in
    
    38
    -@@ -1,4 +1,4 @@
    
    39
    --#!/usr/bin/sh
    
    40
    -+#!/bin/sh
    
    41
    - 
    
    42
    - #TODO: use "gsettings get org.mate.applications-terminal exec"
    
    43
    - exec `zenity --entry --title="Run command - Pluma" --text="Command to run"`
    
    44
    ---- a/plugins/externaltools/data/search-recursive.tool.in
    
    45
    -+++ b/plugins/externaltools/data/search-recursive.tool.in
    
    46
    -@@ -1,4 +1,4 @@
    
    47
    --#!/usr/bin/sh
    
    48
    -+#!/bin/sh
    
    49
    - # Copyright © 2011 Perberos
    
    50
    - # Copyright (C) 2012-2021 MATE Developers
    
    51
    - #

  • debian/patches/series
    1
    -0001-filebrowser-fix-warning-Wincompatible-pointer-types.patch
    
    2 1
     2001_fix-bin-sh-path-in-shebang.patch

  • debian/rules
    1 1
     #!/usr/bin/make -f
    
    2 2
     
    
    3
    -DHFLAGS=--parallel
    
    4
    -
    
    5 3
     export DEB_BUILD_MAINT_OPTIONS = hardening=+all
    
    6
    -DPKG_EXPORT_BUILDFLAGS = 1
    
    7
    -include /usr/share/dpkg/buildflags.mk
    
    8 4
     
    
    9 5
     %:
    
    10
    -	dh $@ $(DHFLAGS) --with gir --without autoreconf
    
    11
    -
    
    12
    -override_dh_missing:
    
    13
    -	dh_missing --fail-missing
    
    6
    +	dh $@ --without autoreconf
    
    14 7
     
    
    15
    -override_dh_install:
    
    8
    +execute_before_dh_install:
    
    16 9
     	rm -rfv debian/tmp/usr/lib/*/pluma/plugins/*.la
    
    17 10
     	rm -rf debian/tmp/usr/lib/*/pluma/plugins/*/*.pyc
    
    18 11
     	rm -rf debian/tmp/usr/lib/*/pluma/plugins/*/*.pyo
    
    19 12
     	rm -rfv debian/tmp/usr/lib/*/pluma/plugins/*/__pycache__/
    
    20 13
     	mkdir -p debian/tmp/usr/share/doc/pluma/
    
    21 14
     	mv debian/tmp/usr/share/gtk-doc/html/pluma debian/tmp/usr/share/doc/pluma/html
    
    22
    -	dh_install
    
    23 15
     
    
    24 16
     override_dh_auto_configure:
    
    25 17
     	# we need libegg from mate-submodules
    
    26 18
     	cd pluma/mate-submodules/; tar xvJf /usr/src/mate-submodules-source.tar.xz
    
    27 19
     	# upstream tarball is without configure. autogen.sh will create it
    
    28 20
     	NOCONFIGURE=1 ./autogen.sh
    
    29
    -	dh_auto_configure $(DHFLAGS) -- \
    
    30
    -		--disable-silent-rules \
    
    31
    -		--libexecdir=/usr/libexec \
    
    21
    +	dh_auto_configure -- \
    
    32 22
     		--enable-gtk-doc
    
    33 23
     
    
    34 24
     override_dh_installchangelogs:
    
    ... ... @@ -36,6 +26,3 @@ override_dh_installchangelogs:
    36 26
     
    
    37 27
     override_dh_auto_test:
    
    38 28
     	DEB_BUILD_OPTIONS=nocheck dh_auto_test
    39
    -
    
    40
    -get-orig-source:
    
    41
    -	uscan --noconf --force-download --rename --download-current-version --destdir=..

  • debian/watch
    1
    -version=4
    
    2
    -https://git.mate-desktop.org/pluma/ \
    
    3
    -    snapshot/pluma-(\d\.(?:[0-9]+|)[24680]\.\d)\.tar\.xz
    1
    +Version: 5
    
    2
    +Source: https://git.mate-desktop.org/@PACKAGE@/
    
    3
    +Matching-Pattern: snapshot/@PACKAGE@-(\d\.[\d]+[02468]\.\d)@ARCHIVE_EXT@


  • Reply to: