r20474 - in /desktop/unstable/gnome-user-share/debian: changelog control control.in dirs patches/01_apache-config.patch preinst rules
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Sat Jun 27 09:18:21 UTC 2009
Author: joss
Date: Sat Jun 27 09:18:20 2009
New Revision: 20474
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=20474
Log:
* Wrap build-depends and depends.
* New upstream release. Closes: #530761.
* 01_apache-config.patch: updated for the new version, removed
obsolete chunk.
* Only depend on apache2.2-bin. Kudos to the Apache maintainers for
making this possible.
* Explicitly use the path to the worker variant of Apache.
* Require the package that contains mod_dnssd.
* Depend on gnome-bluetooth instead of bluez-gnome.
* Require obex-data-server 0.4 for the new API.
* Move autostart file to /usr/share/gnome/autostart.
* preinst: remove the conffile accordingly.
Added:
desktop/unstable/gnome-user-share/debian/dirs
Modified:
desktop/unstable/gnome-user-share/debian/changelog
desktop/unstable/gnome-user-share/debian/control
desktop/unstable/gnome-user-share/debian/control.in
desktop/unstable/gnome-user-share/debian/patches/01_apache-config.patch
desktop/unstable/gnome-user-share/debian/preinst
desktop/unstable/gnome-user-share/debian/rules
Modified: desktop/unstable/gnome-user-share/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-user-share/debian/changelog?rev=20474&op=diff
==============================================================================
--- desktop/unstable/gnome-user-share/debian/changelog (original)
+++ desktop/unstable/gnome-user-share/debian/changelog Sat Jun 27 09:18:20 2009
@@ -1,9 +1,24 @@
-gnome-user-share (0.31-4) UNRELEASED; urgency=low
-
+gnome-user-share (2.26.0-1) unstable; urgency=low
+
+ [ Loic Minier ]
* Don't rm_conffile /etc/xdg/autostart/gnome-user-share-session.desktop
during first installation.
- -- Loic Minier <lool at dooz.org> Fri, 28 Nov 2008 20:44:12 +0100
+ [ Josselin Mouette ]
+ * Wrap build-depends and depends.
+ * New upstream release. Closes: #530761.
+ * 01_apache-config.patch: updated for the new version, removed
+ obsolete chunk.
+ * Only depend on apache2.2-bin. Kudos to the Apache maintainers for
+ making this possible.
+ * Explicitly use the path to the worker variant of Apache.
+ * Require the package that contains mod_dnssd.
+ * Depend on gnome-bluetooth instead of bluez-gnome.
+ * Require obex-data-server 0.4 for the new API.
+ * Move autostart file to /usr/share/gnome/autostart.
+ * preinst: remove the conffile accordingly.
+
+ -- Josselin Mouette <joss at debian.org> Sat, 27 Jun 2009 11:12:12 +0200
gnome-user-share (0.31-3) unstable; urgency=medium
Modified: desktop/unstable/gnome-user-share/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-user-share/debian/control?rev=20474&op=diff
==============================================================================
--- desktop/unstable/gnome-user-share/debian/control (original)
+++ desktop/unstable/gnome-user-share/debian/control Sat Jun 27 09:18:20 2009
@@ -2,13 +2,31 @@
Section: gnome
Priority: optional
Maintainer: Sebastian Dröge <slomo at debian.org>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
-Build-Depends: cdbs, debhelper (>= 5), gnome-pkg-tools, libselinux1-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libglib2.0-dev (>= 2.15.2), libx11-dev, libxt-dev, libgtk2.0-dev (>= 2.4.0), libgconf2-dev, libavahi-client-dev (>= 0.6), libavahi-glib-dev (>= 0.6), libdbus-1-dev (>= 1.1.1), libdbus-glib-1-dev, libxml-parser-perl
-Standards-Version: 3.7.3
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Loic Minier <lool at dooz.org>
+Build-Depends: cdbs,
+ debhelper (>= 5),
+ gnome-pkg-tools,
+ intltool (>= 0.35.0),
+ gnome-doc-utils,
+ libxt-dev,
+ pkg-config,
+ libdbus-1-dev (>= 1.1.1),
+ libglib2.0-dev (>= 2.15.2),
+ libgtk2.0-dev (>= 2.12.0),
+ libgconf2-dev,
+ libdbus-glib-1-dev,
+ libnotify-dev,
+ libselinux1-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386]
+Standards-Version: 3.8.2
Package: gnome-user-share
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, apache2 (>= 2.2), apache2 (<< 2.3), avahi-daemon, obex-data-server (>= 0.3), bluez-gnome
+Depends: ${shlibs:Depends},
+ ${misc:Depends},
+ apache2.2-bin,
+ libapache2-mod-dnssd (>= 0.6),
+ obex-data-server (>= 0.4),
+ gnome-bluetooth
Description: User level public file sharing via WebDAV or ObexFTP
gnome-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
Modified: desktop/unstable/gnome-user-share/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-user-share/debian/control.in?rev=20474&op=diff
==============================================================================
--- desktop/unstable/gnome-user-share/debian/control.in (original)
+++ desktop/unstable/gnome-user-share/debian/control.in Sat Jun 27 09:18:20 2009
@@ -3,12 +3,30 @@
Priority: optional
Maintainer: Sebastian Dröge <slomo at debian.org>
Uploaders: @GNOME_TEAM@
-Build-Depends: cdbs, debhelper (>= 5), gnome-pkg-tools, libselinux1-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libglib2.0-dev (>= 2.15.2), libx11-dev, libxt-dev, libgtk2.0-dev (>= 2.4.0), libgconf2-dev, libavahi-client-dev (>= 0.6), libavahi-glib-dev (>= 0.6), libdbus-1-dev (>= 1.1.1), libdbus-glib-1-dev, libxml-parser-perl
-Standards-Version: 3.7.3
+Build-Depends: cdbs,
+ debhelper (>= 5),
+ gnome-pkg-tools,
+ intltool (>= 0.35.0),
+ gnome-doc-utils,
+ libxt-dev,
+ pkg-config,
+ libdbus-1-dev (>= 1.1.1),
+ libglib2.0-dev (>= 2.15.2),
+ libgtk2.0-dev (>= 2.12.0),
+ libgconf2-dev,
+ libdbus-glib-1-dev,
+ libnotify-dev,
+ libselinux1-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386]
+Standards-Version: 3.8.2
Package: gnome-user-share
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, apache2 (>= 2.2), apache2 (<< 2.3), avahi-daemon, obex-data-server (>= 0.3), bluez-gnome
+Depends: ${shlibs:Depends},
+ ${misc:Depends},
+ apache2.2-bin,
+ libapache2-mod-dnssd (>= 0.6),
+ obex-data-server (>= 0.4),
+ gnome-bluetooth
Description: User level public file sharing via WebDAV or ObexFTP
gnome-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
Added: desktop/unstable/gnome-user-share/debian/dirs
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-user-share/debian/dirs?rev=20474&op=file
==============================================================================
--- desktop/unstable/gnome-user-share/debian/dirs (added)
+++ desktop/unstable/gnome-user-share/debian/dirs Sat Jun 27 09:18:20 2009
@@ -1,0 +1,1 @@
+/usr/share/gnome
Modified: desktop/unstable/gnome-user-share/debian/patches/01_apache-config.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-user-share/debian/patches/01_apache-config.patch?rev=20474&op=diff
==============================================================================
--- desktop/unstable/gnome-user-share/debian/patches/01_apache-config.patch (original)
+++ desktop/unstable/gnome-user-share/debian/patches/01_apache-config.patch Sat Jun 27 09:18:20 2009
@@ -1,27 +1,17 @@
---- data/dav_user_2.2.conf.in.old 2008-04-18 12:34:31.000000000 +0200
-+++ data/dav_user_2.2.conf.in 2008-04-18 12:34:58.000000000 +0200
-@@ -13,6 +13,9 @@
- LoadModule authn_file_module @HTTP_MODULES_PATH at mod_authn_file.so
- LoadModule auth_digest_module @HTTP_MODULES_PATH at mod_auth_digest.so
- LoadModule authz_groupfile_module @HTTP_MODULES_PATH at mod_authz_groupfile.so
-+LoadModule mime_module @HTTP_MODULES_PATH at mod_mime.so
+--- data/dav_user_2.2.conf.orig 2009-06-27 10:28:32.044136148 +0200
++++ 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
+
-+TypesConfig /etc/mime.types
+ <VirtualHost *>
+ DocumentRoot ${XDG_PUBLICSHARE_DIR}
- DocumentRoot ${XDG_PUBLICSHARE_DIR}
- <Directory "${XDG_PUBLICSHARE_DIR}">
-@@ -41,7 +44,10 @@
- </IfDefine>
- </Directory>
-
--StartServers 1
--MinSpareServers 1
--MaxSpareServers 1
--MaxClients 3
-+<IfModule prefork.c>
-+ StartServers 1
-+ MinSpareServers 1
-+ MaxSpareServers 1
-+ MaxClients 3
-+</IfModule>
-+
Modified: desktop/unstable/gnome-user-share/debian/preinst
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-user-share/debian/preinst?rev=20474&op=diff
==============================================================================
--- desktop/unstable/gnome-user-share/debian/preinst (original)
+++ desktop/unstable/gnome-user-share/debian/preinst Sat Jun 27 09:18:20 2009
@@ -25,6 +25,9 @@
if dpkg --compare-versions "$2" le-nl "0.31-3"; then
rm_conffile "/etc/xdg/autostart/gnome-user-share-session.desktop"
fi
+ if dpkg --compare-versions "$2" lt-nl "2.26"; then
+ rm_conffile /etc/xdg/autostart/gnome-user-share.desktop
+ fi
esac
#DEBHELPER#
Modified: desktop/unstable/gnome-user-share/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-user-share/debian/rules?rev=20474&op=diff
==============================================================================
--- desktop/unstable/gnome-user-share/debian/rules (original)
+++ desktop/unstable/gnome-user-share/debian/rules Sat Jun 27 09:18:20 2009
@@ -7,12 +7,11 @@
-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
LDFLAGS+=-Wl,-z,defs -Wl,-O1 -Wl,--as-needed
-DEB_CONFIGURE_SCRIPT_ENV += HTTPD="/usr/sbin/apache2"
-DEB_CONFIGURE_EXTRA_FLAGS += --with-httpd-version=2.2 --with-modules-path=/usr/lib/apache2/modules/
-
-clean::
- rm -f data/dav_user_2.2.conf
+DEB_CONFIGURE_EXTRA_FLAGS += \
+ --with-httpd=/usr/lib/apache2/mpm-worker/apache2 \
+ --with-modules-path=/usr/lib/apache2/modules/
install/gnome-user-share::
rm -f debian/gnome-user-share/usr/share/gnome-user-share/dav_user_2.0.conf
-
+ mv debian/gnome-user-share/etc/xdg/autostart debian/gnome-user-share/usr/share/gnome/
+ rmdir -p --ignore-fail-on-non-empty debian/gnome-user-share/etc/xdg
More information about the pkg-gnome-commits
mailing list