[SCM] mate-user-share Debian package branch, master, updated. 0a1a68db8e6ef27a56956df0d893af5b265c17d6
Mike Gabriel
sunweaver at alioth.debian.org
Thu Aug 15 22:44:32 UTC 2013
Gitweb-URL: http://git.debian.org/?p=pkg-mate/mate-user-share.git;a=commitdiff;h=0a1a68d
The following commit has been merged in the master branch:
commit 0a1a68db8e6ef27a56956df0d893af5b265c17d6
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Fri Aug 16 00:43:12 2013 +0200
add /debian packaging folder as provided by upstream internal packaging repos
---
debian/changelog | 46 +++++++++++++++++++++++++
debian/compat | 1 +
debian/control | 37 ++++++++++++++++++++
debian/copyright | 44 +++++++++++++++++++++++
debian/patches/01_apache-config.patch | 17 +++++++++
debian/patches/02_fix-callback-argument.patch | 24 +++++++++++++
debian/patches/series | 2 ++
debian/rules | 19 ++++++++++
debian/source/format | 1 +
debian/watch | 3 ++
10 files changed, 194 insertions(+)
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000..46fad9c
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,46 @@
+mate-user-share (1.6.0-2) unstable; urgency=low
+
+ * debian/rules: Dont remove xdg folder.
+ * Add 02_fix-callback-argument.patch.
+
+ -- Stefano Karapetsas <stefano at karapetsas.com> Tue, 30 Apr 2013 15:04:22 +0200
+
+mate-user-share (1.6.0-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Stefano Karapetsas <stefano at karapetsas.com> Tue, 02 Apr 2013 23:49:39 +0200
+
+mate-user-share (1.5.1-1) unstable; urgency=low
+
+ * New upstream development release.
+ * Use libnotify instead of libmatenofity.
+
+ -- Stefano Karapetsas <stefano at karapetsas.com> Sat, 23 Mar 2013 15:23:57 +0100
+
+mate-user-share (1.5.0-1) unstable; urgency=low
+
+ * New upstream development release.
+
+ -- Stefano Karapetsas <stefano at karapetsas.com> Tue, 04 Dec 2012 07:45:04 +0100
+
+mate-user-share (1.4.1-1) unstable; urgency=low
+
+ * New upstream release.
+ * Changed gconf to mateconf in desktop_mate_file_sharing.schemas.
+ * debian/control
+ * depends on debhelper version 8 instead of version 5.
+
+ -- Steve Zesch <stevezesch2 at gmail.com> Wed, 18 Jul 2012 13:19:34 -0400
+
+mate-user-share (1.4.0-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Steve Zesch <stevezesch2 at gmail.com> Sun, 15 Jul 2012 15:59:51 -0400
+
+mate-user-share (1.3.0-1) unstable; urgency=low
+
+ * Initial release.
+
+ -- Steve Zesch <stevezesch2 at gmail.com> Tue, 15 May 2012 12:06:10 -0400
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..45a4fb7
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+8
diff --git a/debian/control b/debian/control
new file mode 100644
index 0000000..13dd031
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,37 @@
+Source: mate-user-share
+Section: mate
+Priority: optional
+Maintainer: Stefano Karapetsas <stefano at karapetsas.com>
+Uploaders: Steve Zesch <stevezesch2 at gmail.com>
+Build-Depends: cdbs,
+ debhelper (>= 8),
+ quilt,
+ intltool (>= 0.35.0),
+ mate-doc-utils,
+ libxt-dev,
+ pkg-config,
+ libdbus-1-dev (>= 1.1.1),
+ libglib2.0-dev (>= 2.15.2),
+ libgtk2.0-dev (>= 2.12.0),
+ libdbus-glib-1-dev,
+ libnotify-dev,
+ libcanberra-gtk-dev,
+ libselinux1-dev [linux-any],
+ libmatebluetooth-dev (>= 1.5.0) [linux-any],
+ libunique-dev,
+ libcaja-extension-dev (>= 1.5.0),
+ mate-common
+Standards-Version: 3.9.3
+
+Package: mate-user-share
+Architecture: any
+Depends: ${shlibs:Depends},
+ ${misc:Depends},
+ apache2.2-bin,
+ libapache2-mod-dnssd (>= 0.6),
+ obex-data-server [linux-any],
+ mate-bluetooth [linux-any]
+Description: User level public file sharing via WebDAV or ObexFTP
+ mate-user-share is a small package that allows easy user-level file sharing
+ via WebDAV or ObexFTP. The shared files are announced on the network
+ by Avahi.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 0000000..844b857
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,44 @@
+This work was packaged for Debian by:
+
+ Stefano Karapetsas <stefano at karapetsas.com>
+
+It was downloaded from http://ftp.gnome.org/pub/GNOME/sources/gnome-user-share/
+
+Upstream Authors:
+ Perberos <perberos at gmail.com>
+ Stefano Karapetsas <stefano at karapetsas.com>
+ Steve Zesch <stevezesch2 at gmail.com>
+
+Copyright Holders:
+ Copyright (C) 2012 Perberos
+
+License:
+
+ This package is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License as
+ published by the Free Software Foundation; either version 2 of the
+ License, or (at your option) any later version.
+
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+
+On Debian systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL-2'.
+
+For md5.[ch]:
+ This code implements the MD5 message-digest algorithm.
+ The algorithm is due to Ron Rivest. This code was
+ written by Colin Plumb in 1993, no copyright is claimed.
+ This code is in the public domain; do with it what you wish.
+
+ Equivalent code is available from RSA Data Security, Inc.
+ This code has been tested against that, and is equivalent,
+ except that you don't need to include two pages of legalese
+ with every copy.
+
diff --git a/debian/patches/01_apache-config.patch b/debian/patches/01_apache-config.patch
new file mode 100644
index 0000000..ad50ffc
--- /dev/null
+++ b/debian/patches/01_apache-config.patch
@@ -0,0 +1,17 @@
+--- a/data/dav_user_2.2.conf.orig 2009-06-27 10:28:32.044136148 +0200
++++ b/data/dav_user_2.2.conf 2009-06-27 10:30:11.067899425 +0200
+@@ -14,11 +14,14 @@
+ LoadModule auth_digest_module ${HTTP_MODULES_PATH}/mod_auth_digest.so
+ LoadModule authz_groupfile_module ${HTTP_MODULES_PATH}/mod_authz_groupfile.so
+ LoadModule dnssd_module ${HTTP_MODULES_PATH}/mod_dnssd.so
++LoadModule mime_module ${HTTP_MODULES_PATH}/mod_mime.so
+
+ DNSSDEnable on
+ DNSSDAutoRegisterVHosts Off
+ DNSSDAutoRegisterUserDir Off
+
++TypesConfig /etc/mime.types
++
+ <VirtualHost *>
+ DocumentRoot ${XDG_PUBLICSHARE_DIR}
+
diff --git a/debian/patches/02_fix-callback-argument.patch b/debian/patches/02_fix-callback-argument.patch
new file mode 100644
index 0000000..22f1162
--- /dev/null
+++ b/debian/patches/02_fix-callback-argument.patch
@@ -0,0 +1,24 @@
+From 86a4c47fb645ef8895557c52b6ef67c7091ad6e9 Mon Sep 17 00:00:00 2001
+From: Stefano Karapetsas <stefano at karapetsas.com>
+Date: Tue, 30 Apr 2013 12:56:26 +0000
+Subject: Fix data passed to disabled_timeout_callback
+
+In mate-user-share/src/user_share.c, the wrong variable is being passed as
+a gsettings pointer to the disabled_timeout_callback.
+https://bugs.launchpad.net/linuxmint/+bug/1005649/comments/36
+---
+diff --git a/src/user_share.c b/src/user_share.c
+index 35e4a27..53ceec1 100644
+--- a/src/user_share.c
++++ b/src/user_share.c
+@@ -346,7 +346,7 @@ file_sharing_enabled_changed (GSettings *settings, gchar *key, gpointer data)
+ http_down ();
+ disabled_timeout_tag = g_timeout_add_seconds (3,
+ (GSourceFunc)disabled_timeout_callback,
+- client);
++ settings);
+ }
+ }
+
+--
+cgit
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..abd9f1d
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+01_apache-config.patch
+02_fix-callback-argument.patch
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 0000000..4ccf58e
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,19 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/autotools.mk
+
+DEB_CONFIGURE_SCRIPT := ./autogen.sh
+
+DEB_DH_MAKESHLIBS_ARGS += --exclude=libcaja-share-extension.so
+
+DEB_CONFIGURE_EXTRA_FLAGS += \
+ --with-httpd=/usr/lib/apache2/mpm-worker/apache2 \
+ --with-modules-path=/usr/lib/apache2/modules/
+
+install/mate-user-share::
+ rm -f debian/mate-user-share/usr/share/mate-user-share/dav_user_2.0.conf
+ find debian/mate-user-share -name "*.la" -delete
+
+get-orig-source:
+ uscan --noconf --force-download --rename --download-current-version --destdir=..
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..b49bb9c
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,3 @@
+version=3
+opts=filenamemangle=s/.*\/mate-user-share-?([\d\.-]+)\.tar\.gz/mate-user-share-$1.tar.gz/ \
+https://github.com/mate-desktop/mate-user-share/tags .*/archive/mate-user-share-?([\d\.]+).tar.gz
--
mate-user-share Debian package
More information about the pkg-mate-commits
mailing list