Hi!
Attached is an update to grip-3.2.0. It's using gtk2 now. Works for me on
i386. Please test and comment. (e-mailed MAINTAINER two weeks ago)
Bernd
Index: Makefile
===================================================================
RCS file: /cvs/ports/audio/grip/Makefile,v
retrieving revision 1.13
diff -u -r1.13 Makefile
--- Makefile 22 Mar 2005 15:02:45 -0000 1.13
+++ Makefile 6 Jun 2005 12:23:44 -0000
@@ -2,9 +2,7 @@
COMMENT= "front-end to external cd audio rippers and mp3 encoders"
-V= 3.0.7
-DISTNAME= grip-${V}
-PKGNAME= ${DISTNAME}p0
+DISTNAME= grip-3.2.0
CATEGORIES= audio
HOMEPAGE= http://www.nostatic.org/grip/
@@ -16,9 +14,15 @@
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
-WANTLIB= ICE SM X11 Xext Xi audiofile c \
- esd gdk_imlib glib gmodule jpeg \
- m png pthread stdc++ tiff ungif z
+WANTLIB= c freetype crypto m X11 Xft ICE Xrender stdc++ SM \
+ pthread ncurses ssl fontconfig z \
+ gthread-2.0.0.0 gnomevfs-2 glib-2.0.0.0 \
+ gmodule-2.0.0.0 gobject-2.0.0.0 gtk-x11-2.0.0.0 \
+ bonobo-activation art_lgpl_2 bonobo-2 atk-1.0.0.0 \
+ gconf-2 pangox-1.0.0.0 bonoboui-2 popt \
+ pangoft2-1.0.0.0 gnomecanvas-2 xml2 \
+ pangoxft-1.0.0.0 ORBit-2 pango-1.0.0.0 \
+ gdk_pixbuf-2.0.0.0 gdk-x11-2.0.0.0 gnome-2
FLAVORS= cdparanoia
FLAVOR?=
@@ -27,17 +31,16 @@
MODULES= devel/gettext
-LIB_DEPENDS= gtk.1.2,gdk.1.2::x11/gtk+ \
- gnome.36,gnomesupport.0,gnomeui.46,art_lgpl.4::x11/gnome/libs \
- ghttp::www/libghttp \
- id3.3.8::audio/id3lib
+LIB_DEPENDS= gnomeui-2::x11/gnome/libgnomeui \
+ id3.3.8::audio/id3lib \
+ curl.3::net/curl \
+ vte.8::devel/vte
-NO_REGRESS= Yes
+USE_X11= Yes
CONFIGURE_STYLE= gnu
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib" \
- LIBS="-pthread"
+ LDFLAGS="-L${LOCALBASE}/lib"
.if ${FLAVOR:L:Mcdparanoia}
LIB_DEPENDS+= cdda_interface,cdda_paranoia::audio/cdparanoia
Index: distinfo
===================================================================
RCS file: /cvs/ports/audio/grip/distinfo,v
retrieving revision 1.4
diff -u -r1.4 distinfo
--- distinfo 5 Jan 2005 15:47:07 -0000 1.4
+++ distinfo 6 Jun 2005 12:23:44 -0000
@@ -1,4 +1,4 @@
-MD5 (grip-3.0.7.tar.gz) = eac4bbb44584cb64273c048343b37124
-RMD160 (grip-3.0.7.tar.gz) = c098148c8d0e28fb88cb468cecf36728df08a3bb
-SHA1 (grip-3.0.7.tar.gz) = 153cc2f936332c349e0cdc2c1b6c54ee105b55d8
-SIZE (grip-3.0.7.tar.gz) = 874766
+MD5 (grip-3.2.0.tar.gz) = 9b51933a03dd7d7ddfbb3643fc82c2d0
+RMD160 (grip-3.2.0.tar.gz) = b162ce4bcc08ea29bf6a504ae5cd6ec5a5f3e969
+SHA1 (grip-3.2.0.tar.gz) = dd135b689dd0869f9652a1bfe73dcbe42a6475be
+SIZE (grip-3.2.0.tar.gz) = 722039
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/audio/grip/patches/patch-configure,v
retrieving revision 1.3
diff -u -r1.3 patch-configure
--- patches/patch-configure 5 Jan 2005 15:45:15 -0000 1.3
+++ patches/patch-configure 6 Jun 2005 12:23:44 -0000
@@ -1,53 +1,16 @@
-$OpenBSD: patch-configure,v 1.3 2005/01/05 15:45:15 alek Exp $
---- configure.orig Wed Apr 23 04:33:56 2003
-+++ configure Wed Jan 5 16:10:31 2005
-@@ -8029,13 +8029,13 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtoo
+$OpenBSD$
+--- configure.orig Mon Jun 6 11:39:22 2005
++++ configure Mon Jun 6 11:40:15 2005
+@@ -4140,7 +4140,7 @@ done
- PTHREAD_LIB=""
-- echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
--echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6
-+ echo "$as_me:$LINENO: checking for pthread_create in -pthread" >&5
-+echo $ECHO_N "checking for pthread_create in -pthread... $ECHO_C" >&6
- if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_check_lib_save_LIBS=$LIBS
--LIBS="-lpthread $LIBS"
-+LIBS="-pthread $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- #include "confdefs.h"
-@@ -8085,15 +8085,15 @@ fi
- echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5
- echo "${ECHO_T}$ac_cv_lib_pthread_pthread_create" >&6
- if test $ac_cv_lib_pthread_pthread_create = yes; then
-- PTHREAD_LIB="-lpthread"
-+ PTHREAD_LIB="-pthread"
- else
-- echo "$as_me:$LINENO: checking for pthread_create in -lpthreads" >&5
--echo $ECHO_N "checking for pthread_create in -lpthreads... $ECHO_C" >&6
-+ echo "$as_me:$LINENO: checking for pthread_create in -pthreads" >&5
-+echo $ECHO_N "checking for pthread_create in -pthreads... $ECHO_C" >&6
- if test "${ac_cv_lib_pthreads_pthread_create+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_check_lib_save_LIBS=$LIBS
--LIBS="-lpthreads $LIBS"
-+LIBS="-pthreads $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- #include "confdefs.h"
-@@ -8143,7 +8143,7 @@ fi
- echo "$as_me:$LINENO: result: $ac_cv_lib_pthreads_pthread_create" >&5
- echo "${ECHO_T}$ac_cv_lib_pthreads_pthread_create" >&6
- if test $ac_cv_lib_pthreads_pthread_create = yes; then
-- PTHREAD_LIB="-lpthreads"
-+ PTHREAD_LIB="-pthreads"
- else
- echo "$as_me:$LINENO: checking for pthread_create in -lc_r" >&5
- echo $ECHO_N "checking for pthread_create in -lc_r... $ECHO_C" >&6
-@@ -11324,7 +11324,7 @@ cat conftest.$ac_ext >&5
+
+-for ac_header in linux/soundcard.h machine/soundcard.h sys/soundcard.h
sys/audioio.h sys/audio.io.h sun/audioio.h
++for ac_header in soundcard.h linux/soundcard.h machine/soundcard.h
sys/soundcard.h sys/audioio.h sys/audio.io.h sun/audioio.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if eval "test \"\${$as_ac_Header+set}\" = set"; then
+@@ -10653,7 +10653,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
if test "$ac_cv_search_ID3Tag_Link" = no; then
@@ -56,7 +19,7 @@
LIBS="-l$ac_lib $ac_func_search_save_LIBS"
cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure"
-@@ -11437,7 +11437,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -10770,7 +10770,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
Index: patches/patch-src_Makefile_in
===================================================================
RCS file: /cvs/ports/audio/grip/patches/patch-src_Makefile_in,v
retrieving revision 1.1
diff -u -r1.1 patch-src_Makefile_in
--- patches/patch-src_Makefile_in 26 Sep 2004 09:23:44 -0000 1.1
+++ patches/patch-src_Makefile_in 6 Jun 2005 12:23:44 -0000
@@ -1,12 +1,12 @@
-$OpenBSD: patch-src_Makefile_in,v 1.1 2004/09/26 09:23:44 sturm Exp $
---- src/Makefile.in.orig Sun Sep 26 10:18:54 2004
-+++ src/Makefile.in Sun Sep 26 10:19:26 2004
-@@ -184,7 +184,7 @@ CXXFLAGS = @CXXFLAGS@
- CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS)
$(AM_CXXFLAGS) $(CXXFLAGS)
- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(INCLUDES)
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+$OpenBSD$
+--- src/Makefile.in.orig Mon Jun 6 11:19:40 2005
++++ src/Makefile.in Mon Jun 6 11:20:23 2005
+@@ -199,7 +199,7 @@ LTCXXCOMPILE = $(LIBTOOL) --mode=compile
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS)
CXXLD = $(CXX)
--CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS)
$(LDFLAGS) -o $@
-+CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@
- COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS)
$(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES)
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
+-CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ CXXFLAGS = @CXXFLAGS@
+ DIST_SOURCES = $(grip_SOURCES)
Index: patches/patch-src_cddev_c
===================================================================
RCS file: /cvs/ports/audio/grip/patches/patch-src_cddev_c,v
retrieving revision 1.2
diff -u -r1.2 patch-src_cddev_c
--- patches/patch-src_cddev_c 26 Sep 2004 09:23:44 -0000 1.2
+++ patches/patch-src_cddev_c 6 Jun 2005 12:23:44 -0000
@@ -1,16 +1,16 @@
-$OpenBSD: patch-src_cddev_c,v 1.2 2004/09/26 09:23:44 sturm Exp $
---- src/cddev.c.orig Sat Jan 4 20:04:08 2003
-+++ src/cddev.c Sun Sep 26 10:06:26 2004
+$OpenBSD$
+--- src/cddev.c.orig Mon Jun 6 11:01:06 2005
++++ src/cddev.c Mon Jun 6 11:03:07 2005
@@ -52,7 +52,7 @@
#define NON_BLOCKING
#endif
--#if defined(__FreeBSD__)
-+#if defined(__FreeBSD__) || defined(__OpenBSD__)
+-#if defined(__FreeBSD__) || defined(__NetBSD__)
++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
#define CDIOREADSUBCHANNEL CDIOCREADSUBCHANNEL
#endif
-@@ -628,7 +628,10 @@ gboolean CDEject(DiscInfo *disc)
+@@ -638,7 +638,11 @@ gboolean CDEject(DiscInfo *disc)
if(ioctl(disc->cd_desc,CDROMEJECT)<0)
return FALSE;
#endif
@@ -19,6 +19,7 @@
+ close( disc->cd_desc );
+ disc->cd_desc = -1;
+#endif
++
return TRUE;
}
Index: patches/patch-src_cdpar_c
===================================================================
RCS file: /cvs/ports/audio/grip/patches/patch-src_cdpar_c,v
retrieving revision 1.1
diff -u -r1.1 patch-src_cdpar_c
--- patches/patch-src_cdpar_c 26 Sep 2004 09:23:44 -0000 1.1
+++ patches/patch-src_cdpar_c 6 Jun 2005 12:23:44 -0000
@@ -1,11 +1,11 @@
-$OpenBSD: patch-src_cdpar_c,v 1.1 2004/09/26 09:23:44 sturm Exp $
---- src/cdpar.c.orig Sun Sep 26 10:07:18 2004
-+++ src/cdpar.c Sun Sep 26 10:07:40 2004
-@@ -60,10 +60,12 @@ static inline int bigendianp(void){
+$OpenBSD$
+--- src/cdpar.c.orig Mon Jun 6 11:04:03 2005
++++ src/cdpar.c Mon Jun 6 11:03:51 2005
+@@ -56,10 +56,12 @@ static inline int bigendianp(void){
return(1);
}
-+#if !defined (__OpenBSD__)
++#if !defined(__OpenBSD__)
static inline size16 swap16(size16 x){
return((((unsigned size16)x & 0x00ffU) << 8) |
(((unsigned size16)x & 0xff00U) >> 8));
Index: patches/patch-src_discdb_c
===================================================================
RCS file: /cvs/ports/audio/grip/patches/patch-src_discdb_c,v
retrieving revision 1.1
diff -u -r1.1 patch-src_discdb_c
--- patches/patch-src_discdb_c 22 Mar 2005 15:02:45 -0000 1.1
+++ patches/patch-src_discdb_c 6 Jun 2005 12:23:44 -0000
@@ -1,21 +1,21 @@
-$OpenBSD: patch-src_discdb_c,v 1.1 2005/03/22 15:02:45 robert Exp $
---- src/discdb.c.orig Tue Mar 22 15:46:22 2005
-+++ src/discdb.c Tue Mar 22 15:48:14 2005
-@@ -274,7 +274,7 @@
+$OpenBSD$
+--- src/discdb.c.orig Mon Jun 6 11:58:57 2005
++++ src/discdb.c Mon Jun 6 11:59:56 2005
+@@ -311,7 +311,7 @@ gboolean DiscDBDoQuery(DiscInfo *disc,Di
query->query_match=MATCH_EXACT;
query->query_matches=0;
-- while((inbuffer=DiscDBReadLine(&result))) {
-+ while(query->query_matches < MAX_INEXACT_MATCHES &&
(inbuffer=DiscDBReadLine(&result))) {
+- while((inbuffer=DiscDBReadLine(&dataptr))) {
++ while(query->query_matches < MAX_INEXACT_MATCHES &&
(inbuffer=DiscDBReadLine(&dataptr))) {
query->query_list[query->query_matches].list_genre=
DiscDBGenreValue(g_strstrip(strtok(inbuffer," ")));
-@@ -294,7 +294,7 @@
+@@ -331,7 +331,7 @@ gboolean DiscDBDoQuery(DiscInfo *disc,Di
query->query_match=MATCH_INEXACT;
query->query_matches=0;
-- while((inbuffer=DiscDBReadLine(&result))) {
-+ while(query->query_matches < MAX_INEXACT_MATCHES &&
(inbuffer=DiscDBReadLine(&result))) {
+- while((inbuffer=DiscDBReadLine(&dataptr))) {
++ while(query->query_matches < MAX_INEXACT_MATCHES &&
(inbuffer=DiscDBReadLine(&dataptr))) {
query->query_list[query->query_matches].list_genre=
DiscDBGenreValue(g_strstrip(strtok(inbuffer," ")));
Index: patches/patch-src_grip_c
===================================================================
RCS file: /cvs/ports/audio/grip/patches/patch-src_grip_c,v
retrieving revision 1.3
diff -u -r1.3 patch-src_grip_c
--- patches/patch-src_grip_c 26 Sep 2004 10:30:45 -0000 1.3
+++ patches/patch-src_grip_c 6 Jun 2005 12:23:44 -0000
@@ -1,9 +1,9 @@
-$OpenBSD: patch-src_grip_c,v 1.3 2004/09/26 10:30:45 sturm Exp $
---- src/grip.c.orig Sun Sep 26 10:37:27 2004
-+++ src/grip.c Sun Sep 26 10:37:36 2004
-@@ -599,7 +599,7 @@ static void DoLoadConfig(GripInfo *ginfo
+$OpenBSD$
+--- src/grip.c.orig Mon Jun 6 11:06:42 2005
++++ src/grip.c Mon Jun 6 11:07:30 2005
+@@ -732,7 +732,7 @@ static void DoLoadConfig(GripInfo *ginfo
- uinfo->id3_genre_item_list=NULL;
+ *ginfo->version='\0';
- strcpy(ginfo->cd_device,"/dev/cdrom");
+ strcpy(ginfo->cd_device,"/dev/cd0c");
Index: patches/patch-src_grip_h
===================================================================
RCS file: /cvs/ports/audio/grip/patches/patch-src_grip_h,v
retrieving revision 1.1
diff -u -r1.1 patch-src_grip_h
--- patches/patch-src_grip_h 7 May 2002 21:05:33 -0000 1.1
+++ patches/patch-src_grip_h 6 Jun 2005 12:23:44 -0000
@@ -1,12 +1,12 @@
-$OpenBSD: patch-src_grip_h,v 1.1 2002/05/07 21:05:33 lebel Exp $
---- src/grip.h.orig Fri Feb 15 11:34:01 2002
-+++ src/grip.h Thu Feb 21 12:07:40 2002
-@@ -42,7 +42,7 @@
+$OpenBSD$
+--- src/grip.h.orig Mon Jun 6 11:07:53 2005
++++ src/grip.h Mon Jun 6 11:08:25 2005
+@@ -48,7 +48,7 @@
#define RRand(range) (random()%(range))
--#if defined(__linux__) || defined(__FreeBSD__) || defined(__osf__) /*
__osf__ ?? */
-+#if defined(__linux__) || defined(__OpenBSD__) || defined(__osf__) /*
__osf__ ?? */
+-#if defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__) ||
defined(__osf__) /* __osf__ ?? */
++#if defined(__linux__) || defined(__OpenBSD__) || defined(__NetBSD__) ||
defined(__osf__) /* __osf__ ?? */
#define MAILER "/usr/sbin/sendmail -i -t"
Index: patches/patch-src_rip_c
===================================================================
RCS file: /cvs/ports/audio/grip/patches/patch-src_rip_c,v
retrieving revision 1.3
diff -u -r1.3 patch-src_rip_c
--- patches/patch-src_rip_c 26 Sep 2004 09:23:44 -0000 1.3
+++ patches/patch-src_rip_c 6 Jun 2005 12:23:44 -0000
@@ -1,16 +1,16 @@
-$OpenBSD: patch-src_rip_c,v 1.3 2004/09/26 09:23:44 sturm Exp $
---- src/rip.c.orig Sun Jan 12 00:00:00 2003
-+++ src/rip.c Sun Sep 26 10:06:26 2004
+$OpenBSD$
+--- src/rip.c.orig Mon Jun 6 11:08:44 2005
++++ src/rip.c Mon Jun 6 11:09:34 2005
@@ -27,7 +27,7 @@
#elif defined (HAVE_SYS_VFS_H)
#include <sys/vfs.h>
#endif
--#if defined(__FreeBSD__)
-+#if defined(__OpenBSD__)
+-#if defined(__FreeBSD__) || defined(__NetBSD__)
++#if defined(__OpenBSD__) || defined(__NetBSD__)
#include <sys/param.h>
#include <sys/mount.h>
#endif
-@@ -385,7 +385,7 @@ static void AddSQLEntry(GripInfo *ginfo,
+@@ -393,7 +393,7 @@ static void AddSQLEntry(GripInfo *ginfo,
"-t",enc_track->song_name,"-d",enc_track->disc_name,
"-g",ID3GenreString(enc_track->id3_genre),"-y",year_str,
"-n",track_str,
@@ -19,7 +19,7 @@
else
execlp("mp3insert","mp3insert",
"-p",enc_track->mp3_filename,
-@@ -393,7 +393,7 @@ static void AddSQLEntry(GripInfo *ginfo,
+@@ -401,7 +401,7 @@ static void AddSQLEntry(GripInfo *ginfo,
"-t",enc_track->song_name,"-d",enc_track->disc_name,
"-g",ID3GenreString(enc_track->id3_genre),"-y",year_str,
"-n",track_str,
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/audio/grip/pkg/PLIST,v
retrieving revision 1.7
diff -u -r1.7 PLIST
--- pkg/PLIST 22 Mar 2005 15:02:45 -0000 1.7
+++ pkg/PLIST 6 Jun 2005 12:23:44 -0000
@@ -1,44 +1,26 @@
@comment $OpenBSD: PLIST,v 1.7 2005/03/22 15:02:45 robert Exp $
bin/grip
+share/applications/grip.desktop
share/gnome/
-share/gnome/apps/
-share/gnome/apps/Multimedia/
-share/gnome/apps/Multimedia/grip.desktop
share/gnome/help/
share/gnome/help/grip/
share/gnome/help/grip/C/
-share/gnome/help/grip/C/acknowledge.html
-share/gnome/help/grip/C/bugs.html
share/gnome/help/grip/C/cdconfig.png
-share/gnome/help/grip/C/cddb.html
-share/gnome/help/grip/C/cdplayer.html
share/gnome/help/grip/C/cdplayer.png
share/gnome/help/grip/C/cdplayersmall.png
share/gnome/help/grip/C/cdscan.png
-share/gnome/help/grip/C/configure.html
share/gnome/help/grip/C/discdb.png
-share/gnome/help/grip/C/discdbconfig.html
share/gnome/help/grip/C/discdbconfig.png
share/gnome/help/grip/C/editing.png
share/gnome/help/grip/C/eject.png
share/gnome/help/grip/C/encprog.png
-share/gnome/help/grip/C/faq.html
share/gnome/help/grip/C/ffwd.png
share/gnome/help/grip/C/grip-logo.png
-share/gnome/help/grip/C/grip.html
-share/gnome/help/grip/C/gripswitches.html
-share/gnome/help/grip/C/id3config.html
+share/gnome/help/grip/C/grip.xml
share/gnome/help/grip/C/id3config.png
-share/gnome/help/grip/C/images/
-share/gnome/help/grip/C/intro.html
-share/gnome/help/grip/C/license.html
-share/gnome/help/grip/C/ln14.html
share/gnome/help/grip/C/minmax.png
-share/gnome/help/grip/C/miscconfig.html
share/gnome/help/grip/C/miscconfig.png
share/gnome/help/grip/C/modeinterface.png
-share/gnome/help/grip/C/morehelp.html
-share/gnome/help/grip/C/mp3config.html
share/gnome/help/grip/C/mp3config.png
share/gnome/help/grip/C/mp3config2.png
share/gnome/help/grip/C/multiartist.png
@@ -51,21 +33,15 @@
share/gnome/help/grip/C/playrandom.png
share/gnome/help/grip/C/prevtrk.png
share/gnome/help/grip/C/progtrack.png
-share/gnome/help/grip/C/proxyconfig.html
share/gnome/help/grip/C/proxyconfig.png
share/gnome/help/grip/C/quit.png
share/gnome/help/grip/C/rewind.png
-share/gnome/help/grip/C/rip-perform.html
-share/gnome/help/grip/C/ripconfig.html
share/gnome/help/grip/C/ripconfig.png
share/gnome/help/grip/C/ripconfig2.png
share/gnome/help/grip/C/ripconfig3.png
-share/gnome/help/grip/C/ripping.html
share/gnome/help/grip/C/ripping.png
share/gnome/help/grip/C/ripprog.png
share/gnome/help/grip/C/ripsmall.png
-share/gnome/help/grip/C/sect-scsi.html
-share/gnome/help/grip/C/sect-trackmode.html
share/gnome/help/grip/C/smile1.png
share/gnome/help/grip/C/smile2.png
share/gnome/help/grip/C/smile3.png
@@ -75,40 +51,22 @@
share/gnome/help/grip/C/smile7.png
share/gnome/help/grip/C/smile8.png
share/gnome/help/grip/C/stop.png
-share/gnome/help/grip/C/topic.dat
share/gnome/help/grip/C/trkedit.png
share/gnome/help/grip/C/volume.png
-share/gnome/help/grip/C/x135.html
-share/locale/
-share/locale/ca/
-share/locale/ca/LC_MESSAGES/
-share/locale/ca/LC_MESSAGES/grip.mo
-share/locale/de/
-share/locale/de/LC_MESSAGES/
-share/locale/de/LC_MESSAGES/grip.mo
-share/locale/es/
-share/locale/es/LC_MESSAGES/
-share/locale/es/LC_MESSAGES/grip.mo
-share/locale/fr/
-share/locale/fr/LC_MESSAGES/
-share/locale/fr/LC_MESSAGES/grip.mo
-share/locale/ja/
-share/locale/ja/LC_MESSAGES/
-share/locale/ja/LC_MESSAGES/grip.mo
-share/locale/pt_BR/
-share/locale/pt_BR/LC_MESSAGES/
-share/locale/pt_BR/LC_MESSAGES/grip.mo
-share/locale/ru/
-share/locale/ru/LC_MESSAGES/
-share/locale/ru/LC_MESSAGES/grip.mo
-share/locale/zh_CN/
-share/locale/zh_CN/LC_MESSAGES/
-share/locale/zh_CN/LC_MESSAGES/grip.mo
+share/locale/be/LC_MESSAGES/grip-2.2.mo
+share/locale/bg/LC_MESSAGES/grip-2.2.mo
+share/locale/ca/LC_MESSAGES/grip-2.2.mo
+share/locale/de/LC_MESSAGES/grip-2.2.mo
+share/locale/es/LC_MESSAGES/grip-2.2.mo
+share/locale/fi/LC_MESSAGES/grip-2.2.mo
+share/locale/fr/LC_MESSAGES/grip-2.2.mo
+share/locale/it/LC_MESSAGES/grip-2.2.mo
+share/locale/ja/LC_MESSAGES/grip-2.2.mo
+share/locale/pt_BR/LC_MESSAGES/grip-2.2.mo
+share/locale/ru/LC_MESSAGES/grip-2.2.mo
+share/locale/zh_CN/LC_MESSAGES/grip-2.2.mo
share/locale/zh_HK/
share/locale/zh_HK/LC_MESSAGES/
-share/locale/zh_HK/LC_MESSAGES/grip.mo
-share/locale/zh_TW/
-share/locale/zh_TW/LC_MESSAGES/
-share/locale/zh_TW/LC_MESSAGES/grip.mo
-share/pixmaps/
+share/locale/zh_HK/LC_MESSAGES/grip-2.2.mo
+share/locale/zh_TW/LC_MESSAGES/grip-2.2.mo
share/pixmaps/gripicon.png
