[Pkg-xfce-commits] [Git][xfce-team/desktop/libxfce4util][debian/master] d/p/*, d/rules: Add all patches, but guard based on dpkg-vendor.

[Unit 193]

Unit 193   pushed to branch debian/master at xfce / desktop / libxfce4util


Commits:
f39c9d06 by Unit 193 at 2019-05-24T22:50:52Z
d/p/*, d/rules: Add all patches, but guard based on dpkg-vendor.

- - - - -


5 changed files:

- debian/changelog
- debian/patches/01_add-desktop-base-in-config-dirs.patch
- debian/patches/series
- debian/patches/xubuntu_desktop-x-ubuntu-gettext.patch
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,5 +1,6 @@
 libxfce4util (4.13.3-1) UNRELEASED; urgency=medium
 
+  [ Yves-Alexis Perez ]
   * New upstream version 4.13.3
   * d/control: update standards version to 4.3.0
   * d/control: drop Lionel from uploaders, thanks!
@@ -7,6 +8,9 @@ libxfce4util (4.13.3-1) UNRELEASED; urgency=medium
   * d/libxfce4util7.symbols updated for new release
   * Ubuntu-specific patch series dropped
 
+  [ Unit 193 ]
+  * d/p/*, d/rules: Add all patches, but guard based on dpkg-vendor.
+
  -- Yves-Alexis Perez <corsac at debian.org>  Wed, 22 May 2019 11:45:32 +0200
 
 libxfce4util (4.13.2-1) experimental; urgency=medium


=====================================
debian/patches/01_add-desktop-base-in-config-dirs.patch
=====================================
@@ -6,15 +6,17 @@ Index: libxfce4util-4.8.2/libxfce4util/xfce-resource.c
 ===================================================================
 --- libxfce4util-4.8.2.orig/libxfce4util/xfce-resource.c	2011-09-12 20:45:56.000000000 +0200
 +++ libxfce4util-4.8.2/libxfce4util/xfce-resource.c	2011-09-12 22:36:08.024034835 +0200
-@@ -221,6 +221,12 @@
+@@ -221,6 +221,14 @@
    _res_split_and_append (dirs, XFCE_RESOURCE_CONFIG);
    _res_split_and_append (SYSCONFDIR "/xdg", XFCE_RESOURCE_CONFIG);
  
++#ifdef DEBIAN
 +  /* add desktop-base config files to the list. quick and dirty
 +   * patch for Etch
 +   */
 +  _res_split_and_append ("/usr/share/desktop-base/profiles/xdg-config", 
 +		  XFCE_RESOURCE_CONFIG);
++#endif
 +
    /*
     * Icons dirs


=====================================
debian/patches/series
=====================================
@@ -1 +1,2 @@
 01_add-desktop-base-in-config-dirs.patch
+xubuntu_desktop-x-ubuntu-gettext.patch


=====================================
debian/patches/xubuntu_desktop-x-ubuntu-gettext.patch
=====================================
@@ -7,17 +7,20 @@ Forwarded: not-needed
 
 --- libxfce4util-4.6.0.orig/libxfce4util/xfce-rc.c
 +++ libxfce4util-4.6.0/libxfce4util/xfce-rc.c
-@@ -506,11 +506,25 @@
+@@ -506,11 +506,30 @@
                      const gchar  *fallback)
  {
    const gchar *value;
++#ifdef UBUNTU
 +  gboolean     has_gettext_domain;
 +  const gchar *gettext_domain;
++#endif
  
    g_return_val_if_fail (rc != NULL, fallback);
    g_return_val_if_fail (rc->read_entry != NULL, fallback);
    g_return_val_if_fail (key != NULL, fallback);
  
++#ifdef UBUNTU
 +  has_gettext_domain = xfce_rc_has_entry (rc, "X-Ubuntu-Gettext-Domain");
 +
 +  if (has_gettext_domain == TRUE && (strcmp (key, "Name") == 0 || strcmp (key, "GenericName") == 0 || strcmp (key, "Comment") == 0))
@@ -30,6 +33,8 @@ Forwarded: not-needed
 +      return value;
 +    }
 +  }
++#endif
++
    value = (*rc->read_entry) (rc, key, TRUE);
    if (value == NULL)
      value = fallback;


=====================================
debian/rules
=====================================
@@ -3,6 +3,12 @@
 export DEB_LDFLAGS_MAINT_APPEND=-Wl,--as-needed -Wl,-O1 -Wl,-z,defs
 export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 
+ifeq ($(shell dpkg-vendor --derives-from Ubuntu && echo yes),yes)
+	export DEB_CPPFLAGS_MAINT_APPEND=-DUBUNTU
+else
+	export DEB_CPPFLAGS_MAINT_APPEND=-DDEBIAN
+endif
+
 override_dh_install:
 	dh_install -X .la
 



View it on GitLab: https://salsa.debian.org/xfce-team/desktop/libxfce4util/commit/f39c9d067b39633e0b1d56967705ea6c17bfeb56

-- 
View it on GitLab: https://salsa.debian.org/xfce-team/desktop/libxfce4util/commit/f39c9d067b39633e0b1d56967705ea6c17bfeb56
You're receiving this email because of your account on salsa.debian.org.

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-xfce-commits/attachments/20190524/3fb979d5/attachment-0001.html>