[SCM] Rasmol packaging branch, master, updated. debian/2.7.4.2-5-71-g25ff4b1

[Teemu Ikonen]

The following commit has been merged in the master branch:
commit ae7a4f540e6863441dddaaa2d5cd064671dcc417
Author: Teemu Ikonen <tpikonen at gmail.com>
Date:   Wed May 22 23:11:09 2013 +0200

    Refresh debian/patches

diff --git a/debian/patches/02_imakefile.patch b/debian/patches/02_imakefile.patch
index fc98698..cf46f56 100644
--- a/debian/patches/02_imakefile.patch
+++ b/debian/patches/02_imakefile.patch
@@ -2,11 +2,11 @@ From: Teemu Ikonen <tpikonen at gmail.com>
 Subject: Debian changes to Imakefile.
 X-git-branch: p/imakefile
 
- src/Imakefile |   30 ++++++++++++++++--------------
- 1 file changed, 16 insertions(+), 14 deletions(-)
+ src/Imakefile |   35 +++++++++++++++++++----------------
+ 1 file changed, 19 insertions(+), 16 deletions(-)
 
 diff --git a/src/Imakefile b/src/Imakefile
-index b5a88dd..c389b65 100755
+index b5a88dd..7937273 100755
 --- a/src/Imakefile
 +++ b/src/Imakefile
 @@ -1,8 +1,8 @@
@@ -23,7 +23,7 @@ index b5a88dd..c389b65 100755
  ###########################################################################
  #                               RasMol 2.7.5                              #
  #                                                                         #
-@@ -124,7 +124,7 @@ DEPTHDEF = -DTHIRTYTWOBIT
+@@ -124,14 +124,15 @@ DEPTHDEF = -DTHIRTYTWOBIT
    LOCALEDEF =
  #endif
  
@@ -32,7 +32,16 @@ index b5a88dd..c389b65 100755
  
  #ifndef GTKWIN
  #define X11WIN
-@@ -197,7 +197,7 @@ CBFLIB_OBJDEP = $(CBFLIB_DIR)/lib/libcbf.a
+ #endif
+ 
+ #ifdef GTKWIN
+-GTKLIBS = $(shell pkg-config --libs vte gtk+-2.0)
++#GTKLIBS = $(shell pkg-config --libs vte gtk+-2.0)
++GTKLIBS = -lvte -lgtk-x11-2.0 -lgdk-x11-2.0 -lgdk_pixbuf-2.0 -lgobject-2.0 -lglib-2.0 -lcairo -lX11
+ GTKCFLAGS = $(shell pkg-config --cflags vte gtk+-2.0)
+ GUISRC = gtkwin.c eggfileformatchooser.c 
+ GUIOBJ = gtkwin.o eggfileformatchooser.o
+@@ -197,7 +198,7 @@ CBFLIB_OBJDEP = $(CBFLIB_DIR)/lib/libcbf.a
  ifeq ($(strip $(CBFLIB_DIR)),)
  CBFLIB_DIR = $(PKGDIR)
  endif
@@ -41,7 +50,7 @@ index b5a88dd..c389b65 100755
  CBFLIB_LDLIB = -L$(CBFLIB_DIR)/lib -lcbf
  CBFLIB_OBJDEP =
  #define NO_CBFLIB_BUILD
-@@ -276,7 +276,7 @@ NEARTREE_OBJDEP =
+@@ -276,7 +277,7 @@ NEARTREE_OBJDEP =
  
  # RasMol's on-line help direcory
  #   e.g. /usr/local/lib/rasmol/rasmol.hlp
@@ -50,7 +59,16 @@ index b5a88dd..c389b65 100755
  
  
  #ifndef USE_XFORMSLIB
-@@ -332,26 +332,28 @@ LDLIBS = -lm -lXi $(XLIB) $(EXTRA_LIBRARIES) $(XFORMSLIB) $(GTKLIBS) \
+@@ -317,7 +318,7 @@ OBJS = rasmol.o molecule.o abstree.o cmndline.o command.o transfor.o \
+ # Additional RS6000 AIX MITSHM Library
+ # LDLIBS = -lm -lXi -lXextSam $(XLIB)
+ 
+-LDLIBS = -lm -lXi $(XLIB) $(EXTRA_LIBRARIES) $(XFORMSLIB) $(GTKLIBS) \
++LDLIBS = -lm $(XLIB) $(EXTRA_LIBRARIES) $(XFORMSLIB) $(GTKLIBS) \
+ 			$(CBFLIB_LDLIB) \
+ 			$(CQRLIB_LDLIB) \
+ 			$(CVECTOR_LDLIB) \
+@@ -332,26 +333,28 @@ LDLIBS = -lm -lXi $(XLIB) $(EXTRA_LIBRARIES) $(XFORMSLIB) $(GTKLIBS) \
  #
  
  #ifdef HPArchitecture

-- 
Rasmol packaging