Hi,
Rene Engelhard wrote:
> Rene Engelhard wrote:
> > silgraphite 2.3 is available since February:
> > http://sourceforge.net/project/showfiles.php?group_id=66144&package_id=63972&release_id=573024
Even 2.3.1 is released since long now.
> And packaging it is easy, I've actually already done that. Patch
> attached. (You just need the orig)
Updated patch for 2.3.1 there.
> I can NMU if you wish.
Still holds. Especially as OOo 3.2 is scheduled to have graphite support [1]
and ships 2.3.1 in-tree. But I of course do want to use the system graphite
lib, not the internal copy.
Even though I am not sure whether using 2.2.1 would break it would not make
sense.
2.3.1 ships xft, freetype and the formerly external pangographite wrappers.
I disabled them for now until we decided what to do with those .so.0s
- I didn't even check yet whether 2.2.1 and 2.3.1 are ABI-compatible and
am not sure whether it will stay with that 0.0.0 one - and as pangographite
is buggy [2][3]
New patch attached. I also fixed lintian stuff.
Regards,
Rene
[1]
https://tools.services.openoffice.org/EIS2/cws.ShowCWS?logon=true&Id=3955&Path=DEV300%2Fgraphite01
[2] bugs.debian.org/src:pango-graphite
[3] no idea (yet) whether that's fixed right now, if it is, it might be a
good idea to build pango-graphite out of the "normal" source package.
reverted:
--- silgraphite2.0-2.2.1/silgraphite-2.2.1.tar.gz.cdbs-config_list
+++ silgraphite2.0-2.2.1.orig/silgraphite-2.2.1.tar.gz.cdbs-config_list
@@ -1,2 +0,0 @@
-silgraphite-2.2.1/config/config.guess
-silgraphite-2.2.1/config/config.sub
diff -u silgraphite2.0-2.2.1/debian/changelog silgraphite2.0-2.3.1/debian/changelog
--- silgraphite2.0-2.2.1/debian/changelog
+++ silgraphite2.0-2.3.1/debian/changelog
@@ -1,3 +1,12 @@
+silgraphite2.0 (1:2.3.1-0.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * New upstream release. (closes: #508570)
+ * libgraphite3-dbg -> debug; priority extra
+ * add ${misc:Depends} and use binary:Version instead of Source-Version
+
+ -- Rene Engelhard <[email protected]> Wed, 08 Jul 2009 19:48:48 +0200
+
silgraphite2.0 (1:2.2.1-2.1) unstable; urgency=low
* Non-maintainer upload.
diff -u silgraphite2.0-2.2.1/debian/control silgraphite2.0-2.3.1/debian/control
--- silgraphite2.0-2.2.1/debian/control
+++ silgraphite2.0-2.3.1/debian/control
@@ -8,7 +8,7 @@
Package: libgraphite-dev
Section: libdevel
Architecture: any
-Depends: libgraphite3 (= ${Source-Version})
+Depends: libgraphite3 (= ${binary:Version}), ${misc:Depends}
Conflicts: libsilgraphite-dev, libsilgraphite-2.0
Description: Development files for SILGraphite
SILGraphite is a system that can be used to create and use "smart fonts"
@@ -33,7 +33,7 @@
Package: libgraphite3
Section: libs
Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
Conflicts: libsilgraphite-dev, libsilgraphite-2.0
Description: SILGraphite - a "smart font" rendering engine
SILGraphite is a system that can be used to create and use "smart fonts"
@@ -56,9 +56,10 @@
This package contains the shared library.
Package: libgraphite3-dbg
-Section: libdevel
+Section: debug
+Priority: extra
Architecture: any
-Depends: libgraphite3 (= ${Source-Version})
+Depends: libgraphite3 (= ${binary:Version}), ${misc:Depends}
Conflicts: libsilgraphite-dev, libsilgraphite-2.0
Description: debugging symbols for SILGraphite
SILGraphite is a system that can be used to create and use "smart fonts"
diff -u silgraphite2.0-2.2.1/debian/libgraphite-dev.docs silgraphite2.0-2.3.1/debian/libgraphite-dev.docs
--- silgraphite2.0-2.2.1/debian/libgraphite-dev.docs
+++ silgraphite2.0-2.3.1/debian/libgraphite-dev.docs
@@ -1,5 +1,5 @@
-build-tree/silgraphite-2.2.1/doc/GTF_3_0.odt
-build-tree/silgraphite-2.2.1/doc/V2_Engine_Interface.odt
-build-tree/silgraphite-2.2.1/doc/V2_Segment_Interface.odt
-build-tree/silgraphite-2.2.1/doc/V2_TextSource_Interface.odt
+build-tree/silgraphite-2.3.1/engine/doc/GTF_3_0.odt
+build-tree/silgraphite-2.3.1/engine/doc/V2_Engine_Interface.odt
+build-tree/silgraphite-2.3.1/engine/doc/V2_Segment_Interface.odt
+build-tree/silgraphite-2.3.1/engine/doc/V2_TextSource_Interface.odt
diff -u silgraphite2.0-2.2.1/debian/libgraphite3.install silgraphite2.0-2.3.1/debian/libgraphite3.install
--- silgraphite2.0-2.2.1/debian/libgraphite3.install
+++ silgraphite2.0-2.3.1/debian/libgraphite3.install
@@ -1 +1 @@
-debian/tmp/usr/lib/lib*.so.*
+debian/tmp/usr/lib/lib*.so.3*
diff -u silgraphite2.0-2.2.1/debian/rules silgraphite2.0-2.3.1/debian/rules
--- silgraphite2.0-2.2.1/debian/rules
+++ silgraphite2.0-2.3.1/debian/rules
@@ -4,10 +4,15 @@
-DEB_TAR_SRCDIR := silgraphite-2.2.1
+DEB_TAR_SRCDIR := silgraphite-2.3.1
include /usr/share/cdbs/1/rules/tarball.mk
-
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/autotools.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
-#DEB_CONFIGURE_EXTRA_FLAGS := --enable-final
-DEB_DH_MAKESHLIBS_ARGS_libgraphite3 := -V"libgraphite3 (>= 2.1+0449svn-1)"
+# FIXME: what to do with those? Is .so.0/so.0.0.0 really correct and stable?
+DEB_CONFIGURE_EXTRA_FLAGS := --without-freetype --without-xft
+# disable pangographite
+DEB_CONFIGURE_EXTRA_FLAGS += --without-pangographite
+#DEB_CONFIGURE_EXTRA_FLAGS += --enable-final
+
+DEB_DH_MAKESHLIBS_ARGS_libgraphite3 := -V"libgraphite3 (>= 2.3)"
DEB_COMPRESS_EXCLUDE := .rtf
DEB_DH_STRIP_ARGS := --dbg-package=libgraphite3
+
reverted:
--- silgraphite2.0-2.2.1/debian/patches/gcc-4.3.diff
+++ silgraphite2.0-2.2.1.orig/debian/patches/gcc-4.3.diff
@@ -1,63 +0,0 @@
---- silgraphite-2.2.1/src/font/TtfUtil.cpp
-+++ silgraphite-2.2.1/src/font/TtfUtil.cpp
-@@ -27,6 +27,9 @@
- #include "TtfUtil.h"
- #include "TtfTypes.h"
-
-+#include <climits>
-+#include <cstring>
-+
- /***********************************************************************************************
- Forward declarations
- ***********************************************************************************************/
---- silgraphite-2.2.1/src/segment/GrEngine.cpp
-+++ silgraphite-2.2.1/src/segment/GrEngine.cpp
-@@ -16,6 +16,7 @@
- //:>********************************************************************************************
- #include "Main.h"
- #include <functional>
-+#include <cstring>
- #ifdef _MSC_VER
- #pragma hdrstop
- #endif
---- silgraphite-2.2.1/src/segment/GrFSM.cpp
-+++ silgraphite-2.2.1/src/segment/GrFSM.cpp
-@@ -16,6 +16,7 @@
- //:> Include files
- //:>********************************************************************************************
- #include "Main.h"
-+#include <cstring>
- #ifdef _MSC_VER
- #pragma hdrstop
- #endif
---- silgraphite-2.2.1/src/segment/GrFeature.cpp
-+++ silgraphite-2.2.1/src/segment/GrFeature.cpp
-@@ -16,6 +16,7 @@
- //:> Include files
- //:>********************************************************************************************
- #include "Main.h"
-+#include <cstring>
-
- #ifdef _MSC_VER
- #pragma hdrstop
---- silgraphite-2.2.1/test/ProfileHarness/ProfileHarness.cpp
-+++ silgraphite-2.2.1/test/ProfileHarness/ProfileHarness.cpp
-@@ -22,6 +22,7 @@
- #include <iomanip>
- #include <string>
- #include <sstream>
-+#include <cstring>
-
- #include <graphite/GrClient.h>
- #include <graphite/ITextSource.h>
---- silgraphite-2.2.1/test/RegressionTest/RtTextSrc.h
-+++ silgraphite-2.2.1/test/RegressionTest/RtTextSrc.h
-@@ -15,6 +15,8 @@
- #ifndef RTTXTSRC_INCLUDED
- #define RTTXTSRC_INCLUDED
-
-+#include <cstring>
-+
-
- /*----------------------------------------------------------------------------------------------
- Class: RtTextSrc
only in patch2:
unchanged:
--- silgraphite2.0-2.3.1.orig/silgraphite-2.3.1.tar.gz.cdbs-config_list
+++ silgraphite2.0-2.3.1/silgraphite-2.3.1.tar.gz.cdbs-config_list
@@ -0,0 +1,10 @@
+silgraphite-2.3.1/examples/TestFileFont/config.log
+silgraphite-2.3.1/examples/TestFileFont/config.status
+silgraphite-2.3.1/engine/config/config.guess
+silgraphite-2.3.1/engine/config/config.sub
+silgraphite-2.3.1/wrappers/freetype/config/config.guess
+silgraphite-2.3.1/wrappers/freetype/config/config.sub
+silgraphite-2.3.1/wrappers/xft/config/config.guess
+silgraphite-2.3.1/wrappers/xft/config/config.sub
+silgraphite-2.3.1/wrappers/pangographite/config/config.guess
+silgraphite-2.3.1/wrappers/pangographite/config/config.sub
