Updated debian directory patch

Norman Jordan njordan at shaw.ca
Thu Jul 17 14:20:06 UTC 2003


Here is an updated patch for the debian directory.

Here are the changes:
* Cleaned up debian/rules
* Added the wxwin2.4 packages to the suggests field
* The package gideon-plugins had two dependencies on the package
  gideon, removed one of them.
* Now gideon's postinst and postrm scripts will call update-menus and
  ldconfig
* Added the URL for KDevelop to the package descriptions
* Updated the Debian menu entry to use the name KDevelop 3.0
* Added the Gideon icon to the Debian menu entry
-- 
Norman Jordan <njordan at shaw.ca>
-------------- next part --------------
diff -rNu kdevelop/debian/changelog gideon-2.999/debian/changelog
--- kdevelop/debian/changelog	2003-05-15 00:53:37.000000000 -0700
+++ gideon-2.999/debian/changelog	2003-07-16 23:43:04.000000000 -0700
@@ -1,3 +1,73 @@
+gideon (1:2.999-0cvs20030716) unstable; urgency=low
+
+  * Updated the Debian menu entry to use the name KDevelop 3.0
+  * Added the Gideon icon to the Debian menu entry
+  * Updated CVS sources
+
+ -- Norman Jordan <njordan at debian.org>  Wed, 16 Jul 2003 21:04:24 -0700
+
+gideon (1:2.999-0cvs20030706) unstable; urgency=low
+
+  * Updated CVS sources
+  * Added the URL for KDevelop to the package descriptions
+
+ -- Norman Jordan <njordan at debian.org>  Sun,  6 Jul 2003 23:51:16 -0700
+
+gideon (1:2.999-0cvs20030702) unstable; urgency=low
+
+  * Updated CVS sources
+
+ -- Norman Jordan <njordan at debian.org>  Wed,  2 Jul 2003 03:41:49 -0700
+
+gideon (1:2.999-0cvs20030621) unstable; urgency=low
+
+  * Updated CVS sources
+  * The package gideon-plugins had two dependencies on the package gideon,
+    removed one of them.
+  * Now gideon's postinst and postrm scripts will call update-menus and
+    ldconfig
+
+ -- Norman Jordan <njordan at debian.org>  Sat, 21 Jun 2003 00:20:29 -0700
+
+gideon (1:2.999-0cvs20030612) unstable; urgency=low
+
+  * Updated CVS sources
+  * Added the wxwin2.4 packages to the suggests field
+
+ -- Norman Jordan <njordan at debian.org>  Thu, 12 Jun 2003 22:19:20 -0700
+
+gideon (1:2.999-0cvs20030609) unstable; urgency=low
+
+  * Updated CVS sources
+
+ -- Norman Jordan <njordan at debian.org>  Mon,  9 Jun 2003 11:27:20 -0700
+
+gideon (1:2.999-0cvs20030604) unstable; urgency=low
+
+  * Updated CVS sources
+
+ -- Norman Jordan <njordan at debian.org>  Wed,  4 Jun 2003 21:19:16 -0700
+
+gideon (1:2.999-0cvs20030530) unstable; urgency=low
+
+  * Updated CVS sources
+
+ -- Norman Jordan <njordan at debian.org>  Fri, 30 May 2003 11:53:23 -0700
+
+gideon (1:2.999-0cvs20030526) unstable; urgency=low
+
+  * Updated CVS sources
+  * Cleaned up debian/rules
+
+ -- Norman Jordan <njordan at debian.org>  Mon, 26 May 2003 11:20:05 -0700
+
+gideon (1:2.999-0cvs20030518) unstable; urgency=low
+
+  * Updated CVS sources
+  * Fixed up debian/rules to work with the new admin/debianrules file
+
+ -- Norman Jordan <njordan at debian.org>  Sun, 18 May 2003 13:31:34 -0700
+
 gideon (1:2.999-0cvs20030514) unstable; urgency=low
 
   * Updated CVS sources
diff -rNu kdevelop/debian/control gideon-2.999/debian/control
--- kdevelop/debian/control	2003-05-15 00:53:37.000000000 -0700
+++ gideon-2.999/debian/control	2003-07-16 23:43:04.000000000 -0700
@@ -9,7 +9,7 @@
 Architecture: any
 Depends: ${shlibs:Depends}, autoconf, automake | automake1.6 | automake1.7, kdebase-bin, gideon-data, gideon-plugins
 Recommends: make, gideon-doc
-Suggests: libqt3-mt-dev, qt3-doc, kdbg, kdelibs-dev, kdebase, kdelibs4-doc, htdig, sgmltools, gettext, a2ps, enscript, gv, qt3-tools, glimpse, ark, kpaint, kbabel, kiconedit, gdb, kdesdk-scripts, graphviz, stl-manual
+Suggests: libqt3-mt-dev, qt3-doc, kdbg, kdelibs-dev, kdebase, kdelibs4-doc, htdig, sgmltools, gettext, a2ps, enscript, gv, qt3-tools, glimpse, ark, kpaint, kbabel, kiconedit, gdb, kdesdk-scripts, graphviz, stl-manual, wxwin2.4-headers, wxwin2.4-i18n, wxwin2.4-examples, libwxbase2.4 | libwxgtk2.4 | libwxgtk2.4-contrib
 Description: An IDE for Unix/X11 - development version
  KDevelop is an easy to use Integrated Development Environment
  for developing C/C++ applications under X11. It features 
@@ -18,6 +18,8 @@
  .
  The application wizard can generate fully functional projects
  for terminal programs and GUI programs using Qt, KDE or GNOME.
+ .
+ URL: http://www.kdevelop.org/
 
 Package: gideon-doc
 Section: doc
@@ -33,6 +35,8 @@
  for terminal programs and GUI programs using Qt, KDE or GNOME.
  .
  This package contains documentation for KDevelop.
+ .
+ URL: http://www.kdevelop.org/
 
 Package: gideon-data
 Architecture: all
@@ -47,6 +51,8 @@
  for terminal programs and GUI programs using Qt, KDE or GNOME.
  .
  This package contains arch independent datas for KDevelop.
+ .
+ URL: http://www.kdevelop.org/
 
 Package: gideon-dev
 Architecture: all
@@ -63,10 +69,12 @@
  for terminal programs and GUI programs using Qt, KDE or GNOME.
  .
  This package contains development files for KDevelop.
+ .
+ URL: http://www.kdevelop.org/
 
 Package: gideon-plugins
 Architecture: any
-Depends: ${shlibs:Depends}, gideon (= ${Source-Version})
+Depends: ${shlibs:Depends}
 Description: An IDE for Unix/X11 - development files
  KDevelop is an easy to use Integrated Development Environment
  for developing C/C++ applications under X11. It features 
@@ -77,3 +85,6 @@
  for terminal programs and GUI programs using Qt, KDE or GNOME.
  .
  This package contains the plugins for KDevelop.
+ .
+ URL: http://www.kdevelop.org/
+
diff -rNu kdevelop/debian/debiandirs gideon-2.999/debian/debiandirs
--- kdevelop/debian/debiandirs	2003-04-30 07:26:15.000000000 -0700
+++ gideon-2.999/debian/debiandirs	2003-07-16 23:43:23.000000000 -0700
@@ -27,6 +27,6 @@
 export MCOPIDL=/usr/bin/mcopidl
 export ARTSCCONFIG=/usr/bin/artsc-config
 export INSTALL_DATA=install -p -c -m 644
-configkde=--disable-debug --enable-final --disable-rpath --prefix=$(kde_prefix) --libexecdir=$(kde_bindir) --sysconfdir=$(sysconfdir) --libdir=$(kde_libdir) --includedir=$(kde_includedir) --with-qt-includes=/usr/include/qt3 --mandir=$(mandir) --infodir=$(infodir)
-configkdevelop=--disable-debug --enable-final --disable-rpath --enable-docbase --enable-kdoc2 --libdir=$(kde_libdir) --includedir=$(kde_includedir) --with-qt-includes=/usr/include/qt3 --mandir=$(mandir) --with-kdelibsdoxy-dir=/usr/share/doc/kde/HTML/en/kdelibs-apidocs
-configkdepim=--disable-debug --enable-final --disable-rpath --with-extra-includes=/usr/include/libpisock --enable-shared --prefix=$(kde_prefix) --libexecdir=$(kde_bindir) --with-qt-includes=/usr/include/qt3 --mandir=$(mandir) --infodir=$(infodir)
+configkde=--disable-debug --enable-final --disable-rpath --prefix=$(kde_prefix) --libexecdir=$(kde_bindir) --sysconfdir=$(sysconfdir) --libdir=$(kde_libdir) --includedir=$(kde_includedir) --with-qt-includes=/usr/include/qt3 --mandir=$(mandir) --infodir=$(infodir) --with-xinerama
+configkdevelop=--disable-debug --enable-final --disable-rpath --enable-docbase --enable-kdoc2 --libdir=$(kde_libdir) --includedir=$(kde_includedir) --with-qt-includes=/usr/include/qt3 --mandir=$(mandir) --with-kdelibsdoc-dir=/usr/share/doc/kdelibs3-doc/html --with-xinerama
+configkdepim=--disable-debug --enable-final --disable-rpath --with-extra-includes=/usr/include/libpisock --enable-shared --prefix=$(kde_prefix) --libexecdir=$(kde_bindir) --with-qt-includes=/usr/include/qt3 --mandir=$(mandir) --infodir=$(infodir) --with-xinerama
diff -rNu kdevelop/debian/gideon.postinst gideon-2.999/debian/gideon.postinst
--- kdevelop/debian/gideon.postinst	2003-05-15 00:53:37.000000000 -0700
+++ gideon-2.999/debian/gideon.postinst	2003-07-16 23:43:04.000000000 -0700
@@ -3,3 +3,7 @@
 
 test -f "/usr/share/gideon/update_doc_index.sh" && "/usr/share/gideon/update_doc_index.sh" > /dev/null 2>&1 &
 
+#DEBHELPER#
+
+exit 0
+
diff -rNu kdevelop/debian/gideon.postrm gideon-2.999/debian/gideon.postrm
--- kdevelop/debian/gideon.postrm	2003-05-05 00:35:04.000000000 -0700
+++ gideon-2.999/debian/gideon.postrm	2003-07-16 23:43:04.000000000 -0700
@@ -11,3 +11,8 @@
     rm -rf "$GLOBAL_HTDIG_DIR"
     rm -rf "$GLOBAL_KDEVDOCTREEVIEW_DIR"
 fi
+
+#DEBHELPER#
+
+exit 0
+
diff -rNu kdevelop/debian/menu gideon-2.999/debian/menu
--- kdevelop/debian/menu	2002-09-25 04:16:12.000000000 -0700
+++ gideon-2.999/debian/menu	2003-07-16 23:43:04.000000000 -0700
@@ -1,6 +1,8 @@
-?package(kdevelop):\
+?package(gideon):\
         needs=x11\
         section=Apps/Programming\
-        hints="KDE"\
-        title="Gideon"\
+        hints="KDE,Development"\
+	kderemove="y"\
+        title="KDevelop 3.0"\
+	icon="/usr/share/icons/hicolor/16x16/apps/gideon.png"\
         command=gideon
diff -rNu kdevelop/debian/rules gideon-2.999/debian/rules
--- kdevelop/debian/rules	2003-05-15 00:53:37.000000000 -0700
+++ gideon-2.999/debian/rules	2003-07-16 23:43:04.000000000 -0700
@@ -17,36 +17,18 @@
 DEB_BUILD_GNU_TYPE	?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
 
-ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -g
-endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-	INSTALL_PROGRAM += -s
-endif
 ifneq (,$(findstring withjava,$(DEB_BUILD_OPTIONS)))
 	JAVA_FLAGS=--enable-javasupport
-endif
-ifneq (,$(JAVA_HOME))
-	JAVA_FLAGS+= --with-java=$(JAVA_HOME)
+	ifneq (,$(JAVA_HOME))
+		JAVA_FLAGS+= --with-java=$(JAVA_HOME)
+	endif
 endif
 
-ifeq ($(DEB_BUILD_GNU_TYPE),alpha-linux)
-  export CFLAGS +=-O0 -mieee
-  export CXXFLAGS +=-O0 -mieee
-endif
-
-ifeq ($(DEB_BUILD_GNU_TYPE),i386-linux)
-  # Uncomment the following 2 lines to enable i686 optimziation
-  # You may want to tweak the settings to your likings
-  #export CFLAGS=-O3 -march=i686 -ffast-math -finline-functions
-  #export CXXFLAGS=-O3 -march=i686 -ffast-math -finline-functions
-  XINERAMA=--with-xinerama
-endif
 
 -include debian/debiandirs
 
 debian/debiandirs: admin/debianrules
-	perl -w admin/debianrules echodirs > debian/debiandirs
+	admin/debianrules echodirs > debian/debiandirs
 
 configure: configure-stamp
 configure-stamp:
@@ -69,9 +51,13 @@
 
 	# make build directory
 
-	./configure $(configkdevelop) --prefix=$(kde_prefix) \
-		--sysconfdir=$(kde_confdir) \
-		$(JAVA_FLAGS) --disable-final
+	./configure --prefix=$(kde_prefix) \
+				--sysconfdir=$(kde_confdir) \
+				--with-kdelibsdoxy-dir=/usr/share/doc/kde/HTML/en/kdelibs-apidocs \
+				--with-pythondir=/usr \
+				$(configkdevelop) \
+				--disable-final \
+				$(JAVA_FLAGS)
 
 	touch configure-stamp
 


More information about the KDevelop-devel mailing list