Updated patch for the debian directory
Norman Jordan
njordan at shaw.ca
Thu May 15 01:00:09 UTC 2003
Here is an updated patch for the debian directory.
Thanks.
--
Norman Jordan <njordan at shaw.ca>
-------------- next part --------------
diff -rNu kdevelop/debian/build-gideon gideon-2.999/debian/build-gideon
--- kdevelop/debian/build-gideon 2001-12-22 07:11:02.000000000 -0800
+++ gideon-2.999/debian/build-gideon 2003-05-14 03:21:53.000000000 -0700
@@ -5,8 +5,13 @@
# it shows how to config and install gideon in /usr/local/kde
-# first do
+# first do one of the following:
+# [for QT on X]
# $ debian/build-gideon config
+# [for QT embedded]
+# $ debian/build-gideon config2
+# [for Qtopia]
+# $ debian/build-gideon config3
# and then
# $ make
# you can then use run or debug targets
@@ -16,51 +21,73 @@
debdir=$(shell pwd)/debian
instdir=$(debdir)/tmp
+-include debian/debianrules
+
run:
- LD_LIBRARY_PATH=/usr/local/kde3/lib /usr/local/kde/bin/gideon
+ LD_LIBRARY_PATH=/usr/local/kde3/lib /usr/local/kde3/bin/gideon
debug:
- LD_LIBRARY_PATH=/usr/local/kde3/lib kdbg /usr/local/kde/bin/gideon
+ LD_LIBRARY_PATH=/usr/local/kde3/lib kdbg /usr/local/kde3/bin/gideon
+
+debian/debiandirs: admin/debianrules
+ DEB_BUILD_OPTIONS=debug perl -w admin/debianrules echodirs > debian/debiandirs
+
+config: debian/debiandirs
+ if test ! -f configure; then \
+ $(MAKE) -f admin/Makefile.common ;\
+ fi
+ ./configure $(configkdevelop) --prefix=/usr/local/kde3 \
+ --with-kdelibsdoxy-dir=/usr/share/doc/kde/HTML/en/kdelibs-apidocs \
+ --with-phpdocdir=/usr/share/doc/php4 \
+ --with-glibdocdir=/usr/share/doc/glib-reference/html \
+ --with-gdkdocdir=/usr/share/doc/gtk-reference/gdk/html \
+ --with-gtkdocdir=/usr/share/doc/gtk-reference/gtk/html \
+ --with-gnomedocdir=/usr/share/doc/gnome-dev-doc/html \
+ --enable-javasupport \
+ --enable-svnsupport
-config2:
+ touch configure-stamp
+
+config2: debian/debiandirs
if test ! -f configure; then \
$(MAKE) -f admin/Makefile.common ;\
fi
./configure $(configkdevelop) \
- --enable-debug \
- --disable-rpath --with-qt-includes=/usr/include/qt \
- --with-kdelibsdoc-dir=/usr/share/doc/kdelibs3-doc/html \
- --enable-gideon-qt2 \
- --enable-docbase \
+ --with-kdelibsdoxy-dir=/usr/share/doc/kde/HTML/en/kdelibs-apidocs \
--with-phpdocdir=/usr/share/doc/php4 \
--with-glibdocdir=/usr/share/doc/glib-reference/html \
--with-gdkdocdir=/usr/share/doc/gtk-reference/gdk/html \
--with-gtkdocdir=/usr/share/doc/gtk-reference/gtk/html \
- --with-gnomedocdir=/usr/share/doc/gnome-dev-doc/html
+ --with-gnomedocdir=/usr/share/doc/gnome-dev-doc/html \
+ --enable-javasupport \
+ --enable-svnsupport \
+ --enable-embedded
touch configure-stamp
-config3:
+config3: debian/debiandirs
if test ! -f configure; then \
$(MAKE) -f admin/Makefile.common ;\
fi
- ./configure \
- --prefix=/usr/local/kde3 \
- --with-qt-dir=/usr/local/qt \
- --with-qt-includes=/usr/local/qt \
- --enable-debug \
- --disable-rpath \
- --with-kdelibsdoc-dir=/usr/share/doc/kdelibs4-doc/html \
- --enable-docbase \
+ ./configure $(configkdevelop) \
+ --with-kdelibsdoxy-dir=/usr/share/doc/kde/HTML/en/kdelibs-apidocs \
--with-phpdocdir=/usr/share/doc/php4 \
--with-glibdocdir=/usr/share/doc/glib-reference/html \
--with-gdkdocdir=/usr/share/doc/gtk-reference/gdk/html \
--with-gtkdocdir=/usr/share/doc/gtk-reference/gtk/html \
- --with-gnomedocdir=/usr/share/doc/gnome-dev-doc/html
+ --with-gnomedocdir=/usr/share/doc/gnome-dev-doc/html \
+ --enable-javasupport \
+ --enable-svnsupport \
+ --enable-qtopia
touch configure-stamp
-build:
+configure-stamp:
+ @echo "*** You must first run debian/build-gideon config (for X) or"
+ @echo "*** debian/build-gideon config2 (for QT embedded) or"
+ @echo "*** debian/build-gideon config3 (for Qtopia)"
+
+build: configure-stamp
$(MAKE)
clean:
diff -rNu kdevelop/debian/changelog gideon-2.999/debian/changelog
--- kdevelop/debian/changelog 2003-05-05 00:35:04.000000000 -0700
+++ gideon-2.999/debian/changelog 2003-05-14 03:21:53.000000000 -0700
@@ -1,3 +1,28 @@
+gideon (1:2.999-0cvs20030514) unstable; urgency=low
+
+ * Updated CVS sources
+ * Added the prefix to debian/rules and debian/buld-gideon
+ * Added stl-manual to the suggests field for gideon-doc
+ * Fixed up the path to the kdevelop manual
+
+ -- Norman Jordan <njordan at debian.org> Wed, 14 May 2003 02:47:32 -0700
+
+gideon (1:2.999-0cvs20030511) unstable; urgency=low
+
+ * Updated CVS sources
+ * Added the documentation files to the gideon-doc package
+ * Added the antlr header files to the gideon-dev package
+
+ -- Norman Jordan <njordan at debian.org> Sun, 11 May 2003 17:43:27 -0700
+
+gideon (1:2.999-0cvs20030507) unstable; urgency=low
+
+ * Updated CVS sources
+ * Fixed up the configure options for the file "debian/build-gideon"
+ * Moved the script update_doc_index.sh to /usr/share/gideon
+
+ -- Norman Jordan <njordan at debian.org> Wed, 7 May 2003 11:42:59 -0700
+
gideon (1:2.999-0cvs20030502) unstable; urgency=low
* Updated CVS sources
diff -rNu kdevelop/debian/control gideon-2.999/debian/control
--- kdevelop/debian/control 2003-05-05 00:35:04.000000000 -0700
+++ gideon-2.999/debian/control 2003-05-14 03:21:53.000000000 -0700
@@ -22,7 +22,7 @@
Package: gideon-doc
Section: doc
Architecture: all
-Suggests: qt-doc, python2.2-doc, glib-reference, gtk-reference, gnome-dev-doc
+Suggests: qt-doc, python2.2-doc, glib-reference, gtk-reference, gnome-dev-doc, stl-manual
Description: An IDE for Unix/X11 - documentation
KDevelop is an easy to use Integrated Development Environment
for developing C/C++ applications under X11. It features
diff -rNu kdevelop/debian/cron.weekly gideon-2.999/debian/cron.weekly
--- kdevelop/debian/cron.weekly 2003-05-05 00:35:04.000000000 -0700
+++ gideon-2.999/debian/cron.weekly 2003-05-14 03:21:53.000000000 -0700
@@ -1,4 +1,4 @@
#!/bin/sh
# Used to update the documentation index for KDevelop
-test -f "/usr/lib/gideon/update_doc_index.sh" && "/usr/lib/gideon/update_doc_index.sh" > /dev/null 2>&1
+test -f "/usr/share/gideon/update_doc_index.sh" && "/usr/share/gideon/update_doc_index.sh" > /dev/null 2>&1
diff -rNu kdevelop/debian/gideon-dev.install gideon-2.999/debian/gideon-dev.install
--- kdevelop/debian/gideon-dev.install 2002-09-25 04:16:12.000000000 -0700
+++ gideon-2.999/debian/gideon-dev.install 2003-05-14 03:21:53.000000000 -0700
@@ -1,2 +1 @@
debian/tmp/usr/include
-
diff -rNu kdevelop/debian/gideon-doc.install gideon-2.999/debian/gideon-doc.install
--- kdevelop/debian/gideon-doc.install 2002-09-25 04:16:12.000000000 -0700
+++ gideon-2.999/debian/gideon-doc.install 2003-05-14 03:21:53.000000000 -0700
@@ -1 +1 @@
-
+debian/tmp/usr/share/doc/kde/HTML/en/kdevelop
diff -rNu kdevelop/debian/gideon-doc.links gideon-2.999/debian/gideon-doc.links
--- kdevelop/debian/gideon-doc.links 2001-07-30 09:02:43.000000000 -0700
+++ gideon-2.999/debian/gideon-doc.links 2003-05-14 03:21:53.000000000 -0700
@@ -1 +1,2 @@
-/usr/share/doc/stl-manual/html/ /usr/share/doc/kde/HTML/en/kdevdoctreeview/stl
\ No newline at end of file
+/usr/share/doc/stl-manual/html/ /usr/share/doc/kde/HTML/en/kdevdoctreeview/stl
+/usr/share/doc/kde/HTML/en/kdevelop /usr/share/doc/kde/HTML/en/gideon
diff -rNu kdevelop/debian/gideon.install gideon-2.999/debian/gideon.install
--- kdevelop/debian/gideon.install 2003-04-30 07:26:15.000000000 -0700
+++ gideon-2.999/debian/gideon.install 2003-05-14 03:21:53.000000000 -0700
@@ -4,4 +4,4 @@
debian/tmp/usr/lib/libkdevelopqextmdi.so.*
debian/tmp/usr/lib/libkdevcatalog.so.*
debian/tmp/usr/lib/libkdevcppparser.so.*
-debian/tmp/usr/lib/gideon
+debian/tmp/usr/share/gideon
diff -rNu kdevelop/debian/gideon.postinst gideon-2.999/debian/gideon.postinst
--- kdevelop/debian/gideon.postinst 2003-05-05 00:35:04.000000000 -0700
+++ gideon-2.999/debian/gideon.postinst 2003-05-14 03:21:53.000000000 -0700
@@ -1,5 +1,5 @@
#!/bin/sh
set -e
-test -f "/usr/lib/gideon/update_doc_index.sh" && "/usr/lib/gideon/update_doc_index.sh" > /dev/null 2>&1 &
+test -f "/usr/share/gideon/update_doc_index.sh" && "/usr/share/gideon/update_doc_index.sh" > /dev/null 2>&1 &
diff -rNu kdevelop/debian/rules gideon-2.999/debian/rules
--- kdevelop/debian/rules 2003-04-30 07:26:15.000000000 -0700
+++ gideon-2.999/debian/rules 2003-05-14 03:21:53.000000000 -0700
@@ -69,7 +69,9 @@
# make build directory
- ./configure $(configkdevelop) $(JAVA_FLAGS) --disable-final
+ ./configure $(configkdevelop) --prefix=$(kde_prefix) \
+ --sysconfdir=$(kde_confdir) \
+ $(JAVA_FLAGS) --disable-final
touch configure-stamp
@@ -124,8 +126,8 @@
$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
- -install -d $(CURDIR)/debian/tmp/usr/lib/gideon
- -install debian/update_doc_index.sh $(CURDIR)/debian/tmp/usr/lib/gideon
+ -install -d $(CURDIR)/debian/tmp/usr/share/gideon
+ -install debian/update_doc_index.sh $(CURDIR)/debian/tmp/usr/share/gideon
dh_install --list-missing
More information about the KDevelop-devel
mailing list