summaryrefslogtreecommitdiffstats
path: root/ubuntu/precise/dependencies
diff options
context:
space:
mode:
Diffstat (limited to 'ubuntu/precise/dependencies')
-rw-r--r--ubuntu/precise/dependencies/arts/debian/patches/12_cleanup_artsc-config.diff4
-rwxr-xr-xubuntu/precise/dependencies/arts/debian/rules2
-rw-r--r--ubuntu/precise/dependencies/libcaldav/debian/source/format1
-rw-r--r--ubuntu/precise/dependencies/libcaldav/debian/source/options6
-rw-r--r--ubuntu/precise/dependencies/libcarddav/debian/source/format1
-rw-r--r--ubuntu/precise/dependencies/libcarddav/debian/source/options6
-rw-r--r--ubuntu/precise/dependencies/qt3/debian/control2
-rw-r--r--ubuntu/precise/dependencies/qt3/debian/patches/06_disable_rpath.diff12
-rw-r--r--ubuntu/precise/dependencies/tqt3/debian/control2
-rw-r--r--ubuntu/precise/dependencies/tqt3/debian/patches/06_disable_rpath.diff12
10 files changed, 36 insertions, 12 deletions
diff --git a/ubuntu/precise/dependencies/arts/debian/patches/12_cleanup_artsc-config.diff b/ubuntu/precise/dependencies/arts/debian/patches/12_cleanup_artsc-config.diff
index 603ffdf37..57a8122f9 100644
--- a/ubuntu/precise/dependencies/arts/debian/patches/12_cleanup_artsc-config.diff
+++ b/ubuntu/precise/dependencies/arts/debian/patches/12_cleanup_artsc-config.diff
@@ -1,3 +1,5 @@
+Index: b/artsc/artsc-config.in
+===================================================================
--- a/artsc/artsc-config.in
+++ b/artsc/artsc-config.in
@@ -27,7 +27,7 @@
@@ -8,4 +10,4 @@
+ flags="$flags -L$libdir -lartsc"
;;
--cflags)
- flags="$flags -I$includedir/artsc @GLIB_CFLAGS@"
+ flags="$flags -I$includedir @GLIB_CFLAGS@"
diff --git a/ubuntu/precise/dependencies/arts/debian/rules b/ubuntu/precise/dependencies/arts/debian/rules
index 9c9730bda..1b4911297 100755
--- a/ubuntu/precise/dependencies/arts/debian/rules
+++ b/ubuntu/precise/dependencies/arts/debian/rules
@@ -41,6 +41,6 @@ DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
binary-predeb/libarts1-trinity-dev::
ifeq (linux,$(DEB_HOST_ARCH_OS))
- echo "libasound2-trinity-dev=libasound2-trinity-dev" >> debian/libarts1-dev.substvars
+ echo "libasound2-dev=libasound2-dev" >> debian/libarts1-trinity-dev.substvars
endif
diff --git a/ubuntu/precise/dependencies/libcaldav/debian/source/format b/ubuntu/precise/dependencies/libcaldav/debian/source/format
new file mode 100644
index 000000000..89ae9db8f
--- /dev/null
+++ b/ubuntu/precise/dependencies/libcaldav/debian/source/format
@@ -0,0 +1 @@
+3.0 (native)
diff --git a/ubuntu/precise/dependencies/libcaldav/debian/source/options b/ubuntu/precise/dependencies/libcaldav/debian/source/options
new file mode 100644
index 000000000..72f1f5450
--- /dev/null
+++ b/ubuntu/precise/dependencies/libcaldav/debian/source/options
@@ -0,0 +1,6 @@
+# Use xz instead of gzip
+compression = "xz"
+compression-level = 9
+
+# Don't run differences
+diff-ignore = .*
diff --git a/ubuntu/precise/dependencies/libcarddav/debian/source/format b/ubuntu/precise/dependencies/libcarddav/debian/source/format
new file mode 100644
index 000000000..89ae9db8f
--- /dev/null
+++ b/ubuntu/precise/dependencies/libcarddav/debian/source/format
@@ -0,0 +1 @@
+3.0 (native)
diff --git a/ubuntu/precise/dependencies/libcarddav/debian/source/options b/ubuntu/precise/dependencies/libcarddav/debian/source/options
new file mode 100644
index 000000000..72f1f5450
--- /dev/null
+++ b/ubuntu/precise/dependencies/libcarddav/debian/source/options
@@ -0,0 +1,6 @@
+# Use xz instead of gzip
+compression = "xz"
+compression-level = 9
+
+# Don't run differences
+diff-ignore = .*
diff --git a/ubuntu/precise/dependencies/qt3/debian/control b/ubuntu/precise/dependencies/qt3/debian/control
index 4be146e7d..7641cffbf 100644
--- a/ubuntu/precise/dependencies/qt3/debian/control
+++ b/ubuntu/precise/dependencies/qt3/debian/control
@@ -11,7 +11,7 @@ Build-Depends: debhelper (>= 5.0.31), quilt, cpio, libxext-dev (>= 4.3.0.dfsg.1-
libfreetype6-dev, libxft-dev, unixodbc-dev, uuid-dev, libglib2.0-dev,
libmysqlclient-dev, flex, libpq-dev, libaudio-dev, libcups2-dev,
libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, libsqlite3-dev,
- firebird2.1-dev [i386 kfreebsd-i386 kfreebsd-amd64 knetbsd-i386 netbsd-i386 amd64 sparc powerpc] | firebird2-dev [i386 amd64]
+ firebird-dev | firebird2.1-dev [i386 kfreebsd-i386 kfreebsd-amd64 knetbsd-i386 netbsd-i386 amd64 sparc powerpc] | firebird2-dev [i386 amd64]
Section: libs
Priority: optional
Standards-Version: 3.8.4
diff --git a/ubuntu/precise/dependencies/qt3/debian/patches/06_disable_rpath.diff b/ubuntu/precise/dependencies/qt3/debian/patches/06_disable_rpath.diff
index 27fc1426c..a3d74ffce 100644
--- a/ubuntu/precise/dependencies/qt3/debian/patches/06_disable_rpath.diff
+++ b/ubuntu/precise/dependencies/qt3/debian/patches/06_disable_rpath.diff
@@ -2,25 +2,29 @@ author: Martin Loschwitz <madkiss@madkiss.org>
Disables the rpath settings in qmake.conf
+Index: b/mkspecs/linux-g++/qmake.conf
+===================================================================
--- a/mkspecs/linux-g++/qmake.conf
+++ b/mkspecs/linux-g++/qmake.conf
-@@ -55,7 +55,7 @@ QMAKE_LFLAGS_SHLIB = -shared
+@@ -55,7 +55,7 @@
QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB
QMAKE_LFLAGS_SONAME = -Wl,-soname,
QMAKE_LFLAGS_THREAD =
-QMAKE_RPATH = -Wl,-rpath,
+QMAKE_RPATH =
- QMAKE_LIBS =
+ QMAKE_LIBS = -luuid
QMAKE_LIBS_DYNLOAD = -ldl
+Index: b/mkspecs/linux-g++-64/qmake.conf
+===================================================================
--- a/mkspecs/linux-g++-64/qmake.conf
+++ b/mkspecs/linux-g++-64/qmake.conf
-@@ -58,7 +58,7 @@ QMAKE_LFLAGS_SHLIB = -shared
+@@ -58,7 +58,7 @@
QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB
QMAKE_LFLAGS_SONAME = -Wl,-soname,
QMAKE_LFLAGS_THREAD =
-QMAKE_RPATH = -Wl,-rpath,
+QMAKE_RPATH =
- QMAKE_LIBS =
+ QMAKE_LIBS = -luuid
QMAKE_LIBS_DYNLOAD = -ldl
diff --git a/ubuntu/precise/dependencies/tqt3/debian/control b/ubuntu/precise/dependencies/tqt3/debian/control
index b45983f80..1655a1357 100644
--- a/ubuntu/precise/dependencies/tqt3/debian/control
+++ b/ubuntu/precise/dependencies/tqt3/debian/control
@@ -11,7 +11,7 @@ Build-Depends: debhelper (>= 5.0.31), quilt, cpio, libxext-dev (>= 4.3.0.dfsg.1-
libfreetype6-dev, libxft-dev, unixodbc-dev, uuid-dev, libglib2.0-dev,
libmysqlclient-dev, flex, libpq-dev, libaudio-dev, libcups2-dev,
libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, libsqlite3-dev,
- firebird2.1-dev [i386 kfreebsd-i386 kfreebsd-amd64 knetbsd-i386 netbsd-i386 amd64 sparc powerpc] | firebird2-dev [i386 amd64]
+ firebird-dev | firebird2.1-dev [i386 kfreebsd-i386 kfreebsd-amd64 knetbsd-i386 netbsd-i386 amd64 sparc powerpc] | firebird2-dev [i386 amd64]
Section: libs
Priority: optional
Standards-Version: 3.8.4
diff --git a/ubuntu/precise/dependencies/tqt3/debian/patches/06_disable_rpath.diff b/ubuntu/precise/dependencies/tqt3/debian/patches/06_disable_rpath.diff
index 27fc1426c..a3d74ffce 100644
--- a/ubuntu/precise/dependencies/tqt3/debian/patches/06_disable_rpath.diff
+++ b/ubuntu/precise/dependencies/tqt3/debian/patches/06_disable_rpath.diff
@@ -2,25 +2,29 @@ author: Martin Loschwitz <madkiss@madkiss.org>
Disables the rpath settings in qmake.conf
+Index: b/mkspecs/linux-g++/qmake.conf
+===================================================================
--- a/mkspecs/linux-g++/qmake.conf
+++ b/mkspecs/linux-g++/qmake.conf
-@@ -55,7 +55,7 @@ QMAKE_LFLAGS_SHLIB = -shared
+@@ -55,7 +55,7 @@
QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB
QMAKE_LFLAGS_SONAME = -Wl,-soname,
QMAKE_LFLAGS_THREAD =
-QMAKE_RPATH = -Wl,-rpath,
+QMAKE_RPATH =
- QMAKE_LIBS =
+ QMAKE_LIBS = -luuid
QMAKE_LIBS_DYNLOAD = -ldl
+Index: b/mkspecs/linux-g++-64/qmake.conf
+===================================================================
--- a/mkspecs/linux-g++-64/qmake.conf
+++ b/mkspecs/linux-g++-64/qmake.conf
-@@ -58,7 +58,7 @@ QMAKE_LFLAGS_SHLIB = -shared
+@@ -58,7 +58,7 @@
QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB
QMAKE_LFLAGS_SONAME = -Wl,-soname,
QMAKE_LFLAGS_THREAD =
-QMAKE_RPATH = -Wl,-rpath,
+QMAKE_RPATH =
- QMAKE_LIBS =
+ QMAKE_LIBS = -luuid
QMAKE_LIBS_DYNLOAD = -ldl