diff --git a/resources/install/build.xml b/resources/install/build.xml index ab7ffdb0d..77c8a3b41 100644 --- a/resources/install/build.xml +++ b/resources/install/build.xml @@ -1839,10 +1839,6 @@ - - @@ -2017,8 +2013,8 @@ token="override_dh_install-arch:" value="override_dh_install:"/> + token="lib$(PACKAGE_NAME)-jni" + value="$(PACKAGE_NAME)"/> diff --git a/resources/install/debian/changelog.tmpl b/resources/install/debian/changelog.tmpl index b5b59ffee..5285352e3 100644 --- a/resources/install/debian/changelog.tmpl +++ b/resources/install/debian/changelog.tmpl @@ -1,5 +1,26 @@ _PACKAGE_NAME_ (_VERSION_) unstable; urgency=low - * Initial release. (Closes: #627362) + * Renames package jitsi-jni to libjitsi-jni. + * Removes jar-not-in-usr-share overrides, not needed anymore. + * Moves files from /usr/lib to /usr/share + * Rename README.libraries to README.embedded-libraries. + * Removes embedded dnsjava package and add dependency to libdnsjava-java. + * Removes duplicate entry in copyright. -- Damian Minkov _DATE_ + +_PACKAGE_NAME_ (1.1.4407.10289-1) unstable; urgency=low + + * Adds README.libraries describing the libraries embedded. + * Adds Homepage entry and fixes descriptions. + * Updates desktop shortcut, removes obsolete fields. + * Adds debian/watch for new source packages. + * Removes ffmpeg library and add dependency to libav. + + -- Damian Minkov Thu, 17 Jan 2013 16:03:58 +0200 + +_PACKAGE_NAME_ (1.1.4365-1) unstable; urgency=low + + * Initial release. (Closes: #627362) + + -- Damian Minkov Tue, 18 Dec 2012 11:47:40 +0200 diff --git a/resources/install/debian/control-src.tmpl b/resources/install/debian/control-src.tmpl index 6e05c4a69..2b37def2d 100644 --- a/resources/install/debian/control-src.tmpl +++ b/resources/install/debian/control-src.tmpl @@ -64,7 +64,7 @@ Standards-Version: 3.9.3 Package: _PACKAGE_NAME_ Architecture: all Depends: ${misc:Depends}, - _PACKAGE_NAME_-jni (>= ${source:Version}), + lib_PACKAGE_NAME_-jni (>= ${source:Version}), default-jre | java6-runtime, libunixsocket-java, libhttpcore-java, @@ -93,7 +93,7 @@ Description: VoIP and Instant Messaging client as well as chat with your friends using some of the most popular instant messaging protocols such as SIP/SIMPLE, XMPP/Jabber, AIM/ICQ, Yahoo and others. -Package: _PACKAGE_NAME_-jni +Package: lib_PACKAGE_NAME_-jni Section: libs Architecture: any Depends: ${misc:Depends}, ${shlibs:Depends} diff --git a/resources/install/debian/package.lintian-overrides b/resources/install/debian/package.lintian-overrides deleted file mode 100755 index 2b4703d54..000000000 --- a/resources/install/debian/package.lintian-overrides +++ /dev/null @@ -1,2 +0,0 @@ -# Those jars are felix bundles and are jitsi specific and goes in jitsi specific subfolder -jitsi: jar-not-in-usr-share diff --git a/resources/install/debian/rules.tmpl b/resources/install/debian/rules.tmpl index a2dd22391..c84e0f3f1 100755 --- a/resources/install/debian/rules.tmpl +++ b/resources/install/debian/rules.tmpl @@ -25,9 +25,9 @@ override_dh_install-indep: override_dh_install-arch: ifeq ($(DEB_HOST_ARCH),amd64) - dh_install -p$(PACKAGE_NAME)-jni lib/native/linux-64/*.so usr/lib/jni/ + dh_install -plib$(PACKAGE_NAME)-jni lib/native/linux-64/*.so usr/lib/jni/ else - dh_install -p$(PACKAGE_NAME)-jni lib/native/linux/*.so usr/lib/jni/ + dh_install -plib$(PACKAGE_NAME)-jni lib/native/linux/*.so usr/lib/jni/ endif # we have folders with name *.jar which jh_manifest don't like and fails,