[Pkg-owncloud-commits] [owncloud] 11/17: Adapt packaging to Documents 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 3b32e47095fb54c784486842b89de575a4bf1c69
Author: David Prévot <taffit at debian.org>
Date: Wed Feb 25 14:11:11 2015 -0400
Adapt packaging to Documents removal
---
debian/control | 9 +-
debian/copyright | 184 ----------------------------------------
debian/links | 27 ------
debian/lintian-overrides | 7 --
debian/rules | 18 ----
debian/source/lintian-overrides | 7 --
6 files changed, 1 insertion(+), 251 deletions(-)
diff --git a/debian/control b/debian/control
index cc02863..92ebd2d 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: ownCloud for Debian maintainers <pkg-owncloud-maintainers at lists.alio
Uploaders: Thomas Mueller <thomas.mueller at tmit.eu>,
David Prévot <taffit at debian.org>,
Paul van Tilburg <paulvt at debian.org>
-Build-Depends: debhelper (>= 8), libjs-dojo-dojox (>= 1.10), node-uglify
+Build-Depends: debhelper (>= 8), node-uglify
Standards-Version: 3.9.6
Homepage: https://owncloud.org
Vcs-Git: git://anonscm.debian.org/pkg-owncloud/owncloud.git
@@ -14,14 +14,7 @@ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-owncloud/owncloud.git
Package: owncloud
Architecture: all
Depends: apache2 | httpd,
- fonts-font-awesome,
- fonts-liberation,
- fonts-linuxlibertine,
- fonts-lohit-deva,
- fonts-sil-gentium-basic,
- fonts-wqy-microhei,
libjs-chosen,
- libjs-dojo-dojox,
libjs-jcrop,
libjs-jquery-mousewheel,
libjs-mediaelement,
diff --git a/debian/copyright b/debian/copyright
index e9619cb..6e2f5dc 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -150,7 +150,6 @@ Files: 3rdparty/Pimple/*
3rdparty/composer/*
3rdparty/css/*
3rdparty/doctrine/*
- 3rdparty/fontawesome/css/*
3rdparty/guzzle/*
3rdparty/js/chosen/*
3rdparty/js/strengthify/*
@@ -229,10 +228,6 @@ Copyright: 2013, Nicolas Grekas <p at tchwork.com>
2012, 2014, Igor Vaynberg
License: Apache-2.0 or GPL-2
-Files: 3rdparty/fontawesome/font/*
-Copyright: 2013, Dave Gandy <dave at davegandy.com>
-License: OFL
-
Files: apps/files/js/jquery-visibility.js
core/css/jquery.multiselect.css
core/js/jquery.multiselect.js
@@ -250,18 +245,6 @@ Files: 3rdparty/phpass/*
Copyright: 2004-2006, Solar Designer <solar at openwall.com>
License: public-domain
-Files: apps/documents/ajax/userController.php
-Copyright: 2013 Victor Dubiniuk <victor.dubiniuk at gmail.com>
-License: AGPL-3+ and public-domain
-
-Files: apps/documents/js/3rdparty/resources/dojo/*
-Copyright: Dojo Foundation
-License: BSD-3-clause-Dojo
-
-Files: apps/documents/js/3rdparty/resources/dojo/resources/dojo.css
-Copyright: 2007, Yahoo! Inc.
-License: BSD-3-clause-Dojo and BSD-3-clause-Yahoo
-
Files: 3rdparty/doctrine/common/lib/Doctrine/Common/Cache/ApcCache.php
3rdparty/doctrine/common/lib/Doctrine/Common/Cache/ArrayCache.php
3rdparty/doctrine/common/lib/Doctrine/Common/Cache/Cache.php
@@ -380,11 +363,6 @@ Files: 3rdparty/guzzle/http/Guzzle/Http/Resources/cacert.pem
Copyright: 2012, Mozilla Foundation
License: MPL-2.0
-Files: apps/documents/js/3rdparty/webodf/*
-Copyright: 2012-2014, KO GmbH
- 2010, Jos van den Oever
-License: AGPL-3+ with HTML-reference exception
-
Files: apps/files_texteditor/js/vendor/ace/src-noconflict/mode-r.js
apps/files_texteditor/js/vendor/ace/src-noconflict/mode-rdoc.js
apps/files_texteditor/js/vendor/ace/src-noconflict/mode-rhtml.js
@@ -1173,30 +1151,6 @@ License: BSD-3-clause-Christian_Johansen
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-License: BSD-3-clause-Dojo
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
- .
- * Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
- * Neither the name of the Dojo Foundation nor the names of its contributors
- may be used to endorse or promote products derived from this software
- without specific prior written permission.
- .
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
License: BSD-3-clause-ez
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
@@ -1248,31 +1202,6 @@ License: BSD-3-clause-SabreDAV
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-License: BSD-3-clause-Yahoo
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
- * Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
- * Neither the name of Yahoo! Inc. nor the names of its contributors
- may be used to endorse or promote products derived from this
- software without specific prior written permission of Yahoo! Inc.
- .
- THIS SOFTWARE IS PROVIDED BY THE AUTHORS AND CONTRIBUTORS ``AS IS'' AND
- ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- SUCH DAMAGE.
-
License: BSD-3-clause-Zend
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
@@ -1328,34 +1257,6 @@ License: GPL-3+
On Debian systems, the full text of the GNU General Public License
version 3 can be found in the file `/usr/share/common-licenses/GPL-3'.
-License: AGPL-3+ with HTML-reference exception
- The JavaScript code in this page is free software: you can redistribute
- it and/or modify it under the terms of the GNU Affero General Public
- License (GNU AGPL) as published by the Free Software Foundation, either
- version 3 of the License, or (at your option) any later version. The code
- is distributed WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU AGPL for
- more details.
- .
- As additional permission under GNU AGPL version 3 section 7, you may
- distribute non-source (e.g., minimized or compacted) forms of that code
- without the copy of the GNU GPL normally required by section 4, provided
- you include this license notice and a URL through which recipients can
- access the Corresponding Source.
- .
- As a special exception to the AGPL, any HTML file which merely makes
- function calls to this code, and for that purpose includes it by reference
- shall be deemed a separate work for copyright law purposes. In addition,
- the copyright holders of this code give you permission to combine this
- code with free software libraries that are released under the GNU LGPL.
- You may copy and distribute such a system following the terms of the GNU
- AGPL for this code and the LGPL for the libraries. If you modify this
- code, you may extend this exception to your version of the code, but you
- are not obligated to do so. If you do not wish to do so, delete this
- exception statement from your version.
- .
- This license applies to this entire compilation.
-
License: LGPL-2.1
On Debian systems, the full text of the GNU Lesser General Public License
version 2.1 can be found in the file `/usr/share/common-licenses/LGPL-2.1'.
@@ -1740,91 +1641,6 @@ License: MPL-2.0
This Source Code Form is "Incompatible With Secondary Licenses", as
defined by the Mozilla Public License, v. 2.0.
-License: OFL
- PREAMBLE
- .
- The goals of the Open Font License (OFL) are to stimulate worldwide
- development of collaborative font projects, to support the font creation
- efforts of academic and linguistic communities, and to provide a free and
- open framework in which fonts may be shared and improved in partnership
- with others.
- .
- The OFL allows the licensed fonts to be used, studied, modified and
- redistributed freely as long as they are not sold by themselves. The
- fonts, including any derivative works, can be bundled, embedded,
- redistributed and/or sold with any software provided that any reserved
- names are not used by derivative works. The fonts and derivatives,
- however, cannot be released under any other type of license. The
- requirement for fonts to remain under this license does not apply
- to any document created using the fonts or their derivatives.
- DEFINITIONS
- .
- "Font Software" refers to the set of files released by the Copyright
- Holder(s) under this license and clearly marked as such. This may
- include source files, build scripts and documentation.
- .
- "Reserved Font Name" refers to any names specified as such after the
- copyright statement(s).
- .
- "Original Version" refers to the collection of Font Software components as
- distributed by the Copyright Holder(s).
- .
- "Modified Version" refers to any derivative made by adding to, deleting,
- or substituting — in part or in whole — any of the components of the
- Original Version, by changing formats or by porting the Font Software to a
- new environment.
- .
- "Author" refers to any designer, engineer, programmer, technical
- writer or other person who contributed to the Font Software.
- PERMISSION & CONDITIONS
- .
- Permission is hereby granted, free of charge, to any person obtaining
- a copy of the Font Software, to use, study, copy, merge, embed, modify,
- redistribute, and sell modified and unmodified copies of the Font
- Software, subject to the following conditions:
- .
- 1) Neither the Font Software nor any of its individual components,
- in Original or Modified Versions, may be sold by itself.
- .
- 2) Original or Modified Versions of the Font Software may be bundled,
- redistributed and/or sold with any software, provided that each copy
- contains the above copyright notice and this license. These can be
- included either as stand-alone text files, human-readable headers or
- in the appropriate machine-readable metadata fields within text or
- binary files as long as those fields can be easily viewed by the user.
- .
- 3) No Modified Version of the Font Software may use the Reserved Font
- Name(s) unless explicit written permission is granted by the corresponding
- Copyright Holder. This restriction only applies to the primary font name as
- presented to the users.
- .
- 4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
- Software shall not be used to promote, endorse or advertise any
- Modified Version, except to acknowledge the contribution(s) of the
- Copyright Holder(s) and the Author(s) or with their explicit written
- permission.
- .
- 5) The Font Software, modified or unmodified, in part or in whole,
- must be distributed entirely under this license, and must not be
- distributed under any other license. The requirement for fonts to
- remain under this license does not apply to any document created
- using the Font Software.
- TERMINATION
- .
- This license becomes null and void if any of the above conditions are
- not met.
- DISCLAIMER
- .
- THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
- OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
- COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
- DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
- OTHER DEALINGS IN THE FONT SOFTWARE.
-
License: public-domain
Written by Solar Designer <solar at openwall.com> in 2004-2006 and placed
in the public domain. Revised in subsequent years, still public domain.
diff --git a/debian/links b/debian/links
index 0410612..d97e768 100644
--- a/debian/links
+++ b/debian/links
@@ -14,9 +14,6 @@ etc/owncloud/htaccess usr/share/owncloud/.htaccess
# Link JavaScript files from the locations in dependency packages.
usr/share/javascript/chosen usr/share/owncloud/3rdparty/js/chosen
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/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
@@ -30,30 +27,6 @@ usr/share/javascript/pdf/build/pdf.js usr/share/owncloud/apps/files_pdfviewer/3
usr/share/javascript/pdf/build/pdf.worker.js usr/share/owncloud/apps/files_pdfviewer/3rdparty/pdfjs/pdf.worker.js
usr/share/javascript/pdf/web/viewer.css usr/share/owncloud/apps/files_pdfviewer/3rdparty/pdfjs/viewer.orig.css
-# Use fonts from font-awesome, fonts-sil-gentium-basic, fonts-liberation, fonts-linuxlibertine, fonts-lohit-deva, and fonts-wqy-microhei
-usr/share/fonts-font-awesome usr/share/owncloud/3rdparty/fontawesome
-usr/share/fonts/truetype/gentium-basic/GenBasB.ttf usr/share/owncloud/apps/documents/css/fonts/GenBasB.ttf
-usr/share/fonts/truetype/gentium-basic/GenBasBI.ttf usr/share/owncloud/apps/documents/css/fonts/GenBasBI.ttf
-usr/share/fonts/truetype/gentium-basic/GenBasI.ttf usr/share/owncloud/apps/documents/css/fonts/GenBasI.ttf
-usr/share/fonts/truetype/gentium-basic/GenBasR.ttf usr/share/owncloud/apps/documents/css/fonts/GenBasR.ttf
-usr/share/fonts/truetype/liberation/LiberationMono-BoldItalic.ttf usr/share/owncloud/apps/documents/css/fonts/LiberationMono-BoldItalic.ttf
-usr/share/fonts/truetype/liberation/LiberationMono-Bold.ttf usr/share/owncloud/apps/documents/css/fonts/LiberationMono-Bold.ttf
-usr/share/fonts/truetype/liberation/LiberationMono-Italic.ttf usr/share/owncloud/apps/documents/css/fonts/LiberationMono-Italic.ttf
-usr/share/fonts/truetype/liberation/LiberationMono-Regular.ttf usr/share/owncloud/apps/documents/css/fonts/LiberationMono-Regular.ttf
-usr/share/fonts/truetype/liberation/LiberationSans-BoldItalic.ttf usr/share/owncloud/apps/documents/css/fonts/LiberationSans-BoldItalic.ttf
-usr/share/fonts/truetype/liberation/LiberationSans-Bold.ttf usr/share/owncloud/apps/documents/css/fonts/LiberationSans-Bold.ttf
-usr/share/fonts/truetype/liberation/LiberationSans-Italic.ttf usr/share/owncloud/apps/documents/css/fonts/LiberationSans-Italic.ttf
-usr/share/fonts/truetype/liberation/LiberationSans-Regular.ttf usr/share/owncloud/apps/documents/css/fonts/LiberationSans-Regular.ttf
-usr/share/fonts/truetype/liberation/LiberationSerif-BoldItalic.ttf usr/share/owncloud/apps/documents/css/fonts/LiberationSerif-BoldItalic.ttf
-usr/share/fonts/truetype/liberation/LiberationSerif-Bold.ttf usr/share/owncloud/apps/documents/css/fonts/LiberationSerif-Bold.ttf
-usr/share/fonts/truetype/liberation/LiberationSerif-Italic.ttf usr/share/owncloud/apps/documents/css/fonts/LiberationSerif-Italic.ttf
-usr/share/fonts/truetype/liberation/LiberationSerif-Regular.ttf usr/share/owncloud/apps/documents/css/fonts/LiberationSerif-Regular.ttf
-usr/share/fonts/opentype/linux-libertine/LinBiolinum_R.otf usr/share/owncloud/apps/documents/css/fonts/LinBiolinum_R_G.ttf
-usr/share/fonts/opentype/linux-libertine/LinBiolinum_RB.otf usr/share/owncloud/apps/documents/css/fonts/LinBiolinum_RB_G.ttf
-usr/share/fonts/opentype/linux-libertine/LinBiolinum_RI.otf usr/share/owncloud/apps/documents/css/fonts/LinBiolinum_RI_G.ttf
-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 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 96993f9..f13544c 100644
--- a/debian/lintian-overrides
+++ b/debian/lintian-overrides
@@ -10,13 +10,6 @@ package-contains-broken-symlink usr/share/owncloud/core/vendor/jcrop ../../../ja
# 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
-# 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 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
-package-contains-broken-symlink usr/share/owncloud/apps/documents/js/3rdparty/resources/dojo ../../../../../../javascript/dojo
-package-contains-broken-symlink usr/share/owncloud/apps/documents/js/3rdparty/resources/dojox ../../../../../../javascript/dojox
# These symlinks point to a file and directories provided by libjs-pdf, which is a dependency.
package-contains-broken-symlink usr/share/owncloud/apps/files_pdfviewer/3rdparty/pdfjs/images ../../../../../javascript/pdf/web/images
package-contains-broken-symlink usr/share/owncloud/apps/files_pdfviewer/3rdparty/pdfjs/locale ../../../../../javascript/pdf/web/locale
diff --git a/debian/rules b/debian/rules
index 8a6a067..4a0f52b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,7 +10,6 @@ override_dh_install:
dh_install \
-Xbower.json \
-XChangelog -Xcomponent.json -Xcomposer.json -XCOPYING \
- -Xdocuments/src \
-Xfiles_videoviewer/src -Xfonts/index.html \
-Xignorelist -Ximage-optimization.sh -Ximg/skin \
-Xjquery.inview.txt -Xjquery.json -X.js.template \
@@ -27,9 +26,6 @@ override_dh_install:
rm debian/owncloud/usr/share/owncloud/apps/*/l10n/*.js*
# Minify JavaScript files.
- 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
rm debian/owncloud/usr/share/owncloud/core/js/jquery-1.10.0.min.js
rm debian/owncloud/usr/share/owncloud/core/js/jquery-migrate-1.2.1.min.js
@@ -39,19 +35,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
- 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 >> \
- debian/owncloud/usr/share/owncloud/apps/documents/js/3rdparty/webodf/editor/nls/dojobundle.js \
- ; fi ;done
- cat \
- /usr/share/javascript/dojo/dojo.js \
- debian/owncloud/usr/share/owncloud/apps/documents/js/3rdparty/webodf/editor/nls/dojobundle.js \
- >> \
- debian/owncloud/usr/share/owncloud/apps/documents/js/3rdparty/webodf/dojo-amalgamation.js
- uglifyjs -o \
- debian/owncloud/usr/share/owncloud/apps/documents/js/3rdparty/webodf/webodf.js \
- debian/owncloud/usr/share/owncloud/apps/documents/js/3rdparty/webodf/webodf-debug.js
uglifyjs -o \
debian/owncloud/usr/share/owncloud/core/js/jquery-1.10.0.min.js \
debian/owncloud/usr/share/owncloud/core/js/jquery-1.10.0.js
@@ -60,7 +43,6 @@ override_dh_install:
debian/owncloud/usr/share/owncloud/core/js/jquery-migrate-1.2.1.js
# Clean up apps to link external third parties
- rm -r debian/owncloud/usr/share/owncloud/apps/documents/js/3rdparty/resources
rm -r debian/owncloud/usr/share/owncloud/apps/files_pdfviewer/3rdparty/pdfjs/images
rm -r debian/owncloud/usr/share/owncloud/apps/files_pdfviewer/3rdparty/pdfjs/locale
rm debian/owncloud/usr/share/owncloud/apps/files_pdfviewer/3rdparty/pdfjs/viewer.js
diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
index 173c429..caa6777 100644
--- a/debian/source/lintian-overrides
+++ b/debian/source/lintian-overrides
@@ -1,10 +1,3 @@
-# Those minified JavaScripts are rebuild during the packaging
-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/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
# False positives (long lines)
source-contains-prebuilt-javascript-object apps/files_texteditor/js/vendor/ace/src-noconflict/mode-actionscript.js mean line length is about 535 characters
source-is-missing apps/files_texteditor/js/vendor/ace/src-noconflict/mode-actionscript.js
--
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