This is an automated email from the git hooks/post-receive script. rene pushed a commit to branch master in repository graphite2.
commit ab8cba918065065dc5a3290423b8810490d0dea7 Author: Rene Engelhard <[email protected]> Date: Sun Jun 2 12:05:28 2013 +0000 Imported Debian patch 1.2.2-2 --- debian/changelog | 9 +-- debian/graphite2-utils.substvars | 2 - ...ess.patch => fix-misaligned-memory-access.diff} | 0 debian/patches/foo | 68 ---------------------- debian/patches/series | 3 +- debian/rules | 3 +- 6 files changed, 8 insertions(+), 77 deletions(-) diff --git a/debian/changelog b/debian/changelog index cbbb846..456cb94 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,13 +1,14 @@ -graphite2 (1.2.2-1+alpha) unreleased; urgency=low +graphite2 (1.2.2-2) unstable; urgency=low - * Fix unaligned memory access and FTBFS on alpha (#710336) + * add patch from Michael Cree <[email protected]> to fix + misaligned memory access - thanks (closes: #710336) - -- Michael Cree <[email protected]> Sun, 02 Jun 2013 11:50:07 +1200 + -- Rene Engelhard <[email protected]> Sun, 02 Jun 2013 12:05:28 +0000 graphite2 (1.2.2-1) unstable; urgency=low * New upstream release - * stop building with gotten from somewhere and overriding + * stop building with -O3 gotten from somewhere and overriding dpkg-buildflags' value, just remove via sed * converto multiarch again... (closes: #689813) diff --git a/debian/graphite2-utils.substvars b/debian/graphite2-utils.substvars deleted file mode 100644 index 33a3e7b..0000000 --- a/debian/graphite2-utils.substvars +++ /dev/null @@ -1,2 +0,0 @@ -shlibs:Depends=libc6 (>= 2.3.4), libgraphite2-3 -misc:Depends= diff --git a/debian/patches/fix-misaligned-memory-access.patch b/debian/patches/fix-misaligned-memory-access.diff similarity index 100% rename from debian/patches/fix-misaligned-memory-access.patch rename to debian/patches/fix-misaligned-memory-access.diff diff --git a/debian/patches/foo b/debian/patches/foo deleted file mode 100644 index a89375f..0000000 --- a/debian/patches/foo +++ /dev/null @@ -1,68 +0,0 @@ -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/series b/debian/patches/series index c949971..8daaaa6 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,5 +1,4 @@ include-and-libraries.diff no-specific-nunit-version.diff soname.diff -foo -fix-misaligned-memory-access.patch +fix-misaligned-memory-access.diff diff --git a/debian/rules b/debian/rules index e81458a..6fbbb93 100755 --- a/debian/rules +++ b/debian/rules @@ -54,7 +54,8 @@ override_dh_auto_clean: override_dh_auto_configure: dh_auto_configure -- -DCMAKE_BUILD_TYPE:STRING=Release -DGRAPHITE2_NTRACING:bool=1 -DLIB_SUFFIX=/$(DEB_HOST_MULTIARCH) - find . -type f ! -name "rules" -exec sed -i -e 's/\-O3//g' {} \; + find . -type f ! -name "rules" ! -name "changelog" \ + -exec sed -i -e 's/\-O3//g' {} \; override_dh_gencontrol: dh_gencontrol -Nlibtext-gr2-perl -O--builddirectory=build -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/graphite2.git
