tag 508570 + patch
thanks

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

And packaging it is easy, I've actually already done that. Patch
attached. (You just need the orig)

I can NMU if you wish.

Regards,

Rene
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/debian/changelog
--- silgraphite2.0-2.2.1/debian/changelog
+++ silgraphite2.0-2.3/debian/changelog
@@ -1,3 +1,10 @@
+silgraphite2.0 (1:2.3-0.1) experimental; urgency=low
+
+  * Non-maintainer upload.
+  * New upstream release. (closes: #508570) 
+
+ -- Rene Engelhard <[email protected]>  Fri, 12 Dec 2008 18:31:47 +0100
+
 silgraphite2.0 (1:2.2.1-2.1) unstable; urgency=low
 
   * Non-maintainer upload.
diff -u silgraphite2.0-2.2.1/debian/libgraphite-dev.docs silgraphite2.0-2.3/debian/libgraphite-dev.docs
--- silgraphite2.0-2.2.1/debian/libgraphite-dev.docs
+++ silgraphite2.0-2.3/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/engine/doc/GTF_3_0.odt
+build-tree/silgraphite-2.3/engine/doc/V2_Engine_Interface.odt
+build-tree/silgraphite-2.3/engine/doc/V2_Segment_Interface.odt
+build-tree/silgraphite-2.3/engine/doc/V2_TextSource_Interface.odt
 
diff -u silgraphite2.0-2.2.1/debian/rules silgraphite2.0-2.3/debian/rules
--- silgraphite2.0-2.2.1/debian/rules
+++ silgraphite2.0-2.3/debian/rules
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 #DEB_AUTO_UPDATE_DEBIAN_CONTROL:=yes
 
-DEB_TAR_SRCDIR := silgraphite-2.2.1
+DEB_TAR_SRCDIR := silgraphite-2.3
 include /usr/share/cdbs/1/rules/tarball.mk
 
 include /usr/share/cdbs/1/rules/debhelper.mk
diff -u silgraphite2.0-2.2.1/debian/patches/gcc-4.3.diff silgraphite2.0-2.3/debian/patches/gcc-4.3.diff
--- silgraphite2.0-2.2.1/debian/patches/gcc-4.3.diff
+++ silgraphite2.0-2.3/debian/patches/gcc-4.3.diff
@@ -1,5 +1,5 @@
---- silgraphite-2.2.1/src/font/TtfUtil.cpp
-+++ silgraphite-2.2.1/src/font/TtfUtil.cpp
+--- silgraphite-2.3/engine/src/font/TtfUtil.cpp
++++ silgraphite-2.3/engine/src/font/TtfUtil.cpp
 @@ -27,6 +27,9 @@
  #include "TtfUtil.h"
  #include "TtfTypes.h"
@@ -10,8 +10,8 @@
  /***********************************************************************************************
  	Forward declarations
  ***********************************************************************************************/
---- silgraphite-2.2.1/src/segment/GrEngine.cpp
-+++ silgraphite-2.2.1/src/segment/GrEngine.cpp
+--- silgraphite-2.3/engine/src/segment/GrEngine.cpp
++++ silgraphite-2.3/engine/src/segment/GrEngine.cpp
 @@ -16,6 +16,7 @@
  //:>********************************************************************************************
  #include "Main.h"
@@ -20,8 +20,8 @@
  #ifdef _MSC_VER
  #pragma hdrstop
  #endif
---- silgraphite-2.2.1/src/segment/GrFSM.cpp
-+++ silgraphite-2.2.1/src/segment/GrFSM.cpp
+--- silgraphite-2.3/engine/src/segment/GrFSM.cpp
++++ silgraphite-2.3/engine/src/segment/GrFSM.cpp
 @@ -16,6 +16,7 @@
  //:>	   Include files
  //:>********************************************************************************************
@@ -30,8 +30,8 @@
  #ifdef _MSC_VER
  #pragma hdrstop
  #endif
---- silgraphite-2.2.1/src/segment/GrFeature.cpp
-+++ silgraphite-2.2.1/src/segment/GrFeature.cpp
+--- silgraphite-2.3/engine/src/segment/GrFeature.cpp
++++ silgraphite-2.3/engine/src/segment/GrFeature.cpp
 @@ -16,6 +16,7 @@
  //:>	Include files
  //:>********************************************************************************************
@@ -40,8 +40,18 @@
  
  #ifdef _MSC_VER
  #pragma hdrstop
---- silgraphite-2.2.1/test/ProfileHarness/ProfileHarness.cpp
-+++ silgraphite-2.2.1/test/ProfileHarness/ProfileHarness.cpp
+--- silgraphite-2.3/engine/src/segment/MemoryUsage.cpp-old	2008-12-15 09:12:40.000000000 +0100
++++ silgraphite-2.3/engine/src/segment/MemoryUsage.cpp	2008-12-15 09:13:00.000000000 +0100
+@@ -28,6 +28,7 @@
+ //#include <fstream>
+ #include <iostream>
+ //#include <string>
++#include <cstring>
+ // Forward declarations.
+ 
+ #include "Main.h"
+--- silgraphite-2.3/engine/test/ProfileHarness/ProfileHarness.cpp
++++ silgraphite-2.3/engine/test/ProfileHarness/ProfileHarness.cpp
 @@ -22,6 +22,7 @@
  #include <iomanip>

  #include <string>

@@ -50,8 +60,8 @@
  

  #include <graphite/GrClient.h>

  #include <graphite/ITextSource.h>

---- silgraphite-2.2.1/test/RegressionTest/RtTextSrc.h
-+++ silgraphite-2.2.1/test/RegressionTest/RtTextSrc.h
+--- silgraphite-2.3/engine/test/RegressionTest/RtTextSrc.h
++++ silgraphite-2.3/engine/test/RegressionTest/RtTextSrc.h
 @@ -15,6 +15,8 @@
  #ifndef RTTXTSRC_INCLUDED

  #define RTTXTSRC_INCLUDED

@@ -63,0 +74,10 @@
+--- silgraphite-2.3/wrappers/pangographite/pangographite.cpp-old	2008-12-15 09:24:06.000000000 +0100
++++ silgraphite-2.3/wrappers/pangographite/pangographite.cpp	2008-12-15 09:24:25.000000000 +0100
+@@ -23,6 +23,7 @@
+ #include "graphitecache.h"
+ #include "pangographite.h"
+ #include <math.h>
++#include <cstring>
+ 
+ typedef std::pair<gr::GlyphIterator, gr::GlyphIterator> GlyphRange;
+ typedef std::pair<gr::GlyphSetIterator, gr::GlyphSetIterator> GrGlyphSet;
only in patch2:
unchanged:
--- silgraphite2.0-2.3.orig/silgraphite-2.3.tar.gz.cdbs-config_list
+++ silgraphite2.0-2.3/silgraphite-2.3.tar.gz.cdbs-config_list
@@ -0,0 +1,10 @@
+silgraphite-2.3/examples/TestFileFont/config.log
+silgraphite-2.3/examples/TestFileFont/config.status
+silgraphite-2.3/engine/config/config.guess
+silgraphite-2.3/engine/config/config.sub
+silgraphite-2.3/wrappers/freetype/config/config.guess
+silgraphite-2.3/wrappers/freetype/config/config.sub
+silgraphite-2.3/wrappers/xft/config/config.guess
+silgraphite-2.3/wrappers/xft/config/config.sub
+silgraphite-2.3/wrappers/pangographite/config/config.guess
+silgraphite-2.3/wrappers/pangographite/config/config.sub

Reply via email to