head	1.2;
access;
symbols
	OPENPKG_E1_MP_HEAD:1.1
	OPENPKG_E1_MP:1.1
	OPENPKG_E1_MP_2_STABLE:1.1.2.2
	OPENPKG_E1_FP:1.1.2.2
	OPENPKG_2_STABLE_MP:1.1
	OPENPKG_2_STABLE_20061018:1.1.2.2
	OPENPKG_2_STABLE:1.1.0.2;
locks; strict;
comment	@# @;


1.2
date	2007.03.15.10.15.15;	author rse;	state Exp;
branches;
next	1.1;
commitid	9fBgX7QZ8HCxFaas;

1.1
date	2006.01.13.07.49.57;	author rse;	state Exp;
branches
	1.1.2.1;
next	;
commitid	VrpGmP9ALNmFyphr;

1.1.2.1
date	2006.01.13.07.49.57;	author rse;	state dead;
branches;
next	1.1.2.2;
commitid	iZxwRSmmWscPXUQr;

1.1.2.2
date	2006.10.16.14.51.05;	author rse;	state Exp;
branches;
next	;
commitid	iZxwRSmmWscPXUQr;


desc
@@


1.2
log
@upgrading package: httrack 3.40.3 -> 3.41.20
@
text
@Index: configure
--- configure.orig	2007-02-03 14:35:55 +0100
+++ configure	2007-03-15 11:11:59 +0100
@@@@ -19031,9 +19031,7 @@@@
 
 ### Default CFLAGS
 DEFAULT_CFLAGS=""
-DEFAULT_CFLAGS="-O -g3 -Wall -Wcast-align -Wstrict-prototypes \
--Wmissing-prototypes -Wmissing-declarations -Wpointer-arith \
--Wnested-externs -D_REENTRANT"
+DEFAULT_CFLAGS="-D_REENTRANT"
 
 
 
Index: html/Makefile.in
--- html/Makefile.in.orig	2007-02-03 14:35:48 +0100
+++ html/Makefile.in	2007-03-15 11:12:36 +0100
@@@@ -150,9 +150,9 @@@@
 WebHtmldir = $(datadir)/doc/httrack/html/server
 WebHtmlimagesdir = $(datadir)/doc/httrack/html/server/images
 WebHtmlsfxdir = $(datadir)/doc/httrack/html/server/sfx
-WebPixmapdir = $(datadir)/pixmaps
+WebPixmapdir = $(datadir)/httrack/pixmaps
 WebGPixmapdir = $(datadir)/httrack/icons
-VFolderEntrydir = $(prefix)/share/applications
+VFolderEntrydir = $(prefix)/share/httrack/applications
 
 HelpHtmlroot_DATA = ../httrack-doc.html ../history.txt
 HelpHtml_DATA = *.html
@


1.1
log
@some packaging cleanups (mostly cosmetics)
@
text
@d2 3
a4 3
--- configure.orig	2005-06-04 14:17:32 +0200
+++ configure	2006-01-13 08:41:50 +0100
@@@@ -8440,9 +8440,7 @@@@
d16 6
a21 15
--- html/Makefile.in.orig	2005-06-04 14:17:28 +0200
+++ html/Makefile.in	2006-01-13 08:43:55 +0100
@@@@ -134,18 +134,18 @@@@
 sysconfdir = @@sysconfdir@@
 target_alias = @@target_alias@@
 
-HelpHtmlrootdir = $(datadir)/doc/httrack
-HelpHtmldir = $(datadir)/doc/httrack/html
-HelpHtmlimgdir = $(datadir)/doc/httrack/html/img
-HelpHtmldivdir = $(datadir)/doc/httrack/html/div
-HelpHtmlimagesdir = $(datadir)/doc/httrack/html/images
-HelpHtmlTxtdir = $(datadir)/doc/httrack/html
-WebHtmldir = $(datadir)/doc/httrack/html/server
-WebHtmlimagesdir = $(datadir)/doc/httrack/html/server/images
-WebHtmlsfxdir = $(datadir)/doc/httrack/html/server/sfx
a22 9
+HelpHtmlrootdir = $(datadir)/httrack/doc
+HelpHtmldir = $(datadir)/httrack/doc/html
+HelpHtmlimgdir = $(datadir)/httrack/doc/html/img
+HelpHtmldivdir = $(datadir)/httrack/doc/html/div
+HelpHtmlimagesdir = $(datadir)/httrack/doc/html/images
+HelpHtmlTxtdir = $(datadir)/httrack/doc/html
+WebHtmldir = $(datadir)/httrack/doc/html/server
+WebHtmlimagesdir = $(datadir)/httrack/doc/html/server/images
+WebHtmlsfxdir = $(datadir)/httrack/doc/html/server/sfx
d26 1
a26 1
+VFolderEntrydir = $(datadir)/httrack/desktop
@


1.1.2.1
log
@file httrack.patch was added on branch OPENPKG_2_STABLE on 2006-10-16 14:51:05 +0000
@
text
@d1 47
@


1.1.2.2
log
@Mass merge from CURRENT to 2-STABLE (all packages except those of JUNK class)
@
text
@a0 47
Index: configure
--- configure.orig	2005-06-04 14:17:32 +0200
+++ configure	2006-01-13 08:41:50 +0100
@@@@ -8440,9 +8440,7 @@@@
 
 ### Default CFLAGS
 DEFAULT_CFLAGS=""
-DEFAULT_CFLAGS="-O -g3 -Wall -Wcast-align -Wstrict-prototypes \
--Wmissing-prototypes -Wmissing-declarations -Wpointer-arith \
--Wnested-externs -D_REENTRANT"
+DEFAULT_CFLAGS="-D_REENTRANT"
 
 
 
Index: html/Makefile.in
--- html/Makefile.in.orig	2005-06-04 14:17:28 +0200
+++ html/Makefile.in	2006-01-13 08:43:55 +0100
@@@@ -134,18 +134,18 @@@@
 sysconfdir = @@sysconfdir@@
 target_alias = @@target_alias@@
 
-HelpHtmlrootdir = $(datadir)/doc/httrack
-HelpHtmldir = $(datadir)/doc/httrack/html
-HelpHtmlimgdir = $(datadir)/doc/httrack/html/img
-HelpHtmldivdir = $(datadir)/doc/httrack/html/div
-HelpHtmlimagesdir = $(datadir)/doc/httrack/html/images
-HelpHtmlTxtdir = $(datadir)/doc/httrack/html
-WebHtmldir = $(datadir)/doc/httrack/html/server
-WebHtmlimagesdir = $(datadir)/doc/httrack/html/server/images
-WebHtmlsfxdir = $(datadir)/doc/httrack/html/server/sfx
-WebPixmapdir = $(datadir)/pixmaps
+HelpHtmlrootdir = $(datadir)/httrack/doc
+HelpHtmldir = $(datadir)/httrack/doc/html
+HelpHtmlimgdir = $(datadir)/httrack/doc/html/img
+HelpHtmldivdir = $(datadir)/httrack/doc/html/div
+HelpHtmlimagesdir = $(datadir)/httrack/doc/html/images
+HelpHtmlTxtdir = $(datadir)/httrack/doc/html
+WebHtmldir = $(datadir)/httrack/doc/html/server
+WebHtmlimagesdir = $(datadir)/httrack/doc/html/server/images
+WebHtmlsfxdir = $(datadir)/httrack/doc/html/server/sfx
+WebPixmapdir = $(datadir)/httrack/pixmaps
 WebGPixmapdir = $(datadir)/httrack/icons
-VFolderEntrydir = $(prefix)/share/applications
+VFolderEntrydir = $(datadir)/httrack/desktop
 
 HelpHtmlroot_DATA = ../httrack-doc.html ../history.txt
 HelpHtml_DATA = *.html
@