[Pkg-owncloud-commits] [owncloud] 10/17: Adapt packaging to Contacts removal
David Prévot
taffit at moszumanska.debian.org
Thu Mar 12 22:07:31 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 398d8f55fa2feafb6e99fe96d0dd84f1de649ff9
Author: David Prévot <taffit at debian.org>
Date: Wed Feb 25 12:52:28 2015 -0400
Adapt packaging to Contacts removal
---
debian/copyright | 20 ++++----------------
debian/links | 2 +-
debian/lintian-overrides | 2 +-
debian/rules | 9 +--------
debian/source/lintian-overrides | 2 --
5 files changed, 7 insertions(+), 28 deletions(-)
diff --git a/debian/copyright b/debian/copyright
index 8bb25a8..e9619cb 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -146,8 +146,7 @@ Copyright: 2010, 2012, 2013 Ajax.org B.V.
2013, Matthew Christopher Kastor-Inare III, Atropa Inc. Intl
License: BSD-3-clause-Ajax
-Files: 3rdparty/Jcrop/*
- 3rdparty/Pimple/*
+Files: 3rdparty/Pimple/*
3rdparty/composer/*
3rdparty/css/*
3rdparty/doctrine/*
@@ -163,9 +162,6 @@ Files: 3rdparty/Jcrop/*
3rdparty/rackspace/php-opencloud/lib/OpenCloud/Common/Log/LogLevel.php
3rdparty/rackspace/php-opencloud/lib/OpenCloud/Common/Log/LoggerInterface.php
3rdparty/zxcvbn/*
- apps/contacts/js/jquery.onfontresize.js
- apps/contacts/js/modernizr.*
- apps/contacts/js/placeholder_polyfill.jquery.min.combo.js
apps/files/js/jquery.*.js
apps/files_external/3rdparty/Dropbox/*
apps/files_external/3rdparty/aws-sdk-php/Doctrine/*
@@ -192,8 +188,8 @@ Files: 3rdparty/Jcrop/*
core/js/placeholders.js
core/js/snap.js
core/js/underscore.js
-Copyright: 2008-2013, Tapmodo Interactive LLC
- 2004-2014, Fabien Potencier <fabien at symfony.com>
+ core/vendor/jcrop/*
+Copyright: 2004-2014, Fabien Potencier <fabien at symfony.com>
2011, Nils Adermann <naderman at naderman.de>
2011, Jordi Boggiano <j.boggiano at seld.be>
2013, Morris Jobke
@@ -203,10 +199,6 @@ Copyright: 2008-2013, Tapmodo Interactive LLC
2010-2014, OpenSky Project Inc
2007-2012, Steven Levithan
2012, Dropbox, Inc.
- 2008, Tom Deater (http://www.tomdeater.com)
- 2009-2013, Faruk Ates, Paul Irish, Alex Sexton
- 2008, Tom Deater (http://www.tomdeater.com)
- 2012, Dirk Ginader
2010, Sebastian Tschan
2012, Jack Moore
2010, Rooftop Solutions <http://www.rooftopsolutions.nl/>
@@ -227,6 +219,7 @@ Copyright: 2008-2013, Tapmodo Interactive LLC
2012, James Allardice
2013, Jacob Kelley
2009-2014, Jeremy Ashkenas
+ 2008-2013, Tapmodo Interactive LLC
License: Expat
Files: 3rdparty/Patchwork/*
@@ -257,11 +250,6 @@ Files: 3rdparty/phpass/*
Copyright: 2004-2006, Solar Designer <solar at openwall.com>
License: public-domain
-Files: apps/contacts/css/placeholder_polyfill.min.css
- apps/contacts/js/placeholder_polyfill.jquery.js
-Copyright: 2012, Dirk Ginader
-License: Expat or GPL-2+
-
Files: apps/documents/ajax/userController.php
Copyright: 2013 Victor Dubiniuk <victor.dubiniuk at gmail.com>
License: AGPL-3+ and public-domain
diff --git a/debian/links b/debian/links
index 4b57a83..0410612 100644
--- a/debian/links
+++ b/debian/links
@@ -17,7 +17,7 @@ usr/share/javascript/chosen usr/share/owncloud/3rdparty/css/chosen
usr/share/javascript/dijit usr/share/owncloud/apps/documents/js/3rdparty/resources/dijit
usr/share/javascript/dojo usr/share/owncloud/apps/documents/js/3rdparty/resources/dojo
usr/share/javascript/dojox usr/share/owncloud/apps/documents/js/3rdparty/resources/dojox
-usr/share/javascript/jcrop usr/share/owncloud/3rdparty/Jcrop
+usr/share/javascript/jcrop usr/share/owncloud/core/vendor/jcrop
usr/share/javascript/jquery-mousewheel/jquery.mousewheel.js usr/share/owncloud/apps/gallery/js/jquery.mousewheel-3.1.1.js
usr/share/javascript/underscore/underscore.js usr/share/owncloud/core/js/underscore.js
diff --git a/debian/lintian-overrides b/debian/lintian-overrides
index 5b36b26..96993f9 100644
--- a/debian/lintian-overrides
+++ b/debian/lintian-overrides
@@ -6,7 +6,7 @@ non-standard-dir-perm var/lib/owncloud/backup/ 2770 != 0755
apache2-reverse-dependency-calls-invoke-rc.d postinst
apache2-reverse-dependency-calls-wrapper-script postinst a2enmod
# This symlink points to a file provided by libjs-jcrop, which is a dependency.
-package-contains-broken-symlink usr/share/owncloud/3rdparty/Jcrop ../../javascript/jcrop
+package-contains-broken-symlink usr/share/owncloud/core/vendor/jcrop ../../../javascript/jcrop
# These symlinks point to a directory provided by libjs-chosen, which is a dependency.
package-contains-broken-symlink usr/share/owncloud/3rdparty/css/chosen ../../../javascript/chosen
package-contains-broken-symlink usr/share/owncloud/3rdparty/js/chosen ../../../javascript/chosen
diff --git a/debian/rules b/debian/rules
index 0540196..8a6a067 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/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
rm debian/owncloud/usr/share/owncloud/apps/documents/js/3rdparty/webodf/webodf.js
@@ -40,13 +39,6 @@ override_dh_install:
uglifyjs -o \
debian/owncloud/usr/share/owncloud/3rdparty/zxcvbn/js/zxcvbn.min.js \
debian/owncloud/usr/share/owncloud/3rdparty/zxcvbn/js/zxcvbn.js
- uglifyjs -o \
- debian/owncloud/usr/share/owncloud/apps/contacts/js/placeholder_polyfill.jquery.min.combo.js \
- debian/owncloud/usr/share/owncloud/apps/contacts/js/jquery.onfontresize.js \
- && uglifyjs \
- debian/owncloud/usr/share/owncloud/apps/contacts/js/placeholder_polyfill.jquery.js \
- >> \
- debian/owncloud/usr/share/owncloud/apps/contacts/js/placeholder_polyfill.jquery.min.combo.js
for i in `grep 'START OF NLS BUNDLE ENTRY' apps/documents/js/3rdparty/webodf/editor/nls/dojobundle.js \
| sed 's,^/\* START OF NLS BUNDLE ENTRY \[dojo-deps/dist,/usr/share/javascript,;s,] \*/,,'` \
; do if [ -e $$i ] ; then uglifyjs $$i >> \
@@ -85,6 +77,7 @@ override_dh_install:
rm -r debian/owncloud/usr/share/owncloud/apps/files_external/3rdparty/aws-sdk-php
rm -r debian/owncloud/usr/share/owncloud/apps/files_external/3rdparty/google-api-php-client
rm -r debian/owncloud/usr/share/owncloud/apps/search_lucene/3rdparty/Zend
+ rm -r debian/owncloud/usr/share/owncloud/core/vendor/jcrop
# Fix displayed version
sed -i "s/@VERSION@/$(VERSION) (Debian)/" \
diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
index d1070ef..173c429 100644
--- a/debian/source/lintian-overrides
+++ b/debian/source/lintian-overrides
@@ -1,9 +1,7 @@
# Those minified JavaScripts are rebuild during the packaging
-source-is-missing apps/contacts/js/placeholder_polyfill.jquery.min.combo.js
source-is-missing apps/documents/js/3rdparty/webodf/dojo-amalgamation.js
source-is-missing apps/documents/js/3rdparty/webodf/webodf.js
source-is-missing apps/documents/js/3rdparty/webodf/editor/nls/dojobundle.js
-source-contains-prebuilt-javascript-object apps/contacts/js/placeholder_polyfill.jquery.min.combo.js mean line length is about 853 characters
source-contains-prebuilt-javascript-object apps/documents/js/3rdparty/webodf/dojo-amalgamation.js mean line length is about 505 characters
source-contains-prebuilt-javascript-object apps/documents/js/3rdparty/webodf/webodf.js mean line length is about 448 characters
source-contains-prebuilt-javascript-object apps/documents/js/3rdparty/webodf/editor/nls/dojobundle.js mean line length is about 418 characters
--
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