...
 
Commits (36)
......@@ -6,5 +6,4 @@ usr/lib/*/pkgconfig/caja-sendto.pc
usr/share/caja-extensions/caja-sendto.ui
usr/share/caja/extensions/libcaja-sendto.caja-extension
usr/share/glib-2.0/schemas/org.mate.Caja.Sendto.gschema.xml
usr/share/gtk-doc/html/caja-sendto/
usr/share/man/man1/caja-sendto.*
caja-extensions (1.20.0-0ubuntu1) UNRELEASED; urgency=medium
caja-extensions (1.22.1-1) unstable; urgency=medium
[ Martin Wimpress ]
* New upstream release.
-- Mike Gabriel <sunweaver@debian.org> Fri, 27 Sep 2019 19:32:36 +0200
caja-extensions (1.22.0-3) unstable; urgency=medium
[ Martin Wimpress ]
* debian/patches:
+ Add 0001_build_with_gupnp10_or_gupnp12.patch. Build either with gupnp
version 1.0 or 1.2.
-- Mike Gabriel <sunweaver@debian.org> Mon, 02 Sep 2019 16:52:03 +0200
caja-extensions (1.22.0-2) unstable; urgency=medium
[ Martin Wimpress ]
* debian/control:
+ The libgupnp/libgssdp dev bin:pkgs have been renamed recently.
So, let's update the B-Ds accordingly by requiring an alternative
B-D on libgupnp-1.0-dev or libgupnp-1.2-dev. This temporarily
works around newer libgupnp/libgssdp in Ubuntu (compared to Debian).
-- Mike Gabriel <sunweaver@debian.org> Fri, 02 Aug 2019 18:43:42 +0200
caja-extensions (1.22.0-1) unstable; urgency=medium
[ Martin Wimpress ]
* New upstream release.
* debian/control:
+ Updated for MATE Desktop 1.22
[ Mike Gabriel ]
* debian/{compat,control}:
+ Use debhelper-compat notation. Bump to DH compat level version 12.
* debian/control:
+ Bump Standards-Version: to 4.4.0. No changes needed.
* debian/rules:
+ Drop dbgsym-migration dh_strip override.
* debian/copyright:
+ Update copyright attributions.
-- Mike Gabriel <sunweaver@debian.org> Wed, 31 Jul 2019 16:25:58 +0200
caja-extensions (1.20.2-1) unstable; urgency=medium
* New upstream release.
* debian/control:
+ Bump Standards-Version: to 4.3.0. No changes needed.
-- Mike Gabriel <sunweaver@debian.org> Fri, 04 Jan 2019 19:25:30 +0100
caja-extensions (1.20.1-1) unstable; urgency=medium
* New upstream release.
* debian/patches:
+ Add 1001_pkg-config-macro-not-cross-compilation-safe.patch.
Simplify PKG_CONFIG presence check.
* debian/control:
+ Update Vcs-*: fields. Package has been migrated to salsa.debian.org.
+ Bump Standards-Version: to 4.1.4. No changes needed.
+ Drop pkg-mate-team Alioth mailing list from Uploaders: field.
+ White-space fix at EOF.
* debian/rules:
+ Don't build gtk-doc for sendto extension. Should fix FTCBFS. (Closes:
#890522).
* debian/caja-sendto.install:
+ Drop gtk-doc folder.
* debian/copyright:
+ Use secure URI for copyright format.
+ Fix typo in Upstream-Name: field (and make it more human readable).
+ Update Upstream-Contact: field.
+ Use upstream Git URL in Source: field.
+ Make Upstream-Name: field's value more human readable.
+ Update copyright attributions.
* debian/upstream/metadata:
+ Add file. Be compliant with DEP-12 proposal.
-- Mike Gabriel <sunweaver@debian.org> Thu, 05 Jul 2018 13:24:31 +0200
caja-extensions (1.20.0-1) unstable; urgency=medium
[ Martin Wimpress ]
* debian/copyright (already in 1.19.0-0ubuntu1):
+ Update copyright attributions.
[ Vangelis Mouhtsis ]
* debian/control (already in 1.19.0-0ubuntu1):
+ Temporarily have pkg-mate-team ML under Uploaders:.
+ Update Maintainer: field to debian-mate ML on lists.debian.org.
+ Rename pretty name of our team -> Debian+Ubuntu MATE Packaging Team.
[ Mike Gabriel ]
* debian/patches:
+ Add 1001_pkg-config-macro-not-cross-compilation-safe.patch. Make
configure.ac cross-compile safe. Thanks to Helmut Grohne for input
on this.
-- Mike Gabriel <sunweaver@debian.org> Wed, 14 Feb 2018 14:36:24 +0100
caja-extensions (1.20.0-0ubuntu1) bionic; urgency=medium
* New upstream release.
-- Martin Wimpress <martin.wimpress@ubuntu.com> Wed, 07 Feb 2018 14:03:56 +0000
caja-extensions (1.19.0-0ubuntu1) UNRELEASED; urgency=medium
caja-extensions (1.19.0-0ubuntu1) bionic; urgency=medium
* New upstream release.
......
......@@ -6,23 +6,23 @@ Uploaders: Mike Gabriel <sunweaver@debian.org>,
John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>,
Stefano Karapetsas <stefano@karapetsas.com>,
Vangelis Mouhtsis <vangelis@gnugr.org>,
MATE Packaging Team <pkg-mate-team@lists.alioth.debian.org>,
Build-Depends: debhelper (>= 11~),
Build-Depends: debhelper-compat (=12),
dpkg-dev (>= 1.16.1.1),
libcaja-extension-dev (>= 1.18),
libcaja-extension-dev (>= 1.22),
libdbus-1-dev,
libdbus-glib-1-dev,
libdconf-dev,
libgtk-3-dev,
libgupnp-1.0-dev,
libgupnp-1.0-dev | libgupnp-1.2-dev,
libmate-desktop-dev (>= 1.18),
libstartup-notification0-dev,
mate-common (>= 1.18),
pkg-config,
Standards-Version: 4.1.3
Standards-Version: 4.4.1
Rules-Requires-Root: no
Homepage: http://www.mate-desktop.org/
Vcs-Browser: https://anonscm.debian.org/git/pkg-mate/caja-extensions.git
Vcs-Git: https://anonscm.debian.org/git/pkg-mate/caja-extensions.git
Vcs-Browser: https://salsa.debian.org/debian-mate-team/caja-extensions
Vcs-Git: https://salsa.debian.org/debian-mate-team/caja-extensions.git
Package: caja-image-converter
Architecture: any
......@@ -118,4 +118,3 @@ Description: Caja extensions (common files)
.
This package contains the architecture independent files for
various available Caja extensions.
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: caja-extentions
Upstream-Contact: Stafano Karapetsas <stefano@karapetsas.com>
Source: http://pub.mate-desktop.org/releases/
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: Caja Extensions
Upstream-Contact: Martin Wimpress <martin@mate-desktop.org>
Source: https://git.mate-desktop.org/caja-extensions
Files: image-converter/caja-image-converter.c
image-converter/caja-image-converter.h
......@@ -20,7 +20,8 @@ Copyright: 2005, Adam Israel
2014, Stefano Karapetsas
License: GPL-2+
Files: .tx/config
Files: .travis.yml
.tx/config
.github/issue_template.md
gksu/Makefile.am
gksu/libcaja-gksu.c
......@@ -60,6 +61,7 @@ Files: .tx/config
README
autogen.sh
configure.ac
makepot
Copyright: *No copyright*
License: GPL-2+
Comment:
......@@ -126,7 +128,8 @@ Files: xattr-tags/caja-xattr-tags-extension.c
Copyright: 2016 Felipe Barriga Richards
License: GPL-2+
Files: po/*.po
Files: caja-extensions.pot
po/*.po
Copyright: THE PACKAGE'S COPYRIGHT HOLDER
License: GPL-2+
Comment:
......
Description: Make configure.ac cross compile safe.
Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
--- a/configure.ac
+++ b/configure.ac
@@ -21,14 +21,11 @@
MATE_COMMON_INIT
-# Check for pkgconfig first
-AC_CHECK_PROG(HAVE_PKGCONFIG, pkg-config, yes, no)
-AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-
+PKG_PROG_PKG_CONFIG
# Give error and exit if we dont have pkgconfig
-if test "x$HAVE_PKGCONFIG" = "xno"; then
+AS_IF([test "x$PKG_CONFIG" = "x"],[
AC_MSG_ERROR([you need to have pkgconfig installed !])
-fi
+])
GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0`
AC_SUBST(GLIB_GENMARSHAL)
@@ -45,14 +42,14 @@
[enable_image_converter=$enableval],
[enable_image_converter=yes])
-if test "x$enable_image-converter" = "xyes"; then
+AS_IF([test "x$enable_image-converter" = "xyes"],[
PKG_CHECK_MODULES(IMAGE_CONVERTER,
gtk+-3.0 >= $GTK_REQUIRED
glib-2.0 >= $GLIB_REQUIRED
gio-2.0 >= $GLIB_REQUIRED)
AC_SUBST(IMAGE_CONVERTER_CFLAGS)
AC_SUBST(IMAGE_CONVERTER_LIBS)
-fi
+])
AM_CONDITIONAL(ENABLE_IMAGE_CONVERTER, test x"$enable_image_converter" = "xyes")
@@ -62,13 +59,13 @@
[enable_open_terminal=$enableval],
[enable_open_terminal=yes])
-if test "x$enable_open_terminal" = "xyes"; then
+AS_IF([test "x$enable_open_terminal" = "xyes"],[
PKG_CHECK_MODULES(OPENTERMINAL,
glib-2.0 >= $GLIB_REQUIRED
mate-desktop-2.0 >= $LIBMATE_DESKTOP_REQUIRED)
AC_SUBST(OPENTERMINAL_CFLAGS)
AC_SUBST(OPENTERMINAL_LIBS)
-fi
+])
AM_CONDITIONAL(ENABLE_OPEN_TERMINAL, test x"$enable_open_terminal" = "xyes")
@@ -78,7 +75,7 @@
[enable_sendto=$enableval],
[enable_sendto=yes])
-if test "x$enable_sendto" = "xyes"; then
+AS_IF([test "x$enable_sendto" = "xyes"],[
GTHREAD_REQUIRED=2.6.0
DBUS_REQUIRED=1.0
DBUS_GLIB_REQUIRED=0.60
@@ -97,11 +94,11 @@
sendto_plugin_error_or_ignore()
{
- if test "${error_on_bad_sendto_plugin}" = "1" ; then
+ AS_IF([test "${error_on_bad_sendto_plugin}" = "1"],[
AC_MSG_ERROR([$1])
- else
+ ],[
AC_MSG_WARN([$1 (disabling sendto plugin)])
- fi
+ ])
}
AC_ARG_WITH([sendto-plugins],
@@ -111,15 +108,15 @@
used_sendto_plugins=""
used_sendto_plugins2=""
- if test "x${with_sendto_plugins}" = "xautodetect" ; then
+ AS_IF([test "x${with_sendto_plugins}" = "xautodetect"],[
# Default to all plugins and just ignore them if they won't compile
with_sendto_plugins="all"
error_on_bad_sendto_plugin="0"
- else
+ ],[
# Clean up the plugin list and error if a plugin won't compile
with_sendto_plugins=`echo ,"${with_sendto_plugins}", | sed -e 's/[[ ,]][[ ,]]*/ /g' -e 's/,$//'`
error_on_bad_sendto_plugin="1"
- fi
+ ])
# Iterate through the wanted plugins and weed out bad ones (or error)
for wanted_sendto_plugin in ${with_sendto_plugins}; do
@@ -215,9 +212,9 @@
SENDTO_PLUGINS=$used_sendto_plugins2
dnl Error out if no plugins will be built
- if test -z "${SENDTO_PLUGINS}" ; then
+ AS_IF([test -z "${SENDTO_PLUGINS}"],[
AC_MSG_ERROR([No sendto plugins will be built, and caja-sendto requires at least one])
- fi
+ ])
AC_MSG_CHECKING([which sendto plugins to compile])
AC_MSG_RESULT([$SENDTO_PLUGINS])
@@ -230,12 +227,12 @@
dnl For the GIO based plugins
enable_nst_common=no
- if test "x$enable_burn" = "xyes" -o "x$enable_removable" = "xyes"; then
+ AS_IF([test "x$enable_burn" = "xyes" -o "x$enable_removable" = "xyes"],[
enable_nst_common=yes
- fi
+ ])
AM_CONDITIONAL(HAVE_GIO, test "x$enable_nst_common" = "xyes")
- if test "x${SENDTO_PLUGINS}" != "x" ; then
+ AS_IF([test "x${SENDTO_PLUGINS}" != "x"],[
for allowed_sendto_plugin in ${ALL_SENDTO_PLUGINS}; do
for sendto_plugin in ${SENDTO_PLUGINS}; do
case ${allowed_sendto_plugin} in
@@ -248,10 +245,10 @@
done
AC_MSG_NOTICE([ ${allowed_sendto_plugin} sendto plugin disabled])
done
- else
+ ],[
AC_MSG_NOTICE([ No caja-sendto plugins enabled])
- fi
-fi
+ ])
+])
AM_CONDITIONAL(ENABLE_SENDTO, test x"$enable_sendto" = "xyes")
# share extension
@@ -260,12 +257,12 @@
[enable_share=$enableval],
[enable_share=yes])
-if test "x$enable_share" = "xyes"; then
+AS_IF([test "x$enable_share" = "xyes"],[
PKG_CHECK_MODULES(SHARE,
glib-2.0 >= $GLIB_REQUIRED)
AC_SUBST(SHARE_CFLAGS)
AC_SUBST(SHARE_LIBS)
-fi
+])
AM_CONDITIONAL(ENABLE_SHARE, test x"$enable_share" = "xyes")
@@ -298,9 +295,9 @@
AS_HELP_STRING([--with-cajadir=DIR],[Installation path for Caja extension @<:@auto@:>@]),
[ac_with_cajadir=$withval],
[ac_with_cajadir=""])
-if test "${ac_with_cajadir}" = ""; then
+AS_IF([test "${ac_with_cajadir}" = ""],[
ac_with_cajadir=`$PKG_CONFIG --variable=extensiondir libcaja-extension`
-fi
+])
AC_MSG_NOTICE([Installing caja plugins in ${ac_with_cajadir}])
AC_SUBST([CAJA_EXTENSION_DIR],[${ac_with_cajadir}])
2001_support-icedove-in-caja-sendto.patch
1001_pkg-config-macro-not-cross-compilation-safe.patch
......@@ -25,11 +25,8 @@ override_dh_auto_configure:
NOCONFIGURE=1 ./autogen.sh
dh_auto_configure $(DHFLAGS) -- \
--disable-silent-rules \
--disable-gksu \
--enable-gtk-doc
override_dh_strip:
dh_strip --dbgsym-migration='caja-extensions-dbg (<< 1.14.0-2~)'
--disable-gtk-doc \
--disable-gksu
get-orig-source:
uscan --noconf --force-download --rename --download-current-version --destdir=..
Name: Caja Extentions
Bug-Database: https://github.com/mate-desktop/caja-extensions/issues
Bug-Submit: https://github.com/mate-desktop/caja-extensions/issues/new
Contact: martin@mate-desktop.org
Donation: http://mate-desktop.org/donate/
Repository: https://github.com/mate-desktop/caja-extensions
Repository-Browse: https://github.com/mate-desktop/caja-extensions
Security-Contact: security@mate-desktop.org