Debian

Available patches from Ubuntu

To see Ubuntu differences wrt. to Debian, write down a grep-dctrl query identifying the packages you're interested in:
grep-dctrl -n -sPackage Sources.Debian
(e.g. -FPackage linux-ntfs or linux-ntfs)

Modified packages are listed below:

Debian ( Changelog | PTS | Bugs ) Ubuntu ( Changelog | txt | LP | Bugs ) | Diff from Ubuntu

Source: gammaray

gammaray (2.11.1-0ubuntu1) groovy; urgency=medium * New upstream bugfix release. * Build-depend on qml-module-qtqml. * Install the 3dinspector plugins. -- Dmitry Shachnev <mitya57@ubuntu.com> Sun, 17 May 2020 17:27:25 +0300 gammaray (2.11.0-2ubuntu1) focal; urgency=medium * Disable LauncherTest and ClientConnectionTest that fail on Ubuntu because of ptrace protection. -- Dmitry Shachnev <mitya57@ubuntu.com> Sat, 11 Apr 2020 12:38:21 +0300

Modifications :
  1. Download patch debian/rules

    --- 2.11.1-1/debian/rules 2020-05-19 11:21:07.000000000 +0000 +++ 2.11.1-0ubuntu1/debian/rules 2020-05-16 17:39:41.000000000 +0000 @@ -2,6 +2,7 @@ .PHONY: override_dh_auto_configure override_dh_auto_test override_dh_auto_install override_dh_installdocs +export DEB_LDFLAGS_MAINT_APPEND=-Wl,--as-needed export DEB_BUILD_MAINT_OPTIONS=hardening=+all export QT_SELECT=5
  2. Download patch debian/patches/disable-ptrace-tests.patch

    --- 2.11.1-1/debian/patches/disable-ptrace-tests.patch 1970-01-01 00:00:00.000000000 +0000 +++ 2.11.1-0ubuntu1/debian/patches/disable-ptrace-tests.patch 2020-05-16 17:39:41.000000000 +0000 @@ -0,0 +1,28 @@ +Description: disable LauncherTest and ClientConnectionTest + These tests fail on Ubuntu because of ptrace protection, see: + - https://wiki.ubuntu.com/SecurityTeam/Roadmap/KernelHardening#ptrace_Protection + - https://github.com/KDAB/GammaRay/wiki/Known-Issues#gdb-method-fails-to-attach-to-running-process +Author: Dmitry Shachnev <mitya57@ubuntu.com> +Forwarded: not-needed +Last-Update: 2020-04-11 + +--- a/tests/CMakeLists.txt ++++ b/tests/CMakeLists.txt +@@ -288,17 +288,6 @@ if(NOT GAMMARAY_CLIENT_ONLY_BUILD AND NO + gammaray_add_test(earlyexittest earlyexittest.cpp) + target_include_directories(earlyexittest PRIVATE ${CMAKE_BINARY_DIR}/launcher) + target_link_libraries(earlyexittest gammaray_core gammaray_launcher) +- +- if(HAVE_QT_WIDGETS) +- gammaray_add_test(launchertest launchertest.cpp) +- target_include_directories(launchertest PRIVATE ${CMAKE_BINARY_DIR}/launcher) +- target_link_libraries(launchertest gammaray_core gammaray_launcher) +- endif() +- +- if(TARGET gammaray_client) +- gammaray_add_test(clientconnectiontest clientconnectiontest.cpp) +- target_link_libraries(clientconnectiontest gammaray_core gammaray_launcher gammaray_client) +- endif() + endif() + + #
  3. Download patch debian/control

    --- 2.11.1-1/debian/control 2020-05-19 11:21:07.000000000 +0000 +++ 2.11.1-0ubuntu1/debian/control 2020-05-17 14:27:16.000000000 +0000 @@ -1,7 +1,8 @@ Source: gammaray Priority: optional Section: devel -Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org> +Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> +XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org> Uploaders: Jakub Adam <jakub.adam@ktknet.cz> Build-Depends: cmake, debhelper-compat (= 12), @@ -14,6 +15,7 @@ Build-Depends: cmake, libqt5svg5-dev, libqt5waylandcompositor5-dev, libwayland-dev (>= 1.12.0), + qml-module-qtqml, qml-module-qtquick2, qt3d-assimpsceneimport-plugin, qt3d-defaultgeometryloader-plugin, @@ -35,7 +37,7 @@ Build-Depends: cmake, qtwebengine5-dev [amd64 arm64 armhf i386 mipsel], xauth, xvfb -Standards-Version: 4.5.0 +Standards-Version: 4.4.0 Vcs-Git: https://salsa.debian.org/qt-kde-team/extras/gammaray.git Vcs-Browser: https://salsa.debian.org/qt-kde-team/extras/gammaray Homepage: https://www.kdab.com/development-resources/qt-tools/gammaray/
  4. Download patch debian/patches/series

    --- 2.11.1-1/debian/patches/series 2020-05-19 11:21:07.000000000 +0000 +++ 2.11.1-0ubuntu1/debian/patches/series 2020-05-16 17:39:41.000000000 +0000 @@ -1,2 +1,3 @@ debian-archs-fix-build.patch qt-system-paths.patch +disable-ptrace-tests.patch
  5. Download patch debian/copyright

Debian ( Changelog | PTS | Bugs ) Ubuntu ( Changelog | txt | LP | Bugs ) | Diff from Ubuntu

Source: jython

jython (2.7.2~b2+repack1-1ubuntu1) focal; urgency=medium * Build-depend on python2. -- Matthias Klose <doko@ubuntu.com> Sun, 12 Jan 2020 09:32:17 +0100

Modifications :
  1. Download patch debian/control

    --- 2.7.2~b2+repack1-1/debian/control 2019-11-23 14:00:02.000000000 +0000 +++ 2.7.2~b2+repack1-1ubuntu1/debian/control 2020-01-12 08:31:33.000000000 +0000 @@ -3,7 +3,7 @@ Section: python Priority: optional Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org> Uploaders: Jakub Adam <jakub.adam@ktknet.cz>, Gilles Filippini <pini@debian.org> -Build-Depends: debhelper (>= 10), dh-exec, ant, gawk, maven-repo-helper, javahelper, python, libjaxb-api-java, dh-strip-nondeterminism +Build-Depends: debhelper (>= 10), dh-exec, ant, gawk, maven-repo-helper, javahelper, python2, libjaxb-api-java, dh-strip-nondeterminism Build-Depends-Indep: default-jdk, dh-python, junit4,

Debian ( Changelog | PTS | Bugs ) Ubuntu ( Changelog | txt | LP | Bugs ) | Diff from Ubuntu

Source: libcommons-discovery-java

libcommons-discovery-java (0.5-3ubuntu1) quantal; urgency=low * Merge from Debian testing. Remaining changes: - d/control: Switch Build-Deps from maven to ant, fix Depends on binary packages. - d/rules: Switch from maven to ant cdbs build and ensure that junit4 is used to execute unit tests. - d/ant.properties: Specify build overrides for upstream build.xml to support use of system Java libraries. - d/libcommons-discovery-java-doc.install: install API docs from ant build output. - d/patches/fix_junit4_tests.diff: fix build process to execute tests using the junit ant task rather than executing junit directly in order to support use of JUnit4 annotations. -- James Page <james.page@ubuntu.com> Mon, 28 May 2012 17:18:46 +0100

Modifications :
  1. Download patch debian/rules

    --- 0.5-3/debian/rules 2011-11-14 23:12:27.000000000 +0000 +++ 0.5-3ubuntu1/debian/rules 2012-05-22 09:44:00.000000000 +0000 @@ -1,10 +1,20 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/maven.mk include /usr/share/cdbs/1/class/javahelper.mk +include /usr/share/cdbs/1/class/ant.mk JAVA_HOME := /usr/lib/jvm/default-java +DEB_JARS := ant-junit4 ant-junit +DEB_ANT_BUILD_TARGET := dist test.discovery +LIBRARY := commons-discovery + +install/lib$(LIBRARY)-java:: + mh_installpoms -plib$(LIBRARY)-java + mh_installjar -plib$(LIBRARY)-java -l pom.xml dist/$(LIBRARY).jar + +clean:: + -rm -rf debian/tmp get-orig-source: uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename
  2. Download patch debian/control

    --- 0.5-3/debian/control 2012-03-08 16:08:49.000000000 +0000 +++ 0.5-3ubuntu1/debian/control 2012-05-28 16:19:24.000000000 +0000 @@ -1,13 +1,14 @@ Source: libcommons-discovery-java Section: java Priority: optional -Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org> +Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> +XSBC-Original-Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org> Uploaders: Damien Raude-Morvan <drazzib@debian.org>, Kumar Appaiah <akumar@debian.org>, Varun Hiremath <varun@debian.org>, Jakub Adam <jakub.adam@ktknet.cz> -Build-Depends: debhelper (>= 7), cdbs, default-jdk, maven-debian-helper (>= 1.4) -Build-Depends-Indep: libcommons-logging-java, junit4, default-jdk-doc, libcommons-logging-java-doc, - libmaven-javadoc-plugin-java, javahelper +Build-Depends: debhelper (>= 7), cdbs, ant, default-jdk +Build-Depends-Indep: ant-optional, libcommons-logging-java, junit4, default-jdk-doc, + libcommons-logging-java-doc, maven-repo-helper, javahelper Standards-Version: 3.9.3 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libcommons-discovery-java/ Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libcommons-discovery-java/ @@ -15,8 +16,7 @@ Homepage: http://commons.apache.org/disc Package: libcommons-discovery-java Architecture: all -Depends: ${misc:Depends}, ${maven:Depends} -Recommends: ${maven:OptionalDepends} +Depends: ${misc:Depends}, libcommons-logging-java Suggests: libcommons-discovery-java-doc Description: locates classes that implement a given Java interface The Discovery Component is about discovering, or finding, @@ -39,8 +39,7 @@ Description: locates classes that implem Package: libcommons-discovery-java-doc Section: doc Architecture: all -Depends: ${misc:Depends}, ${maven:DocDepends} -Recommends: ${maven:DocOptionalDepends} +Depends: ${misc:Depends}, libcommons-logging-java-doc Suggests: libcommons-discovery-java Description: locates classes that implement a given Java interface (documentation) The Discovery Component is about discovering, or finding,
  3. Download patch .pc/applied-patches

    --- 0.5-3/.pc/applied-patches 2012-05-28 17:36:07.931191460 +0000 +++ 0.5-3ubuntu1/.pc/applied-patches 2012-05-28 17:36:08.135196371 +0000 @@ -1,2 +1,3 @@ java6_incompatible_types.diff java6_incompatible_types_tests.diff +fix_junit4_tests.diff
  4. Download patch debian/patches/series

    --- 0.5-3/debian/patches/series 2011-11-01 14:41:14.000000000 +0000 +++ 0.5-3ubuntu1/debian/patches/series 2012-05-22 09:44:00.000000000 +0000 @@ -1,2 +1,3 @@ java6_incompatible_types.diff java6_incompatible_types_tests.diff +fix_junit4_tests.diff
  5. Download patch .pc/fix_junit4_tests.diff/build.xml
  6. Download patch build.xml

    --- 0.5-3/build.xml 2008-07-14 22:44:17.000000000 +0000 +++ 0.5-3ubuntu1/build.xml 2012-05-28 17:36:08.000000000 +0000 @@ -221,11 +221,20 @@ <target name="test.discovery" depends="compile.tests" description="Run basic Service unit tests ..."> <echo message="Running basic Service tests ..."/> - <java classname="${test.runner}" fork="yes" + <!-- java classname="${test.runner}" fork="yes" failonerror="${test.failonerror}"> <arg value="org.apache.commons.discovery.test.TestAll"/> <classpath refid="test.classpath"/> - </java> + </java --> + <junit printsummary="yes" haltonfailure="yes"> + <classpath refid="test.classpath"/> + <formatter type="plain"/> + <batchtest fork="yes"> + <fileset dir="${test.home}"> + <include name="**/TestAll.java"/> + </fileset> + </batchtest> + </junit> </target>
  7. Download patch debian/libcommons-discovery-java-doc.install

    --- 0.5-3/debian/libcommons-discovery-java-doc.install 2011-09-19 21:29:37.000000000 +0000 +++ 0.5-3ubuntu1/debian/libcommons-discovery-java-doc.install 2012-05-22 09:44:00.000000000 +0000 @@ -1,2 +1,2 @@ -target/apidocs/* usr/share/doc/libcommons-discovery-java/api +dist/docs/api/* usr/share/doc/libcommons-discovery-java/api
  8. Download patch debian/ant.properties

    --- 0.5-3/debian/ant.properties 1970-01-01 00:00:00.000000000 +0000 +++ 0.5-3ubuntu1/debian/ant.properties 2011-11-23 11:06:21.000000000 +0000 @@ -0,0 +1,4 @@ +junit.jar=/usr/share/java/junit4.jar +logger.jar=/usr/share/java/commons-logging.jar +ant.build.javac.source=1.5 +ant.build.javac.target=1.5
  9. Download patch debian/patches/fix_junit4_tests.diff

    --- 0.5-3/debian/patches/fix_junit4_tests.diff 1970-01-01 00:00:00.000000000 +0000 +++ 0.5-3ubuntu1/debian/patches/fix_junit4_tests.diff 2011-11-23 11:47:23.000000000 +0000 @@ -0,0 +1,35 @@ +Description: Execute JUnit tests using Ant junit task instead of executing + junit directory using java as this does not support JUnit4 test annotations. + . + Upstream have switched build system to maven so this patch will not be + forwarded either to Debian or to upstream. +Author: James Page <james.page@ubuntu.com> +Forwarded: not-needed + +Index: libcommons-discovery-java-0.5/build.xml +=================================================================== +--- libcommons-discovery-java-0.5.orig/build.xml 2011-11-23 11:13:50.206722656 +0000 ++++ libcommons-discovery-java-0.5/build.xml 2011-11-23 11:16:25.095112101 +0000 +@@ -221,11 +221,20 @@ + <target name="test.discovery" depends="compile.tests" + description="Run basic Service unit tests ..."> + <echo message="Running basic Service tests ..."/> +- <java classname="${test.runner}" fork="yes" ++ <!-- java classname="${test.runner}" fork="yes" + failonerror="${test.failonerror}"> + <arg value="org.apache.commons.discovery.test.TestAll"/> + <classpath refid="test.classpath"/> +- </java> ++ </java --> ++ <junit printsummary="yes" haltonfailure="yes"> ++ <classpath refid="test.classpath"/> ++ <formatter type="plain"/> ++ <batchtest fork="yes"> ++ <fileset dir="${test.home}"> ++ <include name="**/TestAll.java"/> ++ </fileset> ++ </batchtest> ++ </junit> + </target> + +
  1. gammaray
  2. jython
  3. libcommons-discovery-java