tags 424321 + patch
thanks
Hi,
The following is the diff for my gfslicer 1.5.4-7.1 NMU.
reverted:
--- gfslicer-1.5.4/Makefile
+++ gfslicer-1.5.4.orig/Makefile
@@ -16,7 +16,7 @@
srcdir = .
top_srcdir = .
+prefix = /usr/local
-prefix = /usr
exec_prefix = ${prefix}
bindir = ${exec_prefix}/bin
@@ -27,8 +27,8 @@
sharedstatedir = ${prefix}/com
localstatedir = ${prefix}/var
libdir = ${exec_prefix}/lib
+infodir = ${prefix}/info
+mandir = ${prefix}/man
-infodir = ${prefix}/share/info
-mandir = ${prefix}/share/man
includedir = ${prefix}/include
oldincludedir = /usr/include
@@ -59,25 +59,25 @@
POST_UNINSTALL = :
CATALOGS =
CATOBJEXT = .gmo
+CC = gcc
-CC = ccache cc
DATADIRNAME = share
GENCAT =
GMOFILES =
GMSGFMT = /usr/bin/msgfmt
+GNOMEGNORBA_LIBS = -rdynamic -lgnorba -lORBitCosNaming -lORBit -lIIOP
-lORBitutil -lnsl -lgnomeui -lart_lgpl -lgdk_imlib -lSM -lICE -lgtk -lgdk
-lgmodule -lXext -lX11 -lgnome -lgnomesupport -lesd -laudiofile -lm -ldb1
-lglib -ldl
+GNOMEUI_LIBS = -rdynamic -lgnomeui -lart_lgpl -lgdk_imlib -lSM -lICE -lgtk
-lgdk -lgmodule -lXext -lX11 -lgnome -lgnomesupport -lesd -laudiofile -lm -ldb1
-lglib -ldl
-GNOMEGNORBA_LIBS = -rdynamic -lgnorba -lORBitCosNaming -lORBit -lIIOP
-lORBitutil -lgnomeui -lart_lgpl -lgdk_imlib -lSM -lICE -lgtk -lgdk -lgmodule
-ldl -lXi -lXext -lX11 -lgnome -lgnomesupport -lesd -laudiofile -lm -ldb-4
-lglib
-GNOMEUI_LIBS = -rdynamic -lgnomeui -lart_lgpl -lgdk_imlib -lSM -lICE -lgtk
-lgdk -lgmodule -ldl -lXi -lXext -lX11 -lgnome -lgnomesupport -lesd -laudiofile
-lm -ldb-4 -lglib
GNOME_APPLETS_LIBS =
GNOME_CAPPLET_LIBS =
GNOME_CONFIG = /usr/bin/gnome-config
+GNOME_INCLUDEDIR = -I/usr/include -DNEED_GNOMESUPPORT_H
-I/usr/lib/gnome-libs/include -I/usr/lib/glib/include -I/usr/X11R6/include
+GNOME_LIBDIR = -rdynamic -L/usr/lib -L/usr/X11R6/lib
+GNOME_LIBS = -lgnome -lgnomesupport -lesd -laudiofile -lm -ldb1 -lglib -ldl
+GNORBA_CFLAGS = -I/usr/include -DNEED_GNOMESUPPORT_H
-I/usr/lib/gnome-libs/include -I/usr/lib/glib/include -I/usr/X11R6/include
+GNORBA_LIBS = -rdynamic -L/usr/lib -L/usr/X11R6/lib -lgnorba -lORBitCosNaming
-lORBit -lIIOP -lORBitutil -lnsl -lgnomeui -lart_lgpl -lgdk_imlib -lSM -lICE
-lgtk -lgdk -lgmodule -lXext -lX11 -lgnome -lgnomesupport -lesd -laudiofile -lm
-ldb1 -lglib -ldl
+GTKXMHTML_LIBS = -rdynamic -lgtkxmhtml -lXpm -ljpeg -lpng -lz -lSM -lICE -lgtk
-lgdk -lgmodule -lglib -ldl -lXext -lX11 -lm
+GTK_CFLAGS = -I/usr/lib/glib/include -I/usr/X11R6/include
-GNOME_INCLUDEDIR = -I/usr/include/gnome-1.0 -DNEED_GNOMESUPPORT_H
-I/usr/lib/gnome-libs/include -I/usr/include/glib-1.2 -I/usr/lib/glib/include
-I/usr/include/orbit-1.0 -I/usr/include/gtk-1.2
-GNOME_LIBDIR = -rdynamic -L/usr/lib
-GNOME_LIBS = -lgnome -lgnomesupport -lesd -laudiofile -lm -ldb-4 -lglib
-GNORBA_CFLAGS = -I/usr/include/gnome-1.0 -DNEED_GNOMESUPPORT_H
-I/usr/lib/gnome-libs/include -I/usr/include/glib-1.2 -I/usr/lib/glib/include
-I/usr/include/orbit-1.0 -I/usr/include/gtk-1.2
-GNORBA_LIBS = -rdynamic -L/usr/lib -lgnorba -lORBitCosNaming -lORBit -lIIOP
-lORBitutil -lgnomeui -lart_lgpl -lgdk_imlib -lSM -lICE -lgtk -lgdk -lgmodule
-ldl -lXi -lXext -lX11 -lgnome -lgnomesupport -lesd -laudiofile -lm -ldb-4
-lglib
-GTKXMHTML_LIBS =
-GTK_CFLAGS = -I/usr/include/gtk-1.2 -I/usr/include/glib-1.2
-I/usr/lib/glib/include
GTK_CONFIG = /usr/bin/gtk-config
+GTK_LIBS = -lSM -lICE -L/usr/lib -L/usr/X11R6/lib -lgtk -lgdk -rdynamic
-lgmodule -lglib -ldl -lXi -lXext -lX11 -lm
-GTK_LIBS = -lSM -lICE -L/usr/lib -lgtk -lgdk -rdynamic -lgmodule -lglib -ldl
-lXi -lXext -lX11 -lm
GT_NO =
GT_YES = #YES#
INCLUDE_LOCALE_H = #include <locale.h>
@@ -88,10 +88,10 @@
MAKEINFO = makeinfo
MKINSTALLDIRS = ./mkinstalldirs
MSGFMT = /usr/bin/msgfmt
+ORBIT_CFLAGS = -I/usr/lib/glib/include -I/usr/include
-ORBIT_CFLAGS = -I/usr/include/glib-1.2 -I/usr/lib/glib/include
-I/usr/include/orbit-1.0
ORBIT_CONFIG = /usr/bin/orbit-config
ORBIT_IDL = /usr/bin/orbit-idl
+ORBIT_LIBS = -L/usr/lib -lORBitCosNaming -lORBit -lIIOP -lORBitutil -lglib
-lnsl -lm
-ORBIT_LIBS = -L/usr/lib -lORBitCosNaming -lORBit -lIIOP -lORBitutil -lglib -lm
PACKAGE = gfslicer
PACKAGE_PIXMAPS_DIR = /usr/share/pixmaps/gfslicer
POFILES =
@@ -100,9 +100,9 @@
RANLIB = ranlib
USE_INCLUDED_LIBINTL = no
USE_NLS = yes
+VERSION = 0.1
-VERSION = 1.5.4
XPM_LIBS = -lXpm
+ZVT_LIBS = -rdynamic -lzvt -lutil -lSM -lICE -lgtk -lgdk -lgmodule -lglib -ldl
-lXext -lX11 -lm
-ZVT_LIBS =
cflags_set = yes
cxxflags_set = @cxxflags_set@
l =
reverted:
--- gfslicer-1.5.4/config.h
+++ gfslicer-1.5.4.orig/config.h
@@ -50,7 +50,7 @@
#define HAVE_LC_MESSAGES 1
#define HAVE_STPCPY 1
#define HAVE_LIBSM 1
+#define PACKAGE_LOCALE_DIR "/usr/local/share/locale"
-#define PACKAGE_LOCALE_DIR "/usr/share/locale"
/* #undef PACKAGE_DATA_DIR */
/* #undef PACKAGE_SOURCE_DIR */
reverted:
--- gfslicer-1.5.4/macros/Makefile
+++ gfslicer-1.5.4.orig/macros/Makefile
@@ -16,7 +16,7 @@
srcdir = .
top_srcdir = ..
+prefix = /usr/local
-prefix = /usr
exec_prefix = ${prefix}
bindir = ${exec_prefix}/bin
@@ -27,8 +27,8 @@
sharedstatedir = ${prefix}/com
localstatedir = ${prefix}/var
libdir = ${exec_prefix}/lib
+infodir = ${prefix}/info
+mandir = ${prefix}/man
-infodir = ${prefix}/share/info
-mandir = ${prefix}/share/man
includedir = ${prefix}/include
oldincludedir = /usr/include
@@ -59,25 +59,25 @@
POST_UNINSTALL = :
CATALOGS =
CATOBJEXT = .gmo
+CC = gcc
-CC = ccache cc
DATADIRNAME = share
GENCAT =
GMOFILES =
GMSGFMT = /usr/bin/msgfmt
+GNOMEGNORBA_LIBS = -rdynamic -lgnorba -lORBitCosNaming -lORBit -lIIOP
-lORBitutil -lnsl -lgnomeui -lart_lgpl -lgdk_imlib -lSM -lICE -lgtk -lgdk
-lgmodule -lXext -lX11 -lgnome -lgnomesupport -lesd -laudiofile -lm -ldb1
-lglib -ldl
+GNOMEUI_LIBS = -rdynamic -lgnomeui -lart_lgpl -lgdk_imlib -lSM -lICE -lgtk
-lgdk -lgmodule -lXext -lX11 -lgnome -lgnomesupport -lesd -laudiofile -lm -ldb1
-lglib -ldl
-GNOMEGNORBA_LIBS = -rdynamic -lgnorba -lORBitCosNaming -lORBit -lIIOP
-lORBitutil -lgnomeui -lart_lgpl -lgdk_imlib -lSM -lICE -lgtk -lgdk -lgmodule
-ldl -lXi -lXext -lX11 -lgnome -lgnomesupport -lesd -laudiofile -lm -ldb-4
-lglib
-GNOMEUI_LIBS = -rdynamic -lgnomeui -lart_lgpl -lgdk_imlib -lSM -lICE -lgtk
-lgdk -lgmodule -ldl -lXi -lXext -lX11 -lgnome -lgnomesupport -lesd -laudiofile
-lm -ldb-4 -lglib
GNOME_APPLETS_LIBS =
GNOME_CAPPLET_LIBS =
GNOME_CONFIG = /usr/bin/gnome-config
+GNOME_INCLUDEDIR = -I/usr/include -DNEED_GNOMESUPPORT_H
-I/usr/lib/gnome-libs/include -I/usr/lib/glib/include -I/usr/X11R6/include
+GNOME_LIBDIR = -rdynamic -L/usr/lib -L/usr/X11R6/lib
+GNOME_LIBS = -lgnome -lgnomesupport -lesd -laudiofile -lm -ldb1 -lglib -ldl
+GNORBA_CFLAGS = -I/usr/include -DNEED_GNOMESUPPORT_H
-I/usr/lib/gnome-libs/include -I/usr/lib/glib/include -I/usr/X11R6/include
+GNORBA_LIBS = -rdynamic -L/usr/lib -L/usr/X11R6/lib -lgnorba -lORBitCosNaming
-lORBit -lIIOP -lORBitutil -lnsl -lgnomeui -lart_lgpl -lgdk_imlib -lSM -lICE
-lgtk -lgdk -lgmodule -lXext -lX11 -lgnome -lgnomesupport -lesd -laudiofile -lm
-ldb1 -lglib -ldl
+GTKXMHTML_LIBS = -rdynamic -lgtkxmhtml -lXpm -ljpeg -lpng -lz -lSM -lICE -lgtk
-lgdk -lgmodule -lglib -ldl -lXext -lX11 -lm
+GTK_CFLAGS = -I/usr/lib/glib/include -I/usr/X11R6/include
-GNOME_INCLUDEDIR = -I/usr/include/gnome-1.0 -DNEED_GNOMESUPPORT_H
-I/usr/lib/gnome-libs/include -I/usr/include/glib-1.2 -I/usr/lib/glib/include
-I/usr/include/orbit-1.0 -I/usr/include/gtk-1.2
-GNOME_LIBDIR = -rdynamic -L/usr/lib
-GNOME_LIBS = -lgnome -lgnomesupport -lesd -laudiofile -lm -ldb-4 -lglib
-GNORBA_CFLAGS = -I/usr/include/gnome-1.0 -DNEED_GNOMESUPPORT_H
-I/usr/lib/gnome-libs/include -I/usr/include/glib-1.2 -I/usr/lib/glib/include
-I/usr/include/orbit-1.0 -I/usr/include/gtk-1.2
-GNORBA_LIBS = -rdynamic -L/usr/lib -lgnorba -lORBitCosNaming -lORBit -lIIOP
-lORBitutil -lgnomeui -lart_lgpl -lgdk_imlib -lSM -lICE -lgtk -lgdk -lgmodule
-ldl -lXi -lXext -lX11 -lgnome -lgnomesupport -lesd -laudiofile -lm -ldb-4
-lglib
-GTKXMHTML_LIBS =
-GTK_CFLAGS = -I/usr/include/gtk-1.2 -I/usr/include/glib-1.2
-I/usr/lib/glib/include
GTK_CONFIG = /usr/bin/gtk-config
+GTK_LIBS = -lSM -lICE -L/usr/lib -L/usr/X11R6/lib -lgtk -lgdk -rdynamic
-lgmodule -lglib -ldl -lXi -lXext -lX11 -lm
-GTK_LIBS = -lSM -lICE -L/usr/lib -lgtk -lgdk -rdynamic -lgmodule -lglib -ldl
-lXi -lXext -lX11 -lm
GT_NO =
GT_YES = #YES#
INCLUDE_LOCALE_H = #include <locale.h>
@@ -88,10 +88,10 @@
MAKEINFO = makeinfo
MKINSTALLDIRS = ./mkinstalldirs
MSGFMT = /usr/bin/msgfmt
+ORBIT_CFLAGS = -I/usr/lib/glib/include -I/usr/include
-ORBIT_CFLAGS = -I/usr/include/glib-1.2 -I/usr/lib/glib/include
-I/usr/include/orbit-1.0
ORBIT_CONFIG = /usr/bin/orbit-config
ORBIT_IDL = /usr/bin/orbit-idl
+ORBIT_LIBS = -L/usr/lib -lORBitCosNaming -lORBit -lIIOP -lORBitutil -lglib
-lnsl -lm
-ORBIT_LIBS = -L/usr/lib -lORBitCosNaming -lORBit -lIIOP -lORBitutil -lglib -lm
PACKAGE = gfslicer
PACKAGE_PIXMAPS_DIR = /usr/share/pixmaps/gfslicer
POFILES =
@@ -100,9 +100,9 @@
RANLIB = ranlib
USE_INCLUDED_LIBINTL = no
USE_NLS = yes
+VERSION = 0.1
-VERSION = 1.5.4
XPM_LIBS = -lXpm
+ZVT_LIBS = -rdynamic -lzvt -lutil -lSM -lICE -lgtk -lgdk -lgmodule -lglib -ldl
-lXext -lX11 -lm
-ZVT_LIBS =
cflags_set = yes
cxxflags_set = @cxxflags_set@
l =
reverted:
--- gfslicer-1.5.4/intl/Makefile
+++ gfslicer-1.5.4.orig/intl/Makefile
@@ -17,7 +17,7 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
PACKAGE = gfslicer
+VERSION = 0.1
-VERSION = 1.5.4
SHELL = /bin/sh
@@ -25,7 +25,7 @@
top_srcdir = ..
top_builddir = ..
+prefix = /usr/local
-prefix = /usr
exec_prefix = ${prefix}
transform = s,x,x,
libdir = $(exec_prefix)/lib
@@ -44,14 +44,14 @@
l =
AR = ar
+CC = gcc
-CC = ccache cc
LIBTOOL = @LIBTOOL@
RANLIB = ranlib
DEFS = -DLOCALEDIR=\"$(localedir)\" -DGNULOCALEDIR=\"$(gnulocaledir)\" \
-DLOCALE_ALIAS_PATH=\"$(aliaspath)\" -DHAVE_CONFIG_H
+CPPFLAGS = -I/usr/lib/glib/include -I/usr/X11R6/include
+CFLAGS = -g -O2 -Wall -Wunused -Wmissing-prototypes -Wmissing-declarations
-CPPFLAGS = -I/usr/include/gtk-1.2 -I/usr/include/glib-1.2
-I/usr/lib/glib/include
-CFLAGS = -g -O2 -Wall -Wunused
LDFLAGS =
COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS)
reverted:
--- gfslicer-1.5.4/src/Makefile
+++ gfslicer-1.5.4.orig/src/Makefile
@@ -16,7 +16,7 @@
srcdir = .
top_srcdir = ..
+prefix = /usr/local
-prefix = /usr
exec_prefix = ${prefix}
bindir = ${exec_prefix}/bin
@@ -27,8 +27,8 @@
sharedstatedir = ${prefix}/com
localstatedir = ${prefix}/var
libdir = ${exec_prefix}/lib
+infodir = ${prefix}/info
+mandir = ${prefix}/man
-infodir = ${prefix}/share/info
-mandir = ${prefix}/share/man
includedir = ${prefix}/include
oldincludedir = /usr/include
@@ -59,25 +59,25 @@
POST_UNINSTALL = :
CATALOGS =
CATOBJEXT = .gmo
+CC = gcc
-CC = ccache cc
DATADIRNAME = share
GENCAT =
GMOFILES =
GMSGFMT = /usr/bin/msgfmt
+GNOMEGNORBA_LIBS = -rdynamic -lgnorba -lORBitCosNaming -lORBit -lIIOP
-lORBitutil -lnsl -lgnomeui -lart_lgpl -lgdk_imlib -lSM -lICE -lgtk -lgdk
-lgmodule -lXext -lX11 -lgnome -lgnomesupport -lesd -laudiofile -lm -ldb1
-lglib -ldl
+GNOMEUI_LIBS = -rdynamic -lgnomeui -lart_lgpl -lgdk_imlib -lSM -lICE -lgtk
-lgdk -lgmodule -lXext -lX11 -lgnome -lgnomesupport -lesd -laudiofile -lm -ldb1
-lglib -ldl
-GNOMEGNORBA_LIBS = -rdynamic -lgnorba -lORBitCosNaming -lORBit -lIIOP
-lORBitutil -lgnomeui -lart_lgpl -lgdk_imlib -lSM -lICE -lgtk -lgdk -lgmodule
-ldl -lXi -lXext -lX11 -lgnome -lgnomesupport -lesd -laudiofile -lm -ldb-4
-lglib
-GNOMEUI_LIBS = -rdynamic -lgnomeui -lart_lgpl -lgdk_imlib -lSM -lICE -lgtk
-lgdk -lgmodule -ldl -lXi -lXext -lX11 -lgnome -lgnomesupport -lesd -laudiofile
-lm -ldb-4 -lglib
GNOME_APPLETS_LIBS =
GNOME_CAPPLET_LIBS =
GNOME_CONFIG = /usr/bin/gnome-config
+GNOME_INCLUDEDIR = -I/usr/include -DNEED_GNOMESUPPORT_H
-I/usr/lib/gnome-libs/include -I/usr/lib/glib/include -I/usr/X11R6/include
+GNOME_LIBDIR = -rdynamic -L/usr/lib -L/usr/X11R6/lib
+GNOME_LIBS = -lgnome -lgnomesupport -lesd -laudiofile -lm -ldb1 -lglib -ldl
+GNORBA_CFLAGS = -I/usr/include -DNEED_GNOMESUPPORT_H
-I/usr/lib/gnome-libs/include -I/usr/lib/glib/include -I/usr/X11R6/include
+GNORBA_LIBS = -rdynamic -L/usr/lib -L/usr/X11R6/lib -lgnorba -lORBitCosNaming
-lORBit -lIIOP -lORBitutil -lnsl -lgnomeui -lart_lgpl -lgdk_imlib -lSM -lICE
-lgtk -lgdk -lgmodule -lXext -lX11 -lgnome -lgnomesupport -lesd -laudiofile -lm
-ldb1 -lglib -ldl
+GTKXMHTML_LIBS = -rdynamic -lgtkxmhtml -lXpm -ljpeg -lpng -lz -lSM -lICE -lgtk
-lgdk -lgmodule -lglib -ldl -lXext -lX11 -lm
+GTK_CFLAGS = -I/usr/lib/glib/include -I/usr/X11R6/include
-GNOME_INCLUDEDIR = -I/usr/include/gnome-1.0 -DNEED_GNOMESUPPORT_H
-I/usr/lib/gnome-libs/include -I/usr/include/glib-1.2 -I/usr/lib/glib/include
-I/usr/include/orbit-1.0 -I/usr/include/gtk-1.2
-GNOME_LIBDIR = -rdynamic -L/usr/lib
-GNOME_LIBS = -lgnome -lgnomesupport -lesd -laudiofile -lm -ldb-4 -lglib
-GNORBA_CFLAGS = -I/usr/include/gnome-1.0 -DNEED_GNOMESUPPORT_H
-I/usr/lib/gnome-libs/include -I/usr/include/glib-1.2 -I/usr/lib/glib/include
-I/usr/include/orbit-1.0 -I/usr/include/gtk-1.2
-GNORBA_LIBS = -rdynamic -L/usr/lib -lgnorba -lORBitCosNaming -lORBit -lIIOP
-lORBitutil -lgnomeui -lart_lgpl -lgdk_imlib -lSM -lICE -lgtk -lgdk -lgmodule
-ldl -lXi -lXext -lX11 -lgnome -lgnomesupport -lesd -laudiofile -lm -ldb-4
-lglib
-GTKXMHTML_LIBS =
-GTK_CFLAGS = -I/usr/include/gtk-1.2 -I/usr/include/glib-1.2
-I/usr/lib/glib/include
GTK_CONFIG = /usr/bin/gtk-config
+GTK_LIBS = -lSM -lICE -L/usr/lib -L/usr/X11R6/lib -lgtk -lgdk -rdynamic
-lgmodule -lglib -ldl -lXi -lXext -lX11 -lm
-GTK_LIBS = -lSM -lICE -L/usr/lib -lgtk -lgdk -rdynamic -lgmodule -lglib -ldl
-lXi -lXext -lX11 -lm
GT_NO =
GT_YES = #YES#
INCLUDE_LOCALE_H = #include <locale.h>
@@ -88,10 +88,10 @@
MAKEINFO = makeinfo
MKINSTALLDIRS = ./mkinstalldirs
MSGFMT = /usr/bin/msgfmt
+ORBIT_CFLAGS = -I/usr/lib/glib/include -I/usr/include
-ORBIT_CFLAGS = -I/usr/include/glib-1.2 -I/usr/lib/glib/include
-I/usr/include/orbit-1.0
ORBIT_CONFIG = /usr/bin/orbit-config
ORBIT_IDL = /usr/bin/orbit-idl
+ORBIT_LIBS = -L/usr/lib -lORBitCosNaming -lORBit -lIIOP -lORBitutil -lglib
-lnsl -lm
-ORBIT_LIBS = -L/usr/lib -lORBitCosNaming -lORBit -lIIOP -lORBitutil -lglib -lm
PACKAGE = gfslicer
PACKAGE_PIXMAPS_DIR = /usr/share/pixmaps/gfslicer
POFILES =
@@ -100,9 +100,9 @@
RANLIB = ranlib
USE_INCLUDED_LIBINTL = no
USE_NLS = yes
+VERSION = 0.1
-VERSION = 1.5.4
XPM_LIBS = -lXpm
+ZVT_LIBS = -rdynamic -lzvt -lutil -lSM -lICE -lgtk -lgdk -lgmodule -lglib -ldl
-lXext -lX11 -lm
-ZVT_LIBS =
cflags_set = yes
cxxflags_set = @cxxflags_set@
l =
@@ -123,13 +123,13 @@
DEFS = -DHAVE_CONFIG_H -I. -I$(srcdir) -I..
+CPPFLAGS = -I/usr/lib/glib/include -I/usr/X11R6/include
-CPPFLAGS = -I/usr/include/gtk-1.2 -I/usr/include/glib-1.2
-I/usr/lib/glib/include
LDFLAGS =
LIBS =
gfslicer_OBJECTS = main.o gfs_defs.o gfs_conf.o support.o interface.o
callbacks.o gfs_func.o gfs_dnd.o
gfslicer_DEPENDENCIES =
gfslicer_LDFLAGS =
+CFLAGS = -g -O2 -Wall -Wunused -Wmissing-prototypes -Wmissing-declarations
-CFLAGS = -g -O2 -Wall -Wunused
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS)
$(CFLAGS)
CCLD = $(CC)
LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
reverted:
--- gfslicer-1.5.4/po/Makefile.in
+++ gfslicer-1.5.4.orig/po/Makefile.in
@@ -8,7 +8,7 @@
# Please note that the actual code is *not* freely available.
PACKAGE = gfslicer
+VERSION = 0.1
-VERSION = 1.5.4
SHELL = /bin/sh
@@ -16,7 +16,7 @@
srcdir = .
top_srcdir = ..
+prefix = /usr/local
-prefix = /usr
exec_prefix = ${prefix}
datadir = $(prefix)/share
localedir = $(datadir)/locale
@@ -28,7 +28,7 @@
INSTALL_DATA = ${INSTALL} -m 644
MKINSTALLDIRS = $(top_srcdir)/./mkinstalldirs
+CC = gcc
-CC = ccache cc
GENCAT =
GMSGFMT = PATH=../src:$$PATH /usr/bin/msgfmt
MSGFMT = /usr/bin/msgfmt
@@ -36,8 +36,8 @@
MSGMERGE = PATH=../src:$$PATH msgmerge
DEFS = -DHAVE_CONFIG_H
+CFLAGS = -g -O2 -Wall -Wunused -Wmissing-prototypes -Wmissing-declarations
+CPPFLAGS = -I/usr/lib/glib/include -I/usr/X11R6/include
-CFLAGS = -g -O2 -Wall -Wunused
-CPPFLAGS = -I/usr/include/gtk-1.2 -I/usr/include/glib-1.2
-I/usr/lib/glib/include
INCLUDES = -I.. -I$(top_srcdir)/intl
reverted:
--- gfslicer-1.5.4/po/Makefile
+++ gfslicer-1.5.4.orig/po/Makefile
@@ -8,7 +8,7 @@
# Please note that the actual code is *not* freely available.
PACKAGE = gfslicer
+VERSION = 0.1
-VERSION = 1.5.4
SHELL = /bin/sh
@@ -16,7 +16,7 @@
srcdir = .
top_srcdir = ..
+prefix = /usr/local
-prefix = /usr
exec_prefix = ${prefix}
datadir = $(prefix)/share
localedir = $(datadir)/locale
@@ -28,7 +28,7 @@
INSTALL_DATA = ${INSTALL} -m 644
MKINSTALLDIRS = $(top_srcdir)/./mkinstalldirs
+CC = gcc
-CC = ccache cc
GENCAT =
GMSGFMT = PATH=../src:$$PATH /usr/bin/msgfmt
MSGFMT = /usr/bin/msgfmt
@@ -36,8 +36,8 @@
MSGMERGE = PATH=../src:$$PATH msgmerge
DEFS = -DHAVE_CONFIG_H
+CFLAGS = -g -O2 -Wall -Wunused -Wmissing-prototypes -Wmissing-declarations
+CPPFLAGS = -I/usr/lib/glib/include -I/usr/X11R6/include
-CFLAGS = -g -O2 -Wall -Wunused
-CPPFLAGS = -I/usr/include/gtk-1.2 -I/usr/include/glib-1.2
-I/usr/lib/glib/include
INCLUDES = -I.. -I$(top_srcdir)/intl
diff -u gfslicer-1.5.4/debian/changelog gfslicer-1.5.4/debian/changelog
--- gfslicer-1.5.4/debian/changelog
+++ gfslicer-1.5.4/debian/changelog
@@ -1,3 +1,11 @@
+gfslicer (1.5.4-7.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Fix clean target to fix FTBFS if built twice in a row (closes: #424321)
+ * Don't ignore errors in make distclean, per lintian
+
+ -- Peter Eisentraut <[EMAIL PROTECTED]> Thu, 08 May 2008 12:08:57 +0200
+
gfslicer (1.5.4-7) unstable; urgency=low
* Add Swedish PO translation (Closes: #385302).
diff -u gfslicer-1.5.4/debian/rules gfslicer-1.5.4/debian/rules
--- gfslicer-1.5.4/debian/rules
+++ gfslicer-1.5.4/debian/rules
@@ -28,10 +28,10 @@
clean:
dh_testdir
dh_testroot
- rm -f build-stamp configure-stamp config.cache config.status config.log
+ rm -f build-stamp configure-stamp
# Add here commands to clean up after the build process.
- -$(MAKE) distclean
+ [ ! -f Makefile ] || $(MAKE) distclean
dh_clean
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
