This is an automated email from the git hooks/post-receive script. rene pushed a commit to branch master in repository graphite2.
commit 34fa628cceb2fa4b75303c3c1c30ef8d4764d9ed Author: Rene Engelhard <[email protected]> Date: Wed Feb 27 20:24:34 2013 +0100 Imported Debian patch 1.2.0-3 --- contrib/C#/NGraphite/bin/Debug/NGraphite.dll | Bin 0 -> 16384 bytes contrib/C#/NGraphite/bin/Debug/NGraphite.dll.mdb | Bin 0 -> 5320 bytes contrib/C#/NGraphite/obj/Debug/NGraphite.dll | Bin 0 -> 16384 bytes contrib/C#/NGraphite/obj/Debug/NGraphite.dll.mdb | Bin 0 -> 5320 bytes contrib/C#/NGraphiteTests/bin/Debug/NGraphite.dll | Bin 0 -> 16384 bytes .../C#/NGraphiteTests/bin/Debug/NGraphite.dll.mdb | Bin 0 -> 5320 bytes .../C#/NGraphiteTests/bin/Debug/NGraphiteTests.dll | Bin 0 -> 29696 bytes .../bin/Debug/NGraphiteTests.dll.mdb | Bin 0 -> 12927 bytes .../C#/NGraphiteTests/obj/Debug/NGraphiteTests.dll | Bin 0 -> 29696 bytes .../obj/Debug/NGraphiteTests.dll.mdb | Bin 0 -> 12927 bytes debian/changelog | 12 ++++ debian/compat | 2 +- debian/control | 17 +++--- debian/graphite2-utils.install | 1 + debian/graphite2-utils.substvars | 2 + debian/libgraphite2-3.install | 2 +- debian/libgraphite2-3.links | 3 +- debian/libgraphite2-3dirs | 1 - debian/libgraphite2-dev.dirs | 4 -- debian/libgraphite2-dev.install | 6 +- debian/patches/foo | 68 +++++++++++++++++++++ debian/patches/no-specific-nunit-version.diff | 15 +++++ debian/patches/series | 3 + debian/patches/soname.diff | 7 +++ debian/rules | 40 +++++++----- debian/source/include-binaries | 10 +++ 26 files changed, 160 insertions(+), 33 deletions(-) diff --git a/contrib/C#/NGraphite/bin/Debug/NGraphite.dll b/contrib/C#/NGraphite/bin/Debug/NGraphite.dll new file mode 100755 index 0000000..5a151cc Binary files /dev/null and b/contrib/C#/NGraphite/bin/Debug/NGraphite.dll differ diff --git a/contrib/C#/NGraphite/bin/Debug/NGraphite.dll.mdb b/contrib/C#/NGraphite/bin/Debug/NGraphite.dll.mdb new file mode 100644 index 0000000..147dcde Binary files /dev/null and b/contrib/C#/NGraphite/bin/Debug/NGraphite.dll.mdb differ diff --git a/contrib/C#/NGraphite/obj/Debug/NGraphite.dll b/contrib/C#/NGraphite/obj/Debug/NGraphite.dll new file mode 100755 index 0000000..5a151cc Binary files /dev/null and b/contrib/C#/NGraphite/obj/Debug/NGraphite.dll differ diff --git a/contrib/C#/NGraphite/obj/Debug/NGraphite.dll.mdb b/contrib/C#/NGraphite/obj/Debug/NGraphite.dll.mdb new file mode 100644 index 0000000..147dcde Binary files /dev/null and b/contrib/C#/NGraphite/obj/Debug/NGraphite.dll.mdb differ diff --git a/contrib/C#/NGraphiteTests/bin/Debug/NGraphite.dll b/contrib/C#/NGraphiteTests/bin/Debug/NGraphite.dll new file mode 100755 index 0000000..5a151cc Binary files /dev/null and b/contrib/C#/NGraphiteTests/bin/Debug/NGraphite.dll differ diff --git a/contrib/C#/NGraphiteTests/bin/Debug/NGraphite.dll.mdb b/contrib/C#/NGraphiteTests/bin/Debug/NGraphite.dll.mdb new file mode 100644 index 0000000..147dcde Binary files /dev/null and b/contrib/C#/NGraphiteTests/bin/Debug/NGraphite.dll.mdb differ diff --git a/contrib/C#/NGraphiteTests/bin/Debug/NGraphiteTests.dll b/contrib/C#/NGraphiteTests/bin/Debug/NGraphiteTests.dll new file mode 100755 index 0000000..72d2566 Binary files /dev/null and b/contrib/C#/NGraphiteTests/bin/Debug/NGraphiteTests.dll differ diff --git a/contrib/C#/NGraphiteTests/bin/Debug/NGraphiteTests.dll.mdb b/contrib/C#/NGraphiteTests/bin/Debug/NGraphiteTests.dll.mdb new file mode 100644 index 0000000..c7475be Binary files /dev/null and b/contrib/C#/NGraphiteTests/bin/Debug/NGraphiteTests.dll.mdb differ diff --git a/contrib/C#/NGraphiteTests/obj/Debug/NGraphiteTests.dll b/contrib/C#/NGraphiteTests/obj/Debug/NGraphiteTests.dll new file mode 100755 index 0000000..72d2566 Binary files /dev/null and b/contrib/C#/NGraphiteTests/obj/Debug/NGraphiteTests.dll differ diff --git a/contrib/C#/NGraphiteTests/obj/Debug/NGraphiteTests.dll.mdb b/contrib/C#/NGraphiteTests/obj/Debug/NGraphiteTests.dll.mdb new file mode 100644 index 0000000..c7475be Binary files /dev/null and b/contrib/C#/NGraphiteTests/obj/Debug/NGraphiteTests.dll.mdb differ diff --git a/debian/changelog b/debian/changelog index 165d4e7..26031ad 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +graphite2 (1.2.0-3) experimental; urgency=low + + * apply patch from Daniel Schaal to convert to multiarch + as already multiarchified pango now needs us via harfbuzz... + (closes: #699714) + * clean up (not packaged) perl module packaging + * add (not used yet) stuff to build mono binding + * split arch-dep and arch-indep (docs...) build + * disable the compare renderer stuff - enough compared ;-) + + -- Rene Engelhard <[email protected]> Wed, 27 Feb 2013 20:24:34 +0100 + graphite2 (1.2.0-2) experimental; urgency=low * break libgraphite2-2.0.0 (<< 1.2.0) (closes: #689813) diff --git a/debian/compat b/debian/compat index 45a4fb7..ec63514 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -8 +9 diff --git a/debian/control b/debian/control index 211ba60..542b4dc 100644 --- a/debian/control +++ b/debian/control @@ -3,18 +3,21 @@ Priority: optional Section: libs Maintainer: Debian LibreOffice Team <[email protected]> Uploaders: Rene Engelhard <[email protected]>, Daniel Glassey <[email protected]> -Build-Depends: debhelper (>= 8.0), cmake, libfreetype6-dev, libgraphite-dev, libicu-dev +Build-Depends: debhelper (>= 9), dh-exec (>= 0.3), dpkg-dev (>= 1.16.1), 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 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: @@ -24,7 +27,7 @@ Description: Font rendering engine for Complex Scripts -- library This library was designed and developed by the NRSI (Non-Roman Script Initiative) within SIL International (www.sil.org) to act as a complement to other smart font rendering technologies with limited practical local - extensability. Its purpose is to help meet the needs of a very large number + extensibility. Its purpose is to help meet the needs of a very large number of "minority language" communities for local extensibility of complex script behaviors. . @@ -48,7 +51,7 @@ Description: Development files for libgraphite2 This library was designed and developed by the NRSI (Non-Roman Script Initiative) within SIL International (www.sil.org) to act as a complement to other smart font rendering technologies with limited practical local - extensability. Its purpose is to help meet the needs of a very large number + extensibility. Its purpose is to help meet the needs of a very large number of "minority language" communities for local extensibility of complex script behaviors. . @@ -73,7 +76,7 @@ Description: Debug symbols for libgraphite2 This library was designed and developed by the NRSI (Non-Roman Script Initiative) within SIL International (www.sil.org) to act as a complement to other smart font rendering technologies with limited practical local - extensability. Its purpose is to help meet the needs of a very large number + extensibility. Its purpose is to help meet the needs of a very large number of "minority language" communities for local extensibility of complex script behaviors. . @@ -97,7 +100,7 @@ Description: Documentation for libgraphite2 This library was designed and developed by the NRSI (Non-Roman Script Initiative) within SIL International (www.sil.org) to act as a complement to other smart font rendering technologies with limited practical local - extensability. Its purpose is to help meet the needs of a very large number + extensibility. Its purpose is to help meet the needs of a very large number of "minority language" communities for local extensibility of complex script behaviors. . @@ -108,7 +111,7 @@ Description: Documentation for libgraphite2 . PDF and HTML documentation for libgraphite2 -#Package: libtext-graphite2-perl +#Package: libtext-gr2-perl #Section: perl #Architecture: any #Depends: ${shlibs:Depends}, perl, ${perl:Depends}, ${misc:Depends} @@ -121,7 +124,7 @@ Description: Documentation for libgraphite2 # This library was designed and developed by the NRSI (Non-Roman Script # Initiative) within SIL International (www.sil.org) to act as a complement to # other smart font rendering technologies with limited practical local -# extensability. Its purpose is to help meet the needs of a very large number +# extensibility. Its purpose is to help meet the needs of a very large number # of "minority language" communities for local extensibility of complex script # behaviors. # . diff --git a/debian/graphite2-utils.install b/debian/graphite2-utils.install new file mode 100644 index 0000000..8b3062c --- /dev/null +++ b/debian/graphite2-utils.install @@ -0,0 +1 @@ +usr/bin/gr2fonttest diff --git a/debian/graphite2-utils.substvars b/debian/graphite2-utils.substvars new file mode 100644 index 0000000..33a3e7b --- /dev/null +++ b/debian/graphite2-utils.substvars @@ -0,0 +1,2 @@ +shlibs:Depends=libc6 (>= 2.3.4), libgraphite2-3 +misc:Depends= diff --git a/debian/libgraphite2-3.install b/debian/libgraphite2-3.install index c45ebcf..3ddde58 100644 --- a/debian/libgraphite2-3.install +++ b/debian/libgraphite2-3.install @@ -1 +1 @@ -debian/tmp/usr/lib/lib*.so.* +usr/lib/*/lib*.so.* diff --git a/debian/libgraphite2-3.links b/debian/libgraphite2-3.links old mode 100644 new mode 100755 index d59ce53..e6784d8 --- a/debian/libgraphite2-3.links +++ b/debian/libgraphite2-3.links @@ -1 +1,2 @@ -usr/lib/libgraphite2.so.3 usr/lib/libgraphite2.so.2.0.0 +#! /usr/bin/dh-exec +usr/lib/${DEB_HOST_MULTIARCH}/libgraphite2.so.3 usr/lib/${DEB_HOST_MULTIARCH}/libgraphite2.so.2.0.0 diff --git a/debian/libgraphite2-3dirs b/debian/libgraphite2-3dirs deleted file mode 100644 index 0bf940b..0000000 --- a/debian/libgraphite2-3dirs +++ /dev/null @@ -1 +0,0 @@ -/usr/lib diff --git a/debian/libgraphite2-dev.dirs b/debian/libgraphite2-dev.dirs deleted file mode 100644 index afd8b80..0000000 --- a/debian/libgraphite2-dev.dirs +++ /dev/null @@ -1,4 +0,0 @@ -/usr/lib -/usr/lib/pkgconfig -/usr/include/graphite2 -/usr/bin diff --git a/debian/libgraphite2-dev.install b/debian/libgraphite2-dev.install index f9516b5..d413661 100644 --- a/debian/libgraphite2-dev.install +++ b/debian/libgraphite2-dev.install @@ -1,3 +1,3 @@ -debian/tmp/usr/include -debian/tmp/usr/lib/lib*.so -debian/tmp/usr/lib/pkgconfig +usr/include +usr/lib/*/lib*.so +usr/lib/*/pkgconfig diff --git a/debian/patches/foo b/debian/patches/foo new file mode 100644 index 0000000..a89375f --- /dev/null +++ b/debian/patches/foo @@ -0,0 +1,68 @@ +Description: <short summary of the patch> + TODO: Put a short summary on the line above and replace this paragraph + with a longer explanation of this change. Complete the meta-information + with other relevant fields (see below for details). To make it easier, the + information below has been extracted from the changelog. Adjust it or drop + it. + . + graphite2 (1.2.0-3) experimental; urgency=low + . + * apply patch from Daniel Schaal to convert to multiarch + as already multiarchified pango now needs us via harfbuzz... + (closes: #699714) + * clean up (not packaged) perl module packaging + * add (not used yet) stuff to build mono binding + * split arch-dep and arch-indep (docs...) build +Author: Rene Engelhard <[email protected]> +Bug-Debian: http://bugs.debian.org/699714 + +--- +The information above should follow the Patch Tagging Guidelines, please +checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here +are templates for supplementary fields that you might want to add: + +Origin: <vendor|upstream|other>, <url of original patch> +Bug: <url in upstream bugtracker> +Bug-Debian: http://bugs.debian.org/<bugnumber> +Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber> +Forwarded: <no|not-needed|url proving that it has been forwarded> +Reviewed-By: <name and email of someone who approved the patch> +Last-Update: <YYYY-MM-DD> + +--- /dev/null ++++ graphite2-1.2.0/contrib/C#/NGraphite/obj/Debug/NGraphite.csproj.FilesWrittenAbsolute.txt +@@ -0,0 +1,5 @@ ++/home/rene/Debian/Pakete/graphite2/graphite2-1.2.0/contrib/C#/NGraphite/bin/Debug/NGraphite.dll.config ++/home/rene/Debian/Pakete/graphite2/graphite2-1.2.0/contrib/C#/NGraphite/bin/Debug/NGraphite.dll.mdb ++/home/rene/Debian/Pakete/graphite2/graphite2-1.2.0/contrib/C#/NGraphite/bin/Debug/NGraphite.dll ++/home/rene/Debian/Pakete/graphite2/graphite2-1.2.0/contrib/C#/NGraphite/obj/Debug/NGraphite.dll ++/home/rene/Debian/Pakete/graphite2/graphite2-1.2.0/contrib/C#/NGraphite/obj/Debug/NGraphite.dll.mdb +--- /dev/null ++++ graphite2-1.2.0/contrib/C#/NGraphite/bin/Debug/NGraphite.dll.config +@@ -0,0 +1,3 @@ ++<configuration> ++ <dllmap dll="graphite2.dll" target="libgraphite2.so.3" os="!windows"/> ++</configuration> +--- graphite2-1.2.0.orig/contrib/C#/NGraphiteTests/NGraphiteTests.csproj ++++ graphite2-1.2.0/contrib/C#/NGraphiteTests/NGraphiteTests.csproj +@@ -56,4 +56,4 @@ + <Name>NGraphite</Name> + </ProjectReference> + </ItemGroup> +-</Project> +\ No newline at end of file ++</Project> +--- /dev/null ++++ graphite2-1.2.0/contrib/C#/NGraphiteTests/obj/Debug/NGraphiteTests.csproj.FilesWrittenAbsolute.txt +@@ -0,0 +1,5 @@ ++/home/rene/Debian/Pakete/graphite2/graphite2-1.2.0/contrib/C#/NGraphiteTests/bin/Debug/NGraphite.dll.config ++/home/rene/Debian/Pakete/graphite2/graphite2-1.2.0/contrib/C#/NGraphiteTests/bin/Debug/NGraphiteTests.dll.mdb ++/home/rene/Debian/Pakete/graphite2/graphite2-1.2.0/contrib/C#/NGraphiteTests/bin/Debug/NGraphiteTests.dll ++/home/rene/Debian/Pakete/graphite2/graphite2-1.2.0/contrib/C#/NGraphiteTests/obj/Debug/NGraphiteTests.dll ++/home/rene/Debian/Pakete/graphite2/graphite2-1.2.0/contrib/C#/NGraphiteTests/obj/Debug/NGraphiteTests.dll.mdb +--- /dev/null ++++ graphite2-1.2.0/contrib/C#/NGraphiteTests/bin/Debug/NGraphite.dll.config +@@ -0,0 +1,3 @@ ++<configuration> ++ <dllmap dll="graphite2.dll" target="libgraphite2.so.3" os="!windows"/> ++</configuration> diff --git a/debian/patches/no-specific-nunit-version.diff b/debian/patches/no-specific-nunit-version.diff new file mode 100644 index 0000000..53f4367 --- /dev/null +++ b/debian/patches/no-specific-nunit-version.diff @@ -0,0 +1,15 @@ +--- graphite2-1.2.0.orig/contrib/C#/NGraphiteTests/NGraphiteTests.csproj ++++ graphite2-1.2.0/contrib/C#/NGraphiteTests/NGraphiteTests.csproj +@@ -30,10 +30,10 @@ + </PropertyGroup> + <ItemGroup> + <Reference Include="System" /> +- <Reference Include="nunit.core, Version=2.4.8.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77"> ++ <Reference Include="nunit.core"> + <Package>mono-nunit</Package> + </Reference> +- <Reference Include="nunit.framework, Version=2.4.8.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77"> ++ <Reference Include="nunit.framework"> + <Package>mono-nunit</Package> + </Reference> + </ItemGroup> diff --git a/debian/patches/series b/debian/patches/series index 10d55fe..1931d2b 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,4 @@ include-and-libraries.diff +no-specific-nunit-version.diff +soname.diff +foo diff --git a/debian/patches/soname.diff b/debian/patches/soname.diff new file mode 100644 index 0000000..a4347ab --- /dev/null +++ b/debian/patches/soname.diff @@ -0,0 +1,7 @@ +--- graphite2-1.2.0.orig/contrib/C#/NGraphite/NGraphite.dll.config ++++ graphite2-1.2.0/contrib/C#/NGraphite/NGraphite.dll.config +@@ -1,3 +1,3 @@ + <configuration> +- <dllmap dll="graphite2.dll" target="libgraphite2.so.2.0.0" os="!windows"/> ++ <dllmap dll="graphite2.dll" target="libgraphite2.so.3" os="!windows"/> + </configuration> diff --git a/debian/rules b/debian/rules index 36e973a..8b7eb0b 100755 --- a/debian/rules +++ b/debian/rules @@ -1,50 +1,60 @@ #!/usr/bin/make -f +include /usr/share/dpkg/architecture.mk + %: dh $@ --builddirectory=build override_dh_strip: dh_strip --dbg-package=libgraphite2-3-dbg -override_dh_auto_build: +override_dh_auto_build-arch: dh_auto_build - echo "Building docs" - dh_auto_build -- docs # echo "Building perl module" -# cd perl && \ +# cd contrib/perl && \ # perl Build.PL prefix=/usr && \ # ./Build +override_dh_auto_build-indep: + echo "Building docs" + dh_auto_build -- docs +# echo "Building C# binding" +# cd contrib/C\# && \ +# mono-xbuild NGraphite.sln + override_dh_auto_install: dh_auto_install - rm -rf debian/tmp/usr/bin # cd perl && \ -# ./Build install destdir=$(CURDIR)/debian/libtext-graphite2-perl +# ./Build install destdir=$(CURDIR)/debian/libtext-gr2-perl # # hack -# cd $(CURDIR)/debian/libtext-graphite2-perl/usr && \ +# cd $(CURDIR)/debian/libtext-gr2-perl/usr && \ # mkdir share && mv man share -# cd $(CURDIR)/debian/libtext-graphite2-perl/usr/lib && \ +# cd $(CURDIR)/debian/libtext-gr2-perl/usr/lib && \ # mv perl perl5 && cd perl5 && mv 5.*/* . && rm -rf 5.* -# find debian/libtext-graphite2-perl -type f -name .packlist | xargs rm -f +# find debian/libtext-gr2-perl -type f -name .packlist | xargs rm -f override_dh_auto_test: dh_auto_test #ifneq (nocheck,$(findstring nocheck,$(DEB_BUILD_OPTIONS))) -# cd perl && \ +# cd contrib/perl && \ # LD_LIBRARY_PATH=$(CURDIR)/build/src ./Build test #endif override_dh_auto_clean: -# if [ -e perl/Build ]; then cd perl && \ +# if [ -e contrib/perl/Build ]; then cd contrib/perl && \ # ./Build clean; fi -# rm -rf perl/Build perl/_build +# rm -rf contrib/perl/Build contrib/perl/_build +# rm -f /contrib/perl/MYMETA* +# rm -f contrib/C\#/NGraphite/obj/Debug/NGraphite.csproj.FilesWrittenAbsolute.txt +# -find contrib/C\# -name "*.dll" | xargs rm +# -find contrib/C\# -name "*.dll.mdb" | xargs rm -find . -name "CTestCostData.txt" | xargs rm -find . -name "LastTest.log" | xargs rm dh_auto_clean override_dh_auto_configure: - dh_auto_configure -- -DCMAKE_BUILD_TYPE:STRING=Release -DGRAPHITE2_NTRACING:bool=1 -DGRAPHITE2_COMPARE_RENDERER=ON -DICU_LIBRARY_PATH=/usr/lib + dh_auto_configure -- -DCMAKE_BUILD_TYPE:STRING=Release -DGRAPHITE2_NTRACING:bool=1 -DLIB_SUFFIX=/$(DEB_HOST_MULTIARCH) override_dh_gencontrol: - dh_gencontrol -Nlibtext-graphite2-perl -O--builddirectory=build -# dh_gencontrol -plibtext-graphite2-perl -- -v`cat perl/META.yml | grep version: | tail -n 1 | awk '{ print $$2 }'`-`dpkg-parsechangelog | grep urgency | awk '{ print $$2 }' | sed -e 's/(//' | sed -e 's/)//' | cut -d- -f2` + dh_gencontrol -Nlibtext-gr2-perl -O--builddirectory=build +# dh_gencontrol -plibtext-gr2-perl -- -v`cat perl/META.yml | grep version: | tail -n 1 | awk '{ print $$2 }'`-`dpkg-parsechangelog | grep urgency | awk '{ print $$2 }' | sed -e 's/(//' | sed -e 's/)//' | cut -d- -f2` diff --git a/debian/source/include-binaries b/debian/source/include-binaries new file mode 100644 index 0000000..4718cd3 --- /dev/null +++ b/debian/source/include-binaries @@ -0,0 +1,10 @@ +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
