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: camlimages

camlimages (1:4.0.1-4ubuntu1) quantal; urgency=low * Build-depend/depend on libtiff-dev rather than libtiff4-dev. -- Colin Watson <cjwatson@ubuntu.com> Mon, 10 Sep 2012 00:17:02 +0100 camlimages (1:4.0.1-4build1) precise; urgency=low * Rebuild for OCaml 3.12.1. -- Colin Watson <cjwatson@ubuntu.com> Sat, 19 Nov 2011 13:25:34 +0000

Modifications :
  1. Download patch debian/control

    --- 1:4.0.1-4/debian/control 2011-10-16 22:02:17.000000000 +0000 +++ 1:4.0.1-4ubuntu1/debian/control 2012-09-09 23:16:29.000000000 +0000 @@ -1,7 +1,8 @@ Source: camlimages Section: devel Priority: optional -Maintainer: Debian OCaml Maintainers <debian-ocaml-maint@lists.debian.org> +Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> +XSBC-Original-Maintainer: Debian OCaml Maintainers <debian-ocaml-maint@lists.debian.org> Uploaders: Ralf Treinen <treinen@debian.org>, Sylvain Le Gall <gildor@debian.org>, @@ -12,7 +13,7 @@ Build-Depends: ocaml-findlib (>> 1.2.5), libpng12-dev, libjpeg-dev, - libtiff4-dev, + libtiff-dev, libxpm-dev, libfreetype6-dev (>= 2.1.7), libgif-dev, @@ -62,7 +63,7 @@ Depends: ${ocaml:Depends}, libpng12-dev, libjpeg-dev, - libtiff4-dev, + libtiff-dev, libxpm-dev, libfreetype6-dev, libgif-dev,

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

Source: jocaml

jocaml (3.12.1-1ubuntu1) precise; urgency=low * Resynchronise with Debian. Remaining changes: - Snag the 0001-Pass-no-relax-to-ld-on-alpha.patch from ocaml to match ocaml's linker behaviour with regard to --hash-style=both --no-copy-dt-needed-entries --as-needed switches. -- Colin Watson <cjwatson@ubuntu.com> Thu, 01 Dec 2011 12:51:04 +0000

Modifications :
  1. Download patch debian/patches/0001-Pass-no-relax-to-ld-on-alpha.patch

    --- 3.12.1-1/debian/patches/0001-Pass-no-relax-to-ld-on-alpha.patch 1970-01-01 00:00:00.000000000 +0000 +++ 3.12.1-1ubuntu1/debian/patches/0001-Pass-no-relax-to-ld-on-alpha.patch 2011-12-01 15:20:25.000000000 +0000 @@ -0,0 +1,35 @@ +From: Stefano Zacchiroli <zack@debian.org> +Date: Tue, 19 May 2009 17:22:39 +0200 +Subject: Pass --no-relax to ld on alpha + +Pass the --no-relax option to ld to fix a segfault in initialization +code (bug#338437) +--- + configure | 4 +++- + 1 files changed, 3 insertions(+), 1 deletions(-) + +Index: ocaml-3.12.0/configure +=================================================================== +--- ocaml-3.12.0.orig/configure 2010-07-28 13:18:22.000000000 +0000 ++++ ocaml-3.12.0/configure 2011-08-15 10:17:07.665664798 +0000 +@@ -284,7 +284,10 @@ + gcc,alpha*-*-linux*) + if cc="$bytecc" sh ./hasgot -mieee; then + bytecccompopts="-mieee $bytecccompopts"; +- fi;; ++ fi ++ bytecclinkopts="-Wl,--no-relax -Wl,--hash-style=both -Wl,--no-copy-dt-needed-entries -Wl,--as-needed";; ++ gcc,*-*-linux*) ++ bytecclinkopts="-Wl,--hash-style=both -Wl,--no-copy-dt-needed-entries -Wl,--as-needed";; + cc,mips-*-irix6*) + # Add -n32 flag to ensure compatibility with native-code compiler + bytecccompopts="-n32" +@@ -731,6 +734,8 @@ + nativecccompopts="$gcc_warnings -DSHRINKED_GNUC";; + *,*,rhapsody,*) nativecccompopts="$gcc_warnings -DDARWIN_VERSION_6 $dl_defs" + if $arch64; then partialld="ld -r -arch ppc64"; fi;; ++ alpha,gcc*,linux*,*) nativecclinkopts="-Wl,--no-relax -Wl,--hash-style=both -Wl,--no-copy-dt-needed-entries -Wl,--as-needed";; ++ *,gcc*,linux*,*) nativecclinkopts="-Wl,--hash-style=both -Wl,--no-copy-dt-needed-entries -Wl,--as-needed";; + *,gcc*,cygwin,*) nativecccompopts="$gcc_warnings -U_WIN32";; + amd64,gcc*,macosx,*) partialld="ld -r -arch x86_64";; + amd64,gcc*,solaris,*) partialld="ld -r -m elf_x86_64";;
  2. Download patch debian/control

    --- 3.12.1-1/debian/control 2011-12-01 15:20:25.000000000 +0000 +++ 3.12.1-1ubuntu1/debian/control 2011-12-01 15:20:25.000000000 +0000 @@ -1,7 +1,8 @@ Source: jocaml Section: ocaml Priority: optional -Maintainer: Debian OCaml Maintainers <debian-ocaml-maint@lists.debian.org> +Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> +XSBC-Original-Maintainer: Debian OCaml Maintainers <debian-ocaml-maint@lists.debian.org> Uploaders: Mehdi Dogguy <mehdi@debian.org>, Samuel Mimram <smimram@debian.org>
  3. Download patch debian/patches/series

    --- 3.12.1-1/debian/patches/series 2011-12-01 15:20:25.000000000 +0000 +++ 3.12.1-1ubuntu1/debian/patches/series 2011-12-01 15:20:25.000000000 +0000 @@ -1,3 +1,4 @@ +0001-Pass-no-relax-to-ld-on-alpha.patch 0001-Replace-Otyp_proc-with-Otyp_stuff-to-make-outcometre.patch 0002-Add-option-v-to-expunge-to-select-modules-to-filter-.patch 0003-Natdynlink-works-on-powerpc-and-hurd-i386.patch

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

Source: ocaml

ocaml (3.12.1-2ubuntu3) quantal; urgency=low * No-change rebuild against latest armel toolchain. -- Adam Conrad <adconrad@ubuntu.com> Fri, 27 Apr 2012 07:35:22 -0600 ocaml (3.12.1-2ubuntu2) precise; urgency=low * Build ocaml-native-compilers for armhf. -- Matthias Klose <doko@ubuntu.com> Mon, 05 Dec 2011 17:09:44 +0100 ocaml (3.12.1-2ubuntu1) precise; urgency=low * Merge with Debian; remaining changes: - Pass --hash-style=both --as-needed --build-id to the linker. -- Matthias Klose <doko@ubuntu.com> Fri, 18 Nov 2011 18:55:13 +0100

Modifications :
  1. Download patch .pc/linker-flags.patch/configure
  2. Download patch debian/patches/linker-flags.patch

    --- 3.12.1-2/debian/patches/linker-flags.patch 1970-01-01 00:00:00.000000000 +0000 +++ 3.12.1-2ubuntu3/debian/patches/linker-flags.patch 2011-11-18 17:55:08.000000000 +0000 @@ -0,0 +1,25 @@ +Index: ocaml-3.12.1/configure +=================================================================== +--- ocaml-3.12.1.orig/configure 2011-11-18 17:45:15.000000000 +0000 ++++ ocaml-3.12.1/configure 2011-11-18 17:54:51.104603036 +0000 +@@ -285,7 +285,9 @@ + if cc="$bytecc" sh ./hasgot -mieee; then + bytecccompopts="-mieee $bytecccompopts"; + fi +- bytecclinkopts="-Wl,--no-relax";; ++ bytecclinkopts="-Wl,--hash-style=both -Wl,--as-needed -Wl,--build-id -Wl,--no-relax";; ++ gcc,*-*-linux*) ++ bytecclinkopts="-Wl,--hash-style=both -Wl,--as-needed -Wl,--build-id";; + cc,mips-*-irix6*) + # Add -n32 flag to ensure compatibility with native-code compiler + bytecccompopts="-n32" +@@ -740,7 +742,8 @@ + nativecccompopts="$gcc_warnings -DSHRINKED_GNUC";; + *,*,rhapsody,*) nativecccompopts="$gcc_warnings -DDARWIN_VERSION_6 $dl_defs" + if $arch64; then partialld="ld -r -arch ppc64"; fi;; +- alpha,gcc*,linux*,*) nativecclinkopts="-Wl,--no-relax";; ++ alpha,gcc*,linux*,*) nativecclinkopts="-Wl,--hash-style=both -Wl,--as-needed -Wl,--build-id -Wl,--no-relax";; ++ *,gcc*,linux*,*) nativecclinkopts="-Wl,--hash-style=both -Wl,--as-needed -Wl,--build-id";; + *,gcc*,cygwin,*) nativecccompopts="$gcc_warnings -U_WIN32";; + amd64,gcc*,macosx,*) partialld="ld -r -arch x86_64";; + amd64,gcc*,solaris,*) partialld="ld -r -m elf_x86_64";;
  3. Download patch debian/control

    --- 3.12.1-2/debian/control 2011-11-01 14:29:48.000000000 +0000 +++ 3.12.1-2ubuntu3/debian/control 2011-12-05 16:09:28.000000000 +0000 @@ -194,7 +194,7 @@ Description: Runtime system for OCaml by you do not require any graphical capabilities for your runtime. Package: ocaml-native-compilers -Architecture: amd64 armel hurd-i386 i386 kfreebsd-i386 kfreebsd-amd64 lpia powerpc sparc +Architecture: amd64 armel armhf hurd-i386 i386 kfreebsd-i386 kfreebsd-amd64 lpia powerpc sparc Depends: ocaml-nox (= ${binary:Version}), gcc, binutils,
  4. Download patch .pc/applied-patches

    --- 3.12.1-2/.pc/applied-patches 2012-05-22 04:05:06.767368667 +0000 +++ 3.12.1-2ubuntu3/.pc/applied-patches 2012-05-22 04:05:07.299381665 +0000 @@ -13,3 +13,4 @@ 0013-ocamlopt-arm-add-.type-directive-for-code-symbols.patch 0014-Add-support-for-ENOTSUP.patch 0015-Do-not-add-R-dir-in-X11-link-options-on-GNU-kFreeBSD.patch +linker-flags.patch
  5. Download patch configure

    --- 3.12.1-2/configure 2012-05-22 04:05:06.000000000 +0000 +++ 3.12.1-2ubuntu3/configure 2012-05-22 04:05:07.000000000 +0000 @@ -285,7 +285,9 @@ case "$bytecc,$host" in if cc="$bytecc" sh ./hasgot -mieee; then bytecccompopts="-mieee $bytecccompopts"; fi - bytecclinkopts="-Wl,--no-relax";; + bytecclinkopts="-Wl,--hash-style=both -Wl,--as-needed -Wl,--build-id -Wl,--no-relax";; + gcc,*-*-linux*) + bytecclinkopts="-Wl,--hash-style=both -Wl,--as-needed -Wl,--build-id";; cc,mips-*-irix6*) # Add -n32 flag to ensure compatibility with native-code compiler bytecccompopts="-n32" @@ -740,7 +742,8 @@ case "$arch,$nativecc,$system,$host_type nativecccompopts="$gcc_warnings -DSHRINKED_GNUC";; *,*,rhapsody,*) nativecccompopts="$gcc_warnings -DDARWIN_VERSION_6 $dl_defs" if $arch64; then partialld="ld -r -arch ppc64"; fi;; - alpha,gcc*,linux*,*) nativecclinkopts="-Wl,--no-relax";; + alpha,gcc*,linux*,*) nativecclinkopts="-Wl,--hash-style=both -Wl,--as-needed -Wl,--build-id -Wl,--no-relax";; + *,gcc*,linux*,*) nativecclinkopts="-Wl,--hash-style=both -Wl,--as-needed -Wl,--build-id";; *,gcc*,cygwin,*) nativecccompopts="$gcc_warnings -U_WIN32";; amd64,gcc*,macosx,*) partialld="ld -r -arch x86_64";; amd64,gcc*,solaris,*) partialld="ld -r -m elf_x86_64";;
  6. Download patch debian/native-archs

    --- 3.12.1-2/debian/native-archs 2011-11-01 14:29:48.000000000 +0000 +++ 3.12.1-2ubuntu3/debian/native-archs 2011-12-05 16:08:52.000000000 +0000 @@ -1 +1 @@ -amd64 armel hurd-i386 i386 kfreebsd-i386 kfreebsd-amd64 lpia powerpc sparc +amd64 armel armhf hurd-i386 i386 kfreebsd-i386 kfreebsd-amd64 lpia powerpc sparc
  7. Download patch debian/patches/series

    --- 3.12.1-2/debian/patches/series 2011-11-01 14:29:49.000000000 +0000 +++ 3.12.1-2ubuntu3/debian/patches/series 2011-11-18 17:50:35.000000000 +0000 @@ -13,3 +13,4 @@ 0013-ocamlopt-arm-add-.type-directive-for-code-symbols.patch 0014-Add-support-for-ENOTSUP.patch 0015-Do-not-add-R-dir-in-X11-link-options-on-GNU-kFreeBSD.patch +linker-flags.patch
  1. camlimages
  2. jocaml
  3. ocaml