diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2017-02-16 13:41:24 (GMT) |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2017-02-16 13:42:05 (GMT) |
| commit | f4b5ece6b1783202ed286e1f149ab60c3471f180 (patch) | |
| tree | b84c2868e39b9f1c4a7f5ce8d58356bc54766248 | |
| parent | fa127e9757ad348b71f598b36fd312cd7ed67143 (diff) | |
do changes to source file, not generated files
| -rw-r--r-- | changelog | 8 | ||||
| -rw-r--r-- | tests/control | 8 | ||||
| -rw-r--r-- | tests/control.in | 2 |
3 files changed, 9 insertions, 9 deletions
@@ -1,3 +1,11 @@ +libreoffice (1:5.3.0~rc3-0ubuntu3) zesty; urgency=medium + + * dont modify generated files in SCM, also dont store generated files in SCM, + do "readd ant" in source file instead of the generated one (which will get + overwritten) + + -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Thu, 16 Feb 2017 14:38:53 +0100 + libreoffice (1:5.3.0~rc3-0ubuntu2) zesty; urgency=medium * (re-)add ant and ant-optional dependency for autopkgtests diff --git a/tests/control b/tests/control index 66d5d71..e69de29 100644 --- a/tests/control +++ b/tests/control @@ -1,8 +0,0 @@ -Tests: junit-subsequentcheck -Depends: libreoffice, libreoffice-subsequentcheckbase, libreoffice-sdbc-hsqldb, ant (>= 1.7.0), ant-optional (>= 1.7.0), autoconf, automake, bc, bison, bzip2, fastjar, flex (>= 2.3.35), gperf, libcups2-dev, libfontconfig1-dev, libfreetype6-dev (>= 2.2.0), libgl1-mesa-dev, libice-dev, libsm-dev, libx11-dev, libxaw7-dev, libxext-dev, libxinerama-dev, libxkbfile-dev, libxrender-dev, libxt-dev, libxtst-dev, pkg-config, unzip, x11proto-render-dev, xsltproc, zip, zlib1g-dev , libgltf-dev (>= 0.1.0) , opencollada-dev (>= 0.1.0~20140703.ddf8f47+dfsg1-2) , libpcre3-dev , libcollada2gltfconvert-dev (>= 20140924-2) , rapidjson-dev , libo3dgc-dev (>= 0~20131011-2) , libpoppler-dev (>= 0.12.0), libpoppler-private-dev, libpoppler-cpp-dev , libgraphite2-dev (>= 0.9.3) , libharfbuzz-dev (>= 0.9.42) , libexttextcat-dev (>= 3.4.1) , libjpeg-dev , libxml2-dev, libxml2-utils , libxslt1-dev , libexpat1-dev , unixodbc-dev (>= 2.2.11) , libsane-dev , libpng-dev , libcurl4-gnutls-dev , coinor-libcoinmp-dev (>= 1.7.6+dfsg1-2), coinor-libcoinutils-dev (>= 2.9.15-3.1), libbz2-dev , python3 , python3-dev (>= 3.3) , dh-python , debhelper (>= 9.20160114) , dpkg-dev (>= 1.18.2~) , libcppunit-dev (>= 1.13.2-2.1) , gdb , fontconfig , fonts-liberation , fonts-crosextra-carlito , junit4 (>= 4.8.2-2) , maven-repo-helper , java-common (>= 0.49) , default-jdk (>= 1:1.6) , default-jdk (>= 2:1.7-52.1) , default-jdk (>= 2:1.8-55) , javahelper (>= 0.37~) , libnss3-dev (>= 3.12.3) , libnspr4-dev , ucpp , libhunspell-dev (>= 1.1.5-2) , libhyphen-dev (>= 2.4) , libboost-dev (>= 1.58), libboost-date-time-dev (>= 1.58), libboost-iostreams-dev (>= 1.58), libboost-filesystem-dev (>= 1.58) , libboost-system-dev (>= 1.58) , libmdds-dev (>= 1.2) , liborcus-dev (>= 0.12) , libclucene-dev (>= 2.3.3.4-4.1) , librevenge-dev , libwpd-dev (>= 0.10) , libmythes-dev (>= 2:1.2) , libwps-dev (>= 0.4) , libwpg-dev (>= 0.3) , libvisio-dev (>= 0.1) , libcdr-dev (>= 0.1) , libmspub-dev (>= 0.1) , libmwaw-dev (>= 0.3.1) , libodfgen-dev (>= 0.1) , libetonyek-dev , libfreehand-dev (>= 0.1) , libabw-dev (>= 0.1) , libpagemaker-dev , libzmf-dev , libstaroffice-dev , libe-book-dev , libcmis-dev (>= 0.5.0-3) , chromium (>= 39.0.2171.71-1) , libeot-dev , liblcms2-dev , libldap2-dev , liblangtag-dev (>= 0.4) , libicu-dev (>= 52) , libcairo2-dev , kdelibs5-dev (>= 4:4.3.4) , libqt4-dev (>= 4:4.8) , default-libmysqlclient-dev , libmysqlcppconn-dev (>= 1.1.7-4) , firebird-dev (>= 3.0.0.32483.ds4-4) , firebird3.0-server-core , libgtk2.0-dev (>= 2.10) , libgtk-3-dev (>= 3.8~) , gobject-introspection (>= 1.32.0), libgirepository1.0-dev (>= 1.32) , libebook1.2-dev , libpq-dev (>= 9.0~) , libxrandr-dev , liblpsolve55-dev (>= 5.5.0.13-5+b1), lp-solve (>= 5.5.0.13-5+b1) , libsuitesparse-dev (>= 1:3.4.0) , libdbus-glib-1-dev (>= 0.70) , libbluetooth-dev , libavahi-client-dev , libgstreamer1.0-dev , libgstreamer-plugins-base1.0-dev , libvlc5 , libneon27-gnutls-dev , librdf0-dev (>= 1.0.16-2) , libepoxy-dev (>= 1.2) , libglm-dev (>= 0.9.6.3) , libglib2.0-dev (>= 2.15.0) , gettext , libdconf-dev , make (>= 3.81-8.2), , doxygen (>= 1.8.4) , g++-mingw-w64-i686 , libbsh-java, build-essential, default-jdk - -Tests: pyuno-import -Depends: python3-uno - -Tests: sdk-examples -Depends: libreoffice-dev, libreoffice-dev-doc, libreoffice-dev-common, libreoffice-java-common, build-essential, default-jdk diff --git a/tests/control.in b/tests/control.in index 2233c44..1676d9d 100644 --- a/tests/control.in +++ b/tests/control.in @@ -1,5 +1,5 @@ Tests: junit-subsequentcheck -Depends: libreoffice, libreoffice-subsequentcheckbase, libreoffice-sdbc-hsqldb, %BUILD_DEPS_ARCH_ALL%, build-essential, default-jdk +Depends: libreoffice, libreoffice-subsequentcheckbase, libreoffice-sdbc-hsqldb, %BUILD_DEPS_ARCH_ALL%, build-essential, default-jdk, ant (>= 1.7.0), ant-optional (>= 1.7.0) Tests: pyuno-import Depends: python3-uno |
