Menu
▾
▴
[Gimp-print-devel] Fixes for the Debian CVS build
|
From: Christian M. <ch...@on...> - 2005-01-28 22:39:43
|
Hi,
in order to build the Debian packages from CVS I had to apply the
following changes (diff against current CVS):
* autogen.sh warns if openjade 1.3 is missing so I added it to the
Debian build-depends
* the autogen.sh script doesn't copy the scripts but symlinks them which
is an unrepresentable change for the Debian build system
* when building in debian/build the SGML sources are symlinked more than
once, add the force option
* when building in debian/build the path of stpui_public_h_sources in
the Makefile of gutenprintui2 is wrong, fix it by making the path
relative
* when building in debian/build the xmli18n-tmp.h file generation in the
src/main Makefile is generated in the build dir but searched by the
po-build in the src/main dir, fix it by generating the file always in
the src/main dir
Greetings,
Christian
Index: debian/control.in
===================================================================
RCS file: /cvsroot/gimp-print/print/debian/control.in,v
retrieving revision 1.43
diff -u -r1.43 control.in
--- debian/control.in 1 Nov 2004 20:44:49 -0000 1.43
+++ debian/control.in 28 Jan 2005 21:46:26 -0000
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Roger Leigh <rl...@de...>
Standards-Version: 3.6.1
-Build-Depends: libcupsys2-dev, libcupsimage2-dev, libgimp2.0-dev, libgtk1.2-dev, libreadline4-dev, libijs-dev (>= 0.35-1), debhelper (>= 4.0.2), xlibs-dev, zlib1g-dev, flex, gettext (>= 0.11.5), foomatic-db-engine (>= 3.0.1-1), chrpath (>= 0.12)
+Build-Depends: libcupsys2-dev, libcupsimage2-dev, libgimp2.0-dev, libgtk1.2-dev, libreadline4-dev, libijs-dev (>= 0.35-1), debhelper (>= 4.0.2), xlibs-dev, zlib1g-dev, flex, gettext (>= 0.11.5), foomatic-db-engine (>= 3.0.1-1), chrpath (>= 0.12), openjade1.3
Package: gimp-print
Architecture: any
Index: doc/users_guide/Makefile.am
===================================================================
RCS file: /cvsroot/gimp-print/print/doc/users_guide/Makefile.am,v
retrieving revision 1.41
diff -u -r1.41 Makefile.am
--- doc/users_guide/Makefile.am 22 May 2004 23:50:33 -0000 1.41
+++ doc/users_guide/Makefile.am 28 Jan 2005 21:46:26 -0000
@@ -169,7 +169,7 @@
if test -L $(notdir $<) ; then \
$(RM) $(notdir $<) ; \
fi ; \
- $(LN_S) $(UTIL_MANUAL_SRC_FILES) . ; \
+ $(LN_S) -f $(UTIL_MANUAL_SRC_FILES) . ; \
if test -d figures ; then \
: ; \
else \
@@ -185,7 +185,7 @@
if test -L $(notdir $<) ; then \
$(RM) $(notdir $<) ; \
fi ; \
- $(LN_S) $(GIMP_MANUAL_SRC_FILES) . ; \
+ $(LN_S) -f $(GIMP_MANUAL_SRC_FILES) . ; \
if test -d figures ; then \
: ; \
else \
@@ -204,7 +204,7 @@
if test -L $(notdir $<) ; then \
$(RM) $(notdir $<) ; \
fi ; \
- $(LN_S) $(CUPS_MANUAL_SRC_FILES) . ; \
+ $(LN_S) -f $(CUPS_MANUAL_SRC_FILES) . ; \
if test -d figures ; then \
: ; \
else \
@@ -223,7 +223,7 @@
if test -L $(notdir $<) ; then \
$(RM) $(notdir $<) ; \
fi ; \
- $(LN_S) $(MANUAL_SRC_FILES) . ; \
+ $(LN_S) -f $(MANUAL_SRC_FILES) . ; \
if test -d figures ; then \
: ; \
else \
@@ -335,7 +335,7 @@
if test -L $(notdir $<) ; then \
$(RM) $(notdir $<) ; \
fi ; \
- $(LN_S) $(UTIL_MANUAL_SRC_FILES) . ; \
+ $(LN_S) -f $(UTIL_MANUAL_SRC_FILES) . ; \
fi
$(DB2HTML) $(UTIL_MANUAL).sgml
-$(RM) -rf $(UTIL_HTMLDIR)
@@ -350,7 +350,7 @@
if test -L $(notdir $<) ; then \
$(RM) $(notdir $<) ; \
fi ; \
- $(LN_S) $(GIMP_MANUAL_SRC_FILES) . ; \
+ $(LN_S) -f $(GIMP_MANUAL_SRC_FILES) . ; \
fi
$(DB2HTML) $(GIMP_MANUAL).sgml
-mkdir $(GIMP_MANUAL)/figures
@@ -369,7 +369,7 @@
if test -L $(notdir $<) ; then \
$(RM) $(notdir $<) ; \
fi ; \
- $(LN_S) $(CUPS_MANUAL_SRC_FILES) . ; \
+ $(LN_S) -f $(CUPS_MANUAL_SRC_FILES) . ; \
fi
$(DB2HTML) $(CUPS_MANUAL).sgml
-mkdir $(CUPS_MANUAL)/figures
@@ -388,7 +388,7 @@
if test -L $(notdir $<) ; then \
$(RM) $(notdir $<) ; \
fi ; \
- $(LN_S) $(MANUAL_SRC_FILES) . ; \
+ $(LN_S) -f $(MANUAL_SRC_FILES) . ; \
fi
$(DB2HTML) $(MANUAL).sgml
-mkdir $(MANUAL)/figures
Index: scripts/autogen.sh
===================================================================
RCS file: /cvsroot/gimp-print/print/scripts/autogen.sh,v
retrieving revision 1.32
diff -u -r1.32 autogen.sh
--- scripts/autogen.sh 17 Sep 2004 18:38:09 -0000 1.32
+++ scripts/autogen.sh 28 Jan 2005 21:46:26 -0000
@@ -354,7 +354,7 @@
autoheader
fi
echo "Running automake --gnu $am_opt ..."
- automake --add-missing --force-missing --gnu $am_opt
+ automake --add-missing --force-missing --copy --gnu $am_opt
echo "Running autoconf ..."
autoconf
)
Index: src/gutenprintui2/Makefile.am
===================================================================
RCS file: /cvsroot/gimp-print/print/src/gutenprintui2/Makefile.am,v
retrieving revision 1.3
diff -u -r1.3 Makefile.am
--- src/gutenprintui2/Makefile.am 5 Dec 2004 22:08:28 -0000 1.3
+++ src/gutenprintui2/Makefile.am 28 Jan 2005 21:46:27 -0000
@@ -77,9 +77,9 @@
# Copied from include/gutenprintui2/Makefile.am
# This duplication needs fixing somehow
stpui_public_h_sources = \
- $(top_srcdir)/include/gutenprintui2/gutenprintui.h \
- $(top_srcdir)/include/gutenprintui2/curve.h \
- $(top_srcdir)/include/gutenprintui2/gammacurve.h
+ ../../include/gutenprintui2/gutenprintui.h \
+ ../../include/gutenprintui2/curve.h \
+ ../../include/gutenprintui2/gammacurve.h
if MAINTAINER_MODE
typebuiltins_extra_deps = Makefile
Index: src/main/Makefile.am
===================================================================
RCS file: /cvsroot/gimp-print/print/src/main/Makefile.am,v
retrieving revision 1.89
diff -u -r1.89 Makefile.am
--- src/main/Makefile.am 5 Dec 2004 22:08:29 -0000 1.89
+++ src/main/Makefile.am 28 Jan 2005 21:46:27 -0000
@@ -183,7 +183,7 @@
< $(srcdir)/papers.xml > $@;
sed -e '/printer.*name/!d' \
-e 's/.*printer.*name="\([^"]*\)".*/N_("\1");/' \
- < $(srcdir)/printers.xml >> $@;
+ < $(srcdir)/printers.xml >> $(srcdir)/$@;
dist-hook: xmli18n-tmp.h
# xmli18n-tmp.h is needed by po/POTFILES.in at dist time
--
Christian Meder, email: ch...@on...
The Way-Seeking Mind of a tenzo is actualized
by rolling up your sleeves.
(Eihei Dogen Zenji)
|