[Pkg-owncloud-commits] [owncloud] 09/17: Adapt packaging to Calendar removal

David Prévot taffit at moszumanska.debian.org
Thu Mar 12 22:07:30 UTC 2015


This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch stable8
in repository owncloud.

commit 440c2048ddee8d855da2fe859ec9325b48c6cdf0
Author: David Prévot <taffit at debian.org>
Date:   Wed Feb 25 13:55:44 2015 -0400

    Adapt packaging to Calendar removal
---
 debian/control           |  2 --
 debian/copyright         |  9 ++-------
 debian/links             | 10 ----------
 debian/lintian-overrides |  6 ------
 debian/rules             |  4 ----
 5 files changed, 2 insertions(+), 29 deletions(-)

diff --git a/debian/control b/debian/control
index 31033f3..cc02863 100644
--- a/debian/control
+++ b/debian/control
@@ -23,9 +23,7 @@ Depends: apache2 | httpd,
          libjs-chosen,
          libjs-dojo-dojox,
          libjs-jcrop,
-         libjs-jquery-minicolors (<< 2~),
          libjs-jquery-mousewheel,
-         libjs-jquery-timepicker,
          libjs-mediaelement,
          libjs-pdf,
          libjs-underscore (>= 1.6),
diff --git a/debian/copyright b/debian/copyright
index 4f16555..8bb25a8 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -240,15 +240,10 @@ Files: 3rdparty/fontawesome/font/*
 Copyright: 2013, Dave Gandy <dave at davegandy.com>
 License: OFL
 
-Files: 3rdparty/miniColors/*
-       3rdparty/timepicker/*
-       apps/calendar/3rdparty/fullcalendar/*
-       apps/files/js/jquery-visibility.js
+Files: apps/files/js/jquery-visibility.js
        core/css/jquery.multiselect.css
        core/js/jquery.multiselect.js
-Copyright: 2009, 2013, Adam Shaw
-           2012, Cory LaViska
-           2010-2011, Francois Gelinas
+Copyright: 2010-2011, Francois Gelinas
            2012, Mathias Bynens
            2012, Eric Hynds
 License: Expat or GPL-2
diff --git a/debian/links b/debian/links
index 7ec5455..4b57a83 100644
--- a/debian/links
+++ b/debian/links
@@ -54,16 +54,6 @@ usr/share/fonts/opentype/linux-libertine/LinBiolinum_RI.otf		usr/share/owncloud/
 usr/share/fonts/truetype/lohit-devanagari/Lohit-Devanagari.ttf		usr/share/owncloud/apps/documents/css/fonts/Lohit-Devanagari.ttf
 usr/share/fonts/truetype/wqy/wqy-microhei.ttc				usr/share/owncloud/apps/documents/css/fonts/wqy-microhei.ttc
 
-# Use jQuery MiniColors from libjs-jquery-minicolors
-usr/share/javascript/jquery-minicolors					usr/share/owncloud/3rdparty/miniColors/css
-usr/share/javascript/jquery-minicolors					usr/share/owncloud/3rdparty/miniColors/js
-
-# Use jQuery timepicker from libjs-jquery-timepicker
-usr/share/javascript/jquery-timepicker/jquery-ui-sliderAccess.js	usr/share/owncloud/3rdparty/timepicker/js/jquery-ui-sliderAccess.js
-usr/share/javascript/jquery-timepicker/jquery-ui-timepicker-addon.css	usr/share/owncloud/3rdparty/timepicker/css/jquery.ui.timepicker.css
-usr/share/javascript/jquery-timepicker/jquery-ui-timepicker-addon.js	usr/share/owncloud/3rdparty/timepicker/js/jquery.ui.timepicker.js
-usr/share/javascript/jquery-timepicker/localization			usr/share/owncloud/3rdparty/timepicker/js/localization
-
 # Use MediaElement from libjs-mediaelement
 usr/share/javascript/mediaelement/mediaelementplayer.css		usr/share/owncloud/apps/files_videoviewer/css/mediaelementplayer.css
 usr/share/javascript/mediaelement/background.png			usr/share/owncloud/apps/files_videoviewer/css/background.png
diff --git a/debian/lintian-overrides b/debian/lintian-overrides
index 1341a64..5b36b26 100644
--- a/debian/lintian-overrides
+++ b/debian/lintian-overrides
@@ -12,12 +12,6 @@ package-contains-broken-symlink usr/share/owncloud/3rdparty/css/chosen ../../../
 package-contains-broken-symlink usr/share/owncloud/3rdparty/js/chosen ../../../javascript/chosen
 # This symlink points to a directory provided by fonts-font-awesome, which is a dependency.
 package-contains-broken-symlink usr/share/owncloud/3rdparty/fontawesome ../../fonts-font-awesome
-# These symlinks point to a directory provided by libjs-jquery-minicolors, which is a dependency.
-package-contains-broken-symlink usr/share/owncloud/3rdparty/miniColors/css ../../../javascript/jquery-minicolors
-package-contains-broken-symlink usr/share/owncloud/3rdparty/miniColors/js ../../../javascript/jquery-minicolors
-# These symlinks point to a file and a directory provided by libjs-jquery-timepicker, which is a dependency.
-package-contains-broken-symlink usr/share/owncloud/3rdparty/timepicker/css/jquery.ui.timepicker.css ../../../../javascript/jquery-timepicker/jquery-ui-timepicker-addon.css
-package-contains-broken-symlink usr/share/owncloud/3rdparty/timepicker/js/localization ../../../../javascript/jquery-timepicker/localization
 # These symlinks point to directories provided by libjs-dojo-dojox, libjs-dojo-dijit, and libjs-dojo-core,
 # which the first one is a dependency, and the two other are dependencies of the previous one.
 package-contains-broken-symlink usr/share/owncloud/apps/documents/js/3rdparty/resources/dijit ../../../../../../javascript/dijit
diff --git a/debian/rules b/debian/rules
index c3aa2a7..0540196 100755
--- a/debian/rules
+++ b/debian/rules
@@ -27,7 +27,6 @@ override_dh_install:
 	rm debian/owncloud/usr/share/owncloud/apps/*/l10n/*.js*
 
 	# Minify JavaScript files.
-	rm debian/owncloud/usr/share/owncloud/apps/calendar/3rdparty/fullcalendar/js/fullcalendar.min.js
 	rm debian/owncloud/usr/share/owncloud/apps/contacts/js/placeholder_polyfill.jquery.min.combo.js
 	rm debian/owncloud/usr/share/owncloud/apps/documents/js/3rdparty/webodf/dojo-amalgamation.js
 	rm debian/owncloud/usr/share/owncloud/apps/documents/js/3rdparty/webodf/editor/nls/dojobundle.js
@@ -36,9 +35,6 @@ override_dh_install:
 	rm debian/owncloud/usr/share/owncloud/core/js/jquery-migrate-1.2.1.min.js
 
 	uglifyjs -o \
-		debian/owncloud/usr/share/owncloud/apps/calendar/3rdparty/fullcalendar/js/fullcalendar.min.js \
-		debian/owncloud/usr/share/owncloud/apps/calendar/3rdparty/fullcalendar/js/fullcalendar.js
-	uglifyjs -o \
 		debian/owncloud/usr/share/owncloud/3rdparty/js/md5/md5.min.js \
 		debian/owncloud/usr/share/owncloud/3rdparty/js/md5/md5.js
 	uglifyjs -o \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git



More information about the Pkg-owncloud-commits mailing list