This is an automated email from the git hooks/post-receive script. rene pushed a commit to branch master in repository graphite2.
commit a22a61ff818a8ef6498b65e0d180e9db832ae309 Author: Rene Engelhard <[email protected]> Date: Sat Mar 2 14:29:58 2013 +0100 Imported Debian patch 1.2.0-4 --- contrib/C#/NGraphite/bin/Debug/NGraphite.dll | Bin 16384 -> 0 bytes contrib/C#/NGraphite/bin/Debug/NGraphite.dll.mdb | Bin 5320 -> 0 bytes contrib/C#/NGraphite/obj/Debug/NGraphite.dll | Bin 16384 -> 0 bytes contrib/C#/NGraphite/obj/Debug/NGraphite.dll.mdb | Bin 5320 -> 0 bytes contrib/C#/NGraphiteTests/bin/Debug/NGraphite.dll | Bin 16384 -> 0 bytes contrib/C#/NGraphiteTests/bin/Debug/NGraphite.dll.mdb | Bin 5320 -> 0 bytes contrib/C#/NGraphiteTests/bin/Debug/NGraphiteTests.dll | Bin 29696 -> 0 bytes .../C#/NGraphiteTests/bin/Debug/NGraphiteTests.dll.mdb | Bin 12927 -> 0 bytes contrib/C#/NGraphiteTests/obj/Debug/NGraphiteTests.dll | Bin 29696 -> 0 bytes .../C#/NGraphiteTests/obj/Debug/NGraphiteTests.dll.mdb | Bin 12927 -> 0 bytes debian/changelog | 7 +++++++ debian/control | 4 +--- debian/libgraphite2-3.install | 2 +- debian/libgraphite2-3.links | 3 +-- debian/libgraphite2-dev.install | 4 ++-- debian/rules | 4 +--- debian/source/include-binaries | 10 ---------- 17 files changed, 13 insertions(+), 21 deletions(-) diff --git a/contrib/C#/NGraphite/bin/Debug/NGraphite.dll b/contrib/C#/NGraphite/bin/Debug/NGraphite.dll deleted file mode 100755 index 5a151cc..0000000 Binary files a/contrib/C#/NGraphite/bin/Debug/NGraphite.dll and /dev/null differ diff --git a/contrib/C#/NGraphite/bin/Debug/NGraphite.dll.mdb b/contrib/C#/NGraphite/bin/Debug/NGraphite.dll.mdb deleted file mode 100644 index 147dcde..0000000 Binary files a/contrib/C#/NGraphite/bin/Debug/NGraphite.dll.mdb and /dev/null differ diff --git a/contrib/C#/NGraphite/obj/Debug/NGraphite.dll b/contrib/C#/NGraphite/obj/Debug/NGraphite.dll deleted file mode 100755 index 5a151cc..0000000 Binary files a/contrib/C#/NGraphite/obj/Debug/NGraphite.dll and /dev/null differ diff --git a/contrib/C#/NGraphite/obj/Debug/NGraphite.dll.mdb b/contrib/C#/NGraphite/obj/Debug/NGraphite.dll.mdb deleted file mode 100644 index 147dcde..0000000 Binary files a/contrib/C#/NGraphite/obj/Debug/NGraphite.dll.mdb and /dev/null differ diff --git a/contrib/C#/NGraphiteTests/bin/Debug/NGraphite.dll b/contrib/C#/NGraphiteTests/bin/Debug/NGraphite.dll deleted file mode 100755 index 5a151cc..0000000 Binary files a/contrib/C#/NGraphiteTests/bin/Debug/NGraphite.dll and /dev/null differ diff --git a/contrib/C#/NGraphiteTests/bin/Debug/NGraphite.dll.mdb b/contrib/C#/NGraphiteTests/bin/Debug/NGraphite.dll.mdb deleted file mode 100644 index 147dcde..0000000 Binary files a/contrib/C#/NGraphiteTests/bin/Debug/NGraphite.dll.mdb and /dev/null differ diff --git a/contrib/C#/NGraphiteTests/bin/Debug/NGraphiteTests.dll b/contrib/C#/NGraphiteTests/bin/Debug/NGraphiteTests.dll deleted file mode 100755 index 72d2566..0000000 Binary files a/contrib/C#/NGraphiteTests/bin/Debug/NGraphiteTests.dll and /dev/null differ diff --git a/contrib/C#/NGraphiteTests/bin/Debug/NGraphiteTests.dll.mdb b/contrib/C#/NGraphiteTests/bin/Debug/NGraphiteTests.dll.mdb deleted file mode 100644 index c7475be..0000000 Binary files a/contrib/C#/NGraphiteTests/bin/Debug/NGraphiteTests.dll.mdb and /dev/null differ diff --git a/contrib/C#/NGraphiteTests/obj/Debug/NGraphiteTests.dll b/contrib/C#/NGraphiteTests/obj/Debug/NGraphiteTests.dll deleted file mode 100755 index 72d2566..0000000 Binary files a/contrib/C#/NGraphiteTests/obj/Debug/NGraphiteTests.dll and /dev/null differ diff --git a/contrib/C#/NGraphiteTests/obj/Debug/NGraphiteTests.dll.mdb b/contrib/C#/NGraphiteTests/obj/Debug/NGraphiteTests.dll.mdb deleted file mode 100644 index c7475be..0000000 Binary files a/contrib/C#/NGraphiteTests/obj/Debug/NGraphiteTests.dll.mdb and /dev/null differ diff --git a/debian/changelog b/debian/changelog index 26031ad..5232d37 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +graphite2 (1.2.0-4) experimental; urgency=low + + * revert multiarch stuff as harfbuzz now doesn't need us + anymore... (reopens: #699714) + + -- Rene Engelhard <[email protected]> Sat, 02 Mar 2013 14:29:58 +0100 + graphite2 (1.2.0-3) experimental; urgency=low * apply patch from Daniel Schaal to convert to multiarch diff --git a/debian/control b/debian/control index 542b4dc..ddbcca7 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Priority: optional Section: libs Maintainer: Debian LibreOffice Team <[email protected]> Uploaders: Rene Engelhard <[email protected]>, Daniel Glassey <[email protected]> -Build-Depends: debhelper (>= 9), dh-exec (>= 0.3), dpkg-dev (>= 1.16.1), cmake, libfreetype6-dev +Build-Depends: debhelper (>= 9), cmake, libfreetype6-dev # perl: libmodule-build-perl # mono: mono-xbuild, mono-gmcs, mono-dmcs, libnunit-cil-dev Build-Depends-Indep: asciidoc, dblatex, doxygen, docbook-xsl, latex-xcolor, libxml2-utils @@ -12,12 +12,10 @@ Standards-Version: 3.9.1 Package: libgraphite2-3 Section: libs Architecture: any -Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends} Provides: libgraphite2-2.0.0 Replaces: libgraphite2-2.0.0 Breaks: libgraphite2-2.0.0 (<< 1.2.0) -Multi-Arch: same Description: Font rendering engine for Complex Scripts -- library Graphite is a system that can be used to create and use "smart fonts" capable of displaying writing systems with various complex behaviors, such as: diff --git a/debian/libgraphite2-3.install b/debian/libgraphite2-3.install index 3ddde58..d0dbfd1 100644 --- a/debian/libgraphite2-3.install +++ b/debian/libgraphite2-3.install @@ -1 +1 @@ -usr/lib/*/lib*.so.* +usr/lib/lib*.so.* diff --git a/debian/libgraphite2-3.links b/debian/libgraphite2-3.links old mode 100755 new mode 100644 index e6784d8..d59ce53 --- a/debian/libgraphite2-3.links +++ b/debian/libgraphite2-3.links @@ -1,2 +1 @@ -#! /usr/bin/dh-exec -usr/lib/${DEB_HOST_MULTIARCH}/libgraphite2.so.3 usr/lib/${DEB_HOST_MULTIARCH}/libgraphite2.so.2.0.0 +usr/lib/libgraphite2.so.3 usr/lib/libgraphite2.so.2.0.0 diff --git a/debian/libgraphite2-dev.install b/debian/libgraphite2-dev.install index d413661..148a3ea 100644 --- a/debian/libgraphite2-dev.install +++ b/debian/libgraphite2-dev.install @@ -1,3 +1,3 @@ usr/include -usr/lib/*/lib*.so -usr/lib/*/pkgconfig +usr/lib/lib*.so +usr/lib/pkgconfig diff --git a/debian/rules b/debian/rules index 8b7eb0b..aaeb534 100755 --- a/debian/rules +++ b/debian/rules @@ -1,7 +1,5 @@ #!/usr/bin/make -f -include /usr/share/dpkg/architecture.mk - %: dh $@ --builddirectory=build @@ -53,7 +51,7 @@ override_dh_auto_clean: dh_auto_clean override_dh_auto_configure: - dh_auto_configure -- -DCMAKE_BUILD_TYPE:STRING=Release -DGRAPHITE2_NTRACING:bool=1 -DLIB_SUFFIX=/$(DEB_HOST_MULTIARCH) + dh_auto_configure -- -DCMAKE_BUILD_TYPE:STRING=Release -DGRAPHITE2_NTRACING:bool=1 override_dh_gencontrol: dh_gencontrol -Nlibtext-gr2-perl -O--builddirectory=build diff --git a/debian/source/include-binaries b/debian/source/include-binaries deleted file mode 100644 index 4718cd3..0000000 --- a/debian/source/include-binaries +++ /dev/null @@ -1,10 +0,0 @@ -contrib/C#/NGraphite/bin/Debug/NGraphite.dll -contrib/C#/NGraphite/bin/Debug/NGraphite.dll.mdb -contrib/C#/NGraphite/obj/Debug/NGraphite.dll -contrib/C#/NGraphite/obj/Debug/NGraphite.dll.mdb -contrib/C#/NGraphiteTests/bin/Debug/NGraphite.dll -contrib/C#/NGraphiteTests/bin/Debug/NGraphite.dll.mdb -contrib/C#/NGraphiteTests/bin/Debug/NGraphiteTests.dll -contrib/C#/NGraphiteTests/bin/Debug/NGraphiteTests.dll.mdb -contrib/C#/NGraphiteTests/obj/Debug/NGraphiteTests.dll -contrib/C#/NGraphiteTests/obj/Debug/NGraphiteTests.dll.mdb -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/graphite2.git
