Debian subdirectory update [PATCH]
Norman Jordan
njordan at shaw.ca
Wed Jul 3 07:15:10 UTC 2002
Here is a patch to bring the "debian" subdirectory of the
"KDE_2_2_BRANCH" up to date with the current Debian packages.
--
Norman Jordan <njordan at shaw.ca>
-------------- next part --------------
--- kdevelop-2.1.2/debian/README-automake1.5.Debian Wed Dec 31 16:00:00 1969
+++ kdevelop-2.1.2.old/debian/README-automake1.5.Debian Sun Jun 30 01:42:37 2002
@@ -0,0 +1,22 @@
+If you have Automake 1.5 installed, then take note of the following.
+
+For Existing Projects
+---------------------
+You will need to copy the following files into the admin directory of your project if you have one
+
+/usr/share/doc/kdevelop/updates/conf.change.pl.gz
+/usr/share/doc/kdevelop/updates/config.pl.gz
+
+Make sure to uncompress the files after you have copied them.
+
+If you get errors when you run automake, then you will need to make sure that no variables are redefined in you Makefile.am files.
+For example you may need to change the following line in the toplevel Makefile.am
+
+EXTRA_DIST = admin
+
+to
+
+EXTRA_DIST += admin
+
+In other places you may need to comment out one of the definitions.
+
diff -ru --new-file kdevelop-2.1.2/debian/README-htdig.Debian kdevelop-2.1.2.old/debian/README-htdig.Debian
--- kdevelop-2.1.2/debian/README-htdig.Debian Wed Dec 31 16:00:00 1969
+++ kdevelop-2.1.2.old/debian/README-htdig.Debian Sun Jun 30 01:42:37 2002
@@ -0,0 +1,20 @@
+The following steps describe howto get kdevelop to work with htdig.
+
+1. You will need a modified htdig. You can get Debian packages at
+http://people.debian.org/~njordan/kdevelop/htdig/
+
+2. Login as the user that will use KDevelop and do the following steps.
+
+3. Create the following directories if they don't already exist.
+~/.kde/share/apps/kdevelop/tools
+~/.kde/share/apps/kdevelop/htdig
+~/.kde/share/apps/kdevelop/htdig/db
+
+4. Copy the file /usr/share/doc/kdevelop/examples/htdig.conf ~/.kde/share/apps/kdevelop/tools
+
+5. Edit the file ~/.kde/share/apps/kdevelop/tools/htdig.conf and change "HOMEDIR" to your home directory.
+
+6. Go through the KDevelop Setup again. It will take a while to index all of the documentation, so be patient.
+
+7. If you have problems, try editing the file ~/.kde/share/config/kdeveloprc and delete the line beginning with "doc_kde=" and then rerun the KDevelop Setup again.
+
diff -ru --new-file kdevelop-2.1.2/debian/changelog kdevelop-2.1.2.old/debian/changelog
--- kdevelop-2.1.2/debian/changelog Tue Jul 2 21:41:32 2002
+++ kdevelop-2.1.2.old/debian/changelog Tue Jul 2 21:05:38 2002
@@ -1,24 +1,302 @@
-kdevelop (1:2.0.3b) unstable; urgency=low
+kdevelop (4:2.1.2-0.1) unstable; urgency=low
- * New version.
+ * New upstream version (from CVS)
- -- Eray Ozkural (exa) <erayo at cs.bilkent.edu.tr> Thu, 22 Nov 2001 01:40:05 +0200
+ -- Norman Jordan <njordan at debian.org> Sun, 30 Jun 2002 01:57:35 -0700
-kdevelop (1:2.0b1-2) unstable; urgency=low
+kdevelop (4:2.1.1-3) unstable; urgency=low
- * Renamed debian doc-base entries to standard ones.
+ * Recompiled agains KDE 3.0.2
- -- Christian Couder <chcouder at club-internet.fr> Mon, 23 Jul 2001 22:58:54 +0100
+ -- Norman Jordan <njordan at debian.org> Thu, 27 Jun 2002 16:57:47 -0700
-kdevelop (1:2.0b1-1) unstable; urgency=low
+kdevelop (4:2.1.1-2) unstable; urgency=low
- * New release
- * don't compress tip database
- * small fix to find kdelibs docs in setup wizard
- * split into binary, doc and data packages
- * added graphviz to suggests
+ * Updated version number to be greater than the KDE 2.2 version of KDevelop
+ * Fixed debian/debianrules to use the correct path to the kdelibs
+ documentation
+ * Now system configuration files are stored in /etc/kde3
- -- Eray Ozkural (exa) <erayo at cs.bilkent.edu.tr> Mon, 23 Jul 2001 20:18:09 +0300
+ -- Norman Jordan <njordan at debian.org> Sun, 26 May 2002 00:40:30 -0700
+
+kdevelop (3:2.1.1-1) unstable; urgency=low
+
+ * New upstream version, using the sources for KDE 3.0
+ * Compiled for KDE 3.0
+ * Applied previous patches
+ * Updated dependency lists
+
+ -- Norman Jordan <njordan at debian.org> Thu, 23 May 2002 17:10:39 -0700
+
+kdevelop (3:2.1-kde3.0-1) unstable; urgency=low
+
+ * New source package for KDE 3.0
+ * Compiled for KDE 3.0
+ * Applied my previous patches
+ * Never released
+
+ -- Norman Jordan <njordan at debian.org> Sun, 19 May 2002 22:52:29 -0700
+
+kdevelop (3:2.1-1) unstable; urgency=low
+
+ * New upstream release
+ * Updated the example htdig.conf to use the correct path to htdig's images
+
+ -- Norman Jordan <njordan at debian.org> Thu, 4 Apr 2002 12:46:16 -0800
+
+kdevelop (3:2.1-0rc3-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Norman Jordan <njordan at debian.org> Wed, 3 Apr 2002 04:37:32 -0800
+
+kdevelop (3:2.0.2-5) unstable; urgency=low
+
+ * Added linuxdoc-tools to the suggests field of kdevelop
+ * Added c-cpp-reference to the suggests field of kdevelop (Closes: #139394)
+ * Updated the files README-automake1.5.Debian and README-htdig.Debian
+ * Updated KDevelop setup, so that it will always find the KDE documentation
+ if you have kdelibs3-doc installed
+
+ -- Norman Jordan <njordan at debian.org> Mon, 25 Mar 2002 15:46:15 -0800
+
+kdevelop (3:2.0.2-4) unstable; urgency=low
+
+ * Recompiled with libpng2-dev (Closes: #128728, #127330)
+ * Added libpng2-dev to the build depends
+ * Can once again index the KDE documentation with htdig
+ * Updated the README-htdig.Debian file
+
+ -- Norman Jordan <njordan at debian.org> Tue, 8 Jan 2002 18:14:57 -0800
+
+kdevelop (3:2.0.2-3) unstable; urgency=low
+
+ * Now compiles with GCC 3 (Closes: #127865)
+
+ -- Norman Jordan <njordan at debian.org> Sun, 6 Jan 2002 04:51:52 -0800
+
+kdevelop (3:2.0.2-2) unstable; urgency=low
+
+ * Recompiled against new QT library (Closes: #127330)
+
+ -- Norman Jordan <njordan at debian.org> Tue, 1 Jan 2002 01:57:49 -0800
+
+kdevelop (3:2.0.2-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Norman Jordan <njordan at debian.org> Thu, 22 Nov 2001 13:23:36 -0800
+
+kdevelop (3:2.0.1-7) unstable; urgency=low
+
+ * Fixed some ASSERT statements in the source, where a string was passed
+ rather than a boolean value (Closes: #119320)
+
+ -- Norman Jordan <njordan at debian.org> Tue, 13 Nov 2001 21:37:29 -0800
+
+kdevelop (3:2.0.1-6) unstable; urgency=low
+
+ * Updated debian/rules to automatically delete the file debian/files
+ * Deleted the file debian/file (Closes: #118484)
+ * The package kdevelop-doc was moved to the doc section
+
+ -- Norman Jordan <njordan at debian.org> Wed, 7 Nov 2001 16:17:18 -0800
+
+kdevelop (3:2.0.1-5) unstable; urgency=low
+
+ * Fixed some Makefile.am's so that automake 1.5 will work on the source
+ * Updated the admin.tar.gz file to work with automake 1.5
+ * The doc package now contains the files conf.change.pl and config.pl so
+ that users can manually update the admin directory of thier projects
+ * Added the file README-automake1.5.Debian to explain how get a project to
+ work with automake 1.5
+
+ -- Norman Jordan <njordan at debian.org> Mon, 8 Oct 2001 17:27:45 -0700
+
+kdevelop (3:2.0.1-4) unstable; urgency=low
+
+ * Removed the build dependency on automake and autoconf (Closes: #114595)
+
+ -- Norman Jordan <njordan at debian.org> Sat, 6 Oct 2001 10:20:26 -0700
+
+kdevelop (3:2.0.1-3) unstable; urgency=low
+
+ * Made the sample htdig.conf and the README-htdig.Debian files a little
+ clearer
+ * Now on Alpha it will compile with the flags -O0 and -mieee
+ (Closes: #114393)
+
+ -- Norman Jordan <njordan at debian.org> Thu, 4 Oct 2001 11:58:13 -0700
+
+kdevelop (3:2.0.1-2) unstable; urgency=low
+
+ * The doc package now contains an example htdig.conf and the file
+ README-htdig.Debian that explains how to use htdig in KDevelop
+ * The menu item Help -> Search for Help on... will now find htsearch
+ if it is installed in /usr/lib/cgi-bin
+ * Changed the brief descriptions of the doc and data packages
+ * Fixed the setup wizard, it can now index the KDE Documentation if you
+ have kdelibs3-doc installed (Closes: #111837)
+
+ -- Norman Jordan <njordan at debian.org> Sat, 22 Sep 2001 23:34:11 -0700
+
+kdevelop (3:2.0.1-1) unstable; urgency=low
+
+ * New upstream release
+ * No longer suggests glimpse (Closes: #112468)
+ * Can now find htsearch in /usr/lib/cgi-bin
+ * Alpha no longer requires gcc-3.0 and g++-3.0
+
+ -- Norman Jordan <njordan at debian.org> Tue, 18 Sep 2001 01:58:21 -0700
+
+kdevelop (3:2.0-final-1.3) unstable; urgency=low
+
+ * The kdevelop package now suggests sgmltools-lite, not sgmltools
+ (Closes: #109067)
+ * Removed suggests fields for both data and doc packages
+ * The doc package now recommends the kdevelop package
+
+ -- Norman Jordan <njordan at debian.org> Fri, 17 Aug 2001 21:47:43 -0700
+
+kdevelop (3:2.0-final-1.2) unstable; urgency=low
+
+ * Corrected debian/rules file to fix binary-arch target (Closes: #108912)
+
+ -- Norman Jordan <njordan at debian.org> Thu, 16 Aug 2001 11:09:52 -0700
+
+kdevelop (3:2.0-final-1.1) unstable; urgency=low
+
+ * kdevelop-doc package no longer depends on kdevelop
+
+ -- Norman Jordan <njordan at debian.org> Wed, 15 Aug 2001 06:51:58 -0700
+
+kdevelop (3:2.0-final-1.0) unstable; urgency=low
+
+ * New upstream version (2.0)
+ * Changed debian/prerm file so that install-docs -r is only run once
+
+ -- Norman Jordan <njordan at debian.org> Wed, 15 Aug 2001 05:38:30 -0700
+
+kdevelop (2:2.0-0.1pre1-0.1.20010808) unstable; urgency=low
+
+ * Updated CVS sources (2001-08-08)
+ * Changed upstream version to 2.0-0.1pre1
+ * Added kderemove=y to menu file (Closes: #108012)
+ * Added a menu entry for KDevelop setup
+
+ -- Norman Jordan <njordan at debian.org> Sun, 8 Aug 2001 04:20:27 -0700
+
+kdevelop (2:2.0-0.1.20010801) unstable; urgency=low
+
+ * Updated CVS sources (2001-08-01)
+ * The data and doc packages now replace the 1.4 kdevelop package
+ (Closes: #107343)
+
+ -- Norman Jordan <njordan at debian.org> Wed, 1 Aug 2001 04:14:15 -0700
+
+kdevelop (2:2.0-0.1.20010731.1) unstable; urgency=low
+
+ * Updated CVS sources (still 2001-07-31)
+ * Updated debian/control and debian/rules to force the use of gcc-3/g++-3
+ on Alpha (Christopher C. Chimelis)
+
+ -- Norman Jordan <njordan at debian.org> Tue, 31 Jul 2001 21:26:09 -0700
+
+kdevelop (2:2.0-0.1.20010731) unstable; urgency=low
+
+ * Updated CVS sources (2001-07-31)
+ * Added new targets to debian/rules file, to allow building only binary-indep
+ or binary-arch
+ * Corrected dependencies of kdevelop-data
+
+ -- Norman Jordan <njordan at debian.org> Tue, 31 Jul 2001 02:59:52 -0700
+
+kdevelop (2:2.0-0.1.20010730) unstable; urgency=low
+
+ * Updated CVS sources (2001-07-30)
+
+ -- Norman Jordan <njordan at debian.org> Mon, 30 Jul 2001 08:44:50 -0700
+
+kdevelop (2:2.0-0.1.20010729.1) unstable; urgency=low
+
+ * Updated CVS sources, still (2001-7-29)
+ * Made scripts in usr/share/apps/kdevelop/tools executable
+
+ -- Norman Jordan <njordan at debian.org> Sun, 29 Jul 2001 16:32:46 -0700
+
+kdevelop (2:2.0-0.1.20010729) unstable; urgency=low
+
+ * Changed the version of the package
+ * Updated CVS sources (2001-07-29)
+ * Cleaned up debian/rules file
+
+ -- Norman Jordan <njordan at debian.org> Sun, 29 Jul 2001 02:36:34 -0700
+
+kdevelop (1:1.9.20010727-1) unstable; urgency=low
+
+ * Updated CVS sources
+ * Removed the file /usr/bin/extractrc
+
+ -- Norman Jordan <njordan at debian.org> Fri, 27 Jul 2001 15:22:42 -0700
+
+kdevelop (1:1.9.20010726-3) unstable; urgency=low
+
+ * No longer using debian/postinst as debian/kdevelop-doc.postinst
+ * No longer using debian/prerm as debian/kdevelop-doc.prerm
+
+ -- Norman Jordan <njordan at debian.org> Fri, 27 Jul 2001 01:43:30 -0700
+
+kdevelop (1:1.9.20010726-2) unstable; urgency=low
+
+ * Removed dh_shlibdeps and dh_builddeb from binary-arch target of
+ debian/rules
+
+ -- Norman Jordan <njordan at debian.org> Thu, 26 Jul 2001 19:36:58 -0700
+
+kdevelop (1:1.9.20010726-1) unstable; urgency=low
+
+ * Packaging the 20010726 CVS archive
+
+ -- Norman Jordan <njordan at debian.org> Thu, 26 Jul 2001 16:44:44 -0700
+
+kdevelop (1:2.0beta1-2) unstable; urgency=low
+
+ * Added dh_makeshlibs to debian/rules file
+
+ -- Norman Jordan <njordan at venom.dyndns.org> Thu, 26 Jul 2001 04:06:48 -0700
+
+kdevelop (1:2.0beta1-1) unstable; urgency=low
+
+ * New upstream release
+ * Split architecture indep. files into kdevelop-data (Eray Ozkural)
+ * Split documentation into kdevelop-doc (Eray Ozkural)
+
+ -- Norman Jordan <njordan at debian.org> Tue, 24 Jul 2001 00:35:16 -0700
+
+kdevelop (1:1.4.0-3.7) unstable; urgency=low
+
+ * Put the file README.htdig into /usr/share/doc/kdevelop
+ * Cleaned up the debian/debianrules file
+ * No longer deletes the menu file after building
+
+ -- Norman Jordan <njordan at debian.org> Wed, 18 Jul 2001 12:20:52 -0700
+
+kdevelop (1:1.4.0-3.6) unstable; urgency=low
+
+ * Built against KDE 2.2.0-beta1 (Closes: #105321)
+ * Changed use of cp command in debian/debianrules to no longer use -P
+ * Moved the file in /usr/share/doc/docbase to /usr/share/doc/kdevelop
+ * Changed build-depends, removed kdelibs-doc and qt2.2-doc
+
+ -- Norman Jordan <njordan at debian.org> Mon, 16 Jul 2001 03:56:02 -0700
+
+kdevelop (1:1.4.0-3.5) unstable; urgency=low
+
+ * Removed the x-designer.desktop file (Closes: #103296)
+ * Statically linked libfl.a in with kdevelop (Closes: #103226)
+ * Removed the x-linguist.desktop file, conflicted with kdelibs3
+
+ -- Norman Jordan <njordan at debian.org> Tue, 3 Jul 2001 13:49:18 -0700
kdevelop (1:1.4.0-3.4) unstable; urgency=low
--- kdevelop-2.1.2/debian/conffiles Tue Jul 2 21:41:32 2002
+++ kdevelop-2.1.2.old/debian/conffiles Sun Jun 30 01:42:37 2002
@@ -1 +1 @@
-/etc/kde2/kdeveloprc
+/etc/kde3/kdeveloprc
--- kdevelop-2.1.2/debian/control Tue Jul 2 21:41:32 2002
+++ kdevelop-2.1.2.old/debian/control Sun Jun 30 01:42:37 2002
@@ -2,14 +2,14 @@
Section: devel
Priority: optional
Maintainer: Norman Jordan <njordan at debian.org>
-Build-Depends: debhelper (>> 3.0.0), kdelibs-dev (>= 4:2.1.0-0), gettext, autoconf, automake, libtool, kdoc, kdelibs3-doc | kdelibs-doc, qt-doc | qt2.2-doc, flex
+Build-Depends: debhelper (>> 3.0.0), gettext, libtool, kdelibs4-dev, libqt3-mt-dev, qt3-tools, kdoc, kdelibs4-doc, qt3-doc, flex, libpng-dev
Standards-Version: 3.5.2
Package: kdevelop
Architecture: any
-Depends: ${shlibs:Depends}, autoconf, automake, kdebase-libs, kdevelop-doc, kdevelop-data
-Recommends: make
-Suggests: libqt-dev, qt-doc, kdbg, kdelibs-dev, kdebase, kdelibs3-doc, htdig, sgmltools, gettext, a2ps, enscript, gv, qt-designer | kde-designer, glimpse, ark, kpaint, kbabel, kiconedit, gdb, kdesdk-scripts, graphviz
+Depends: ${shlibs:Depends}, autoconf, automake1.5, kdevelop-data
+Recommends: make, kdevelop-doc
+Suggests: libqt3-dev, qt3-doc, kdbg, kdelibs4-dev, kdebase, libarts1-dev, kdelibs4-doc, htdig, sgmltools-lite, linuxdoc-tools, gettext, a2ps, enscript, gv, qt-designer | kde-designer, ark, kpaint, kbabel, kiconedit, gdb, kdesdk-scripts, graphviz, c-cpp-reference
Description: An IDE for Unix/X11
KDevelop is an easy to use Integrated Development Environment
for developing C/C++ applications under X11. It features
@@ -21,10 +21,11 @@
Package: kdevelop-doc
Architecture: all
+Section: doc
Depends:
-Recommends: make
-Suggests: libqt-dev, qt-doc, kdbg, kdelibs-dev, kdebase, kdelibs3-doc, htdig, sgmltools, gettext, a2ps, enscript, gv, qt-designer | kde-designer, glimpse, ark, kpaint, kbabel, kiconedit, gdb, kdesdk-scripts, graphviz
-Description: An IDE for Unix/X11 - documentation
+Replaces: kdevelop (<< 2:2.0-0)
+Recommends: kdevelop (>> 3:2.0-final-0)
+Description: Documentation for the kdevelop package
KDevelop is an easy to use Integrated Development Environment
for developing C/C++ applications under X11. It features
project management, an advanced editor, a class browser
@@ -37,10 +38,9 @@
Package: kdevelop-data
Architecture: all
-Depends: kdevelop (= ${Source-Version})
-Recommends: make
-Suggests: libqt-dev, qt-doc, kdbg, kdelibs-dev, kdebase, kdelibs3-doc, htdig, sgmltools, gettext, a2ps, enscript, gv, qt-designer | kde-designer, glimpse, ark, kpaint, kbabel, kiconedit, gdb, kdesdk-scripts, graphviz
-Description: An IDE for Unix/X11 - data
+Depends: kdevelop (= ${Source-Version}), ${perl:Depends}
+Replaces: kdevelop (<< 2:2.0-0)
+Description: Platform independent data files for the kdevelop package
KDevelop is an easy to use Integrated Development Environment
for developing C/C++ applications under X11. It features
project management, an advanced editor, a class browser
@@ -49,4 +49,4 @@
The application wizard can generate fully functional projects
for terminal programs and GUI programs using Qt, KDE or GNOME.
.
- This package contains arch independent datas for KDevelop.
+ This package contains arch independent data for KDevelop.
--- kdevelop-2.1.2/debian/debianrules Tue Jul 2 21:41:32 2002
+++ kdevelop-2.1.2.old/debian/debianrules Sun Jun 30 01:42:37 2002
@@ -13,12 +13,12 @@
foreach $dir (@packages) {
chomp $dir;
next if (! -d $dir);
- foreach $file (qw{postinst postrm preinst prerm}) {
+ foreach $file (qw{postinst postrm preinst prerm}) {
next if (! -f "$dir/$file");
$found = 0;
open(IN, "$dir/$file");
open(OUT, ">/tmp/kde.dpkg");
- while (<IN>) {
+ while (<IN>) {
if (/^#KDEHELPER#/) {
$found = 1;
if (-d $dir . "/../usr/lib/mime/packages") {
@@ -42,12 +42,12 @@
print OUT "esac\n";
}
}
-
+
next;
}
- print OUT $_;
+ print OUT $_ . "\n";
}
-
+
close IN;
close OUT;
@@ -56,7 +56,7 @@
} else {
mv("/tmp/kde.dpkg", "$dir/$file");
chown("root.root","dir/$file");
- chmod(0755,"$dir/$file");
+ chmod(0755,"$dir/$file");
}
}
}
@@ -76,6 +76,14 @@
exit;
}
+if (@ARGV && $ARGV[0] eq 'kdevelop_postinst') {
+open FILE, ">debian/kdevelop.postinst";
+print FILE "#!/bin/sh\n\nset -e\n\nldconfig\n\n#DEBHELPER#";
+close FILE;
+
+exit;
+}
+
$QTDIR="/usr/share/qt";
$kde_prefix="/usr";
$kde_htmldir="$kde_prefix/share/doc/kde/HTML";
@@ -83,7 +91,7 @@
$kde_sounddir="$kde_prefix/share/sounds";
$kde_datadir="$kde_prefix/share/apps";
$kde_locale="$kde_prefix/share/locale";
-$kde_confdir="/etc/kde2";
+$kde_confdir="/etc/kde3";
$kde_cgidir="$kde_prefix/lib/cgi-bin";
$kde_appsdir="$kde_prefix/share/applnk";
$kde_mimedir="$kde_prefix/share/mimelnk";
@@ -93,7 +101,7 @@
$kde_servicetypesdir="$kde_prefix/share/servicetypes";
$kde_includedir="$kde_prefix/include/kde";
$kde_libdir="$kde_prefix/lib";
-$mandir="$kde_prefix/share/man";
+$mandir="$kde_prefix/share/man";
$infodir="$kde_prefix/share/info";
$IDL="$kde_bindir/cuteidl";
$DCOPIDL="$kde_bindir/dcopidl";
@@ -130,20 +138,15 @@
print STDOUT "export MCOPIDL=$MCOPIDL\n";
print STDOUT "export ARTSCCONFIG=$ARTSCCONFIG\n";
print STDOUT "configkde=--disable-debug --disable-rpath --prefix=\$(kde_prefix) --libexecdir=\$(kde_bindir) --with-qt-includes=/usr/include/qt --mandir=\$(mandir) --infodir=\$(infodir)\n";
- print STDOUT "configkdevelop=--disable-debug --enable-docbase --enable-kdoc2 --disable-rpath --libdir=\$(kde_libdir) --includedir=\$(kde_includedir) --with-qt-includes=/usr/include/qt --mandir=\$(mandir) --with-kdelibsdoc-dir=/usr/share/doc/kdelibs3-doc/html\n";
+ print STDOUT "configkdevelop=--disable-debug --enable-docbase --enable-kdoc2 --disable-rpath --libdir=\$(kde_libdir) --includedir=\$(kde_includedir) --with-qt-includes=/usr/include/qt --mandir=\$(mandir) --with-kdelibsdoc-dir=/usr/share/doc/kdelibs4-doc/html\n";
exit
}
-if (@ARGV && $ARGV[0]) {
- $package = $ARGV[0];
-} else {
- open(CHANGELOG,"debian/changelog")
- or die "can't read debian/changelog : $!\n";
- $_ = <CHANGELOG>;
- close(CHANGELOG);
- /^(.*) \((.*)\) /;
- $package = $1;
-}
+open(CHANGELOG,"debian/changelog") or die "can't read debian/changelog : $!\n";
+$_ = <CHANGELOG>;
+close(CHANGELOG);
+/^(.*) \((.*)\) /;
+$package = $1;
# Find documentation and install it
sub docwanted {
@@ -151,12 +154,13 @@
$dir =~ s/^$origPwd//;
if ($dir =~ /debian/) { return 0 ; }
if ($dir =~ /build/) { return 0 ; }
- if ( ( /debian/ ) or ( /^INSTALL$/ ) or ( /^LICENSE$/ )
- or ( /^ARTISTIC$/ ) or ( /^COPYING$/ ) ) { return 0 ; }
- if ( (! /CVS/ )
+ if ( ( /debian/ ) or ( /^INSTALL$/ ) or ( /^LICENSE$/ )
+ or ( /^ARTISTIC$/ ) or ( /^COPYING$/ ) ) { return 0 ; }
+ if ( (! /CVS/ )
and ( /^[A-Z]*$/ or /^README$/ or /^ChangeLog$/ or /lsm$/ or /SWALLOW/
- or /^TODO$/ or /^kdedoc$/ or /Header/ or /Documentation/ or /Tutorial/ ) )
- {
+ or /^TODO$/ or /^kdedoc$/ or /Header/ or /Documentation/ or
+ /Tutorial/ or /README\.htdig/ ) )
+ {
if ($dir) {
$_ = "$dir/$_";
$_ =~ s/^\///;
@@ -181,9 +185,9 @@
if (@docs) {
chdir($origPwd);
- cp( "-aP", @docs, "debian/tmp/usr/share/doc/$package") ;
+ cp( "-a", @docs, "debian/tmp/usr/share/doc/$package") ;
if (-f "debian/tmp/usr/share/doc/$package/ChangeLog") {
- mv("debian/tmp/usr/share/doc/$package/ChangeLog",
+ mv("debian/tmp/usr/share/doc/$package/ChangeLog",
"debian/tmp/usr/share/doc/$package/changelog");
}
if (-f "debian/tmp/usr/share/doc/$package/CHANGES") {
@@ -192,7 +196,7 @@
}
}
-if (@ARGV && $ARGV[0] eq 'docbase') {
+if (@ARGV && $ARGV[0] eq 'docbase') {
# Create doc-base file
if (-d "debian/doc-base") {
@@ -218,18 +222,6 @@
find(\&findkdelnk,"debian/tmp/$kde_appsdir");
}
-if (-e "debian/menu.in") {
- open MENUIN, "debian/menu.in" ;
- while (<MENUIN>) {
- chop ;
- ($prog,$type,$sect) = split / /;
- $type{$prog}=$type;
- $sect{$prog}=$sect;
- }
- close MENUIN;
-}
-
-open MENU, ">debian/menu" or die "can't open debian/menu : $!\n";
open MIME, ">debian/mailcap" or die "can't open debian/mailcap : $!\n";
foreach $file (@lnkfiles) {
@@ -273,51 +265,45 @@
}
- ($prog,)=split / /, $kdelnk{"Exec"} ;
- if (! defined($type{$prog})) {
- open MENUIN, ">>debian/menu.in" ;
- print MENUIN "$prog x11 NONE\n";
- close MENUIN;
- next ;
- }
- if ($sect{$prog} eq "NONE") { next ; }
$icon="";
if (not defined $kdelnk{"Name"}) {
print STDERR "No Name : $package $kdelnk\n";
next ;
}
if (defined $kdelnk{"Icon"}) {
- $icon=$kdelnk{"Icon"} ;
- if (! -f "debian/tmp/$kde_icondir/mini/$prog.png" ) {
- $icon="";
- } else {
- $icon="/$kde_icondir/mini/$prog.png";
- }
+ $icon=$kdelnk{"Icon"} ;
+ if (! -f "debian/tmp/$kde_icondir/mini/$package.png" ) {
+ $icon="";
+ } else {
+ $icon="/$kde_icondir/mini/$package.png";
+ }
}
($kdelnk=$file) =~ s/^.*tmp// ;
- print MENU "?package($package):\\\n" ;
- print MENU " needs=$type{$prog}\\\n" ;
- print MENU " section=$sect{$prog}\\\n" ;
- print MENU " hints=\"KDE\"\\\n" ;
- print MENU " title=\"$kdelnk{Name}\"\\\n" ;
- print MENU " command=$prog\\\n" ;
- print MENU " icon=\"$icon\"\n\n" ;
-
}
-if (-e "debian/menu.add") {
- open MENUADD, "debian/menu.add" ;
- while (<MENUADD>) {
- print MENU $_ ;
+if ((! -e "debian/menu") || (-z "debian/menu")) {
+ open MENU, ">debian/menu" or die "can't open debian/menu : $!\n";
+ print MENU "?package($package):\\\n" ;
+ print MENU " needs=x11\\\n" ;
+ print MENU " section=Apps/Programming\\\n" ;
+ print MENU " hints=\"KDE\"\\\n" ;
+ print MENU " title=\"KDevelop\"\\\n" ;
+ print MENU " command=kdevelop" ;
+ if (-f $icon ) {
+ print MENU "\\\n icon=$icon";
+ }
+
+ if (-e "debian/menu.add") {
+ open MENUADD, "debian/menu.add" ;
+ while (<MENUADD>) {
+ print MENU $_ ;
+ }
+ close MENUADD;
}
- close MENUADD;
+ close MENU;
}
close MENU;
-
-if (-z "debian/menu") {
- rm("debian/menu");
-}
close MIME;
--- kdevelop-2.1.2/debian/htdig.conf Wed Dec 31 16:00:00 1969
+++ kdevelop-2.1.2.old/debian/htdig.conf Sun Jun 30 01:42:37 2002
@@ -0,0 +1,66 @@
+#=======================================================================
+#
+# Example config file for ht://Dig.
+#
+database_dir: /HOMEDIR/.kde/share/apps/kdevelop/htdig/db
+limit_urls_to: file://
+exclude_urls: /cgi-bin/ .cgi
+maintainer: unconfigured at htdig.searchengine.maintainer
+max_head_length: 10000
+max_doc_size: 200000
+search_algorithm: exact:1 synonyms:0.5 endings:0.1
+
+common_dir: /HOMEDIR/.kde/share/apps/kdevelop/htdig/common
+maximum_pages: 1
+ignore_noindex: true
+
+#
+# The following are the templates used in the builtin search results
+# The default is to use compiled versions of these files, which produces
+# slightly faster results. However, uncommenting these lines makes it
+# very easy to change the format of search results.
+# See <http://www.htdig.org/hts_templates.html for more details.
+#
+# template_map: Long long ${common_dir}/long.html \
+# Short short ${common_dir}/short.html
+# template_name: long
+
+#
+# The following are used to change the text for the page index.
+# The defaults are just boring text numbers. These images spice
+# up the result pages quite a bit. (Feel free to do whatever, though)
+#
+next_page_text: <img src=/var/www/htdig/buttonr.png border=0 align=middle width=30 height=30 alt=next>
+no_next_page_text:
+prev_page_text: <img src=/var/www/htdig/buttonl.png border=0 align=middle width=30 height=30 alt=prev>
+no_prev_page_text:
+page_number_text: "<img src=/var/www/htdig/button1.gif border=0 align=middle width=30 height=30 alt=1>" \
+ "<img src=/var/www/htdig/button2.png border=0 align=middle width=30 height=30 alt=2>" \
+ "<img src=/var/www/htdig/button3.gif border=0 align=middle width=30 height=30 alt=3>" \
+ "<img src=/var/www/htdig/button4.gif border=0 align=middle width=30 height=30 alt=4>" \
+ "<img src=/var/www/htdig/button5.gif border=0 align=middle width=30 height=30 alt=5>" \
+ "<img src=/var/www/htdig/button6.gif border=0 align=middle width=30 height=30 alt=6>" \
+ "<img src=/var/www/htdig/button7.gif border=0 align=middle width=30 height=30 alt=7>" \
+ "<img src=/var/www/htdig/button8.gif border=0 align=middle width=30 height=30 alt=8>" \
+ "<img src=/var/www/htdig/button9.gif border=0 align=middle width=30 height=30 alt=9>" \
+ "<img src=/var/www/htdig/button10.gif border=0 align=middle width=30 height=30 alt=10>"
+#
+# To make the current page stand out, we will put a border arround the
+# image for that page.
+#
+no_page_number_text: "<img src=/var/www/htdig/button1.png border=2 align=middle width=30 height=30 alt=1>" \
+ "<img src=/var/www/htdig/button2.gif border=2 align=middle width=30 height=30 alt=2>" \
+ "<img src=/var/www/htdig/button3.gif border=2 align=middle width=30 height=30 alt=3>" \
+ "<img src=/var/www/htdig/button4.gif border=2 align=middle width=30 height=30 alt=4>" \
+ "<img src=/var/www/htdig/button5.gif border=2 align=middle width=30 height=30 alt=5>" \
+ "<img src=/var/www/htdig/button6.gif border=2 align=middle width=30 height=30 alt=6>" \
+ "<img src=/var/www/htdig/button7.gif border=2 align=middle width=30 height=30 alt=7>" \
+ "<img src=/var/www/htdig/button8.gif border=2 align=middle width=30 height=30 alt=8>" \
+ "<img src=/var/www/htdig/button9.gif border=2 align=middle width=30 height=30 alt=9>" \
+ "<img src=/var/www/htdig/button10.gif border=2 align=middle width=30 height=30 alt=10>"
+
+star_image: file://localhost/var/www/htdig/star.png
+star_blank: file://localhost/var/www/htdig/star_blank.png
+
+# local variables:
+local_urls: file://localhost=
--- kdevelop-2.1.2/debian/kdevelop.postinst Wed Dec 31 16:00:00 1969
+++ kdevelop-2.1.2.old/debian/kdevelop.postinst Sun Jun 30 01:42:37 2002
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+set -e
+
+ldconfig
+
+#DEBHELPER#
\ No newline at end of file
--- kdevelop-2.1.2/debian/mailcap Wed Dec 31 16:00:00 1969
+++ kdevelop-2.1.2.old/debian/mailcap Sun Jun 30 01:42:37 2002
@@ -0,0 +1 @@
+application/x-kdevelop-project; kdevelop -caption "KDevelop 2.1.2" %s;test=test "$DISPLAY" != ""; priority=7
--- kdevelop-2.1.2/debian/menu Tue Jul 2 21:41:32 2002
+++ kdevelop-2.1.2.old/debian/menu Sun Jun 30 01:42:37 2002
@@ -3,4 +3,13 @@
section=Apps/Programming\
hints="KDE"\
title="KDevelop"\
- command=kdevelop
+ kderemove="y"\
+ command="/usr/bin/kdevelop"
+
+?package(kdevelop):\
+ needs=x11\
+ section=Apps/Programming\
+ hints="KDE"\
+ title="KDevelop Setup"\
+ kderemove="y"\
+ command="/usr/bin/kdevelop --setup"
--- kdevelop-2.1.2/debian/postinst Tue Jul 2 21:41:32 2002
+++ kdevelop-2.1.2.old/debian/postinst Sun Jun 30 01:42:37 2002
@@ -25,3 +25,4 @@
#DEBHELPER#
exit 0
+
--- kdevelop-2.1.2/debian/prerm Tue Jul 2 21:41:32 2002
+++ kdevelop-2.1.2.old/debian/prerm Sun Jun 30 01:42:37 2002
@@ -10,14 +10,6 @@
exit 0
;;
esac
-
-if [ "$1" = remove -o "$1" = upgrade ] && \
- command -v install-docs >/dev/null 2>&1; then
- install-docs -r kdevelop-kdelibref
- install-docs -r kdevelop-tutorial
- install-docs -r kdevelop-programming
- install-docs -r kdevelop-user
-fi
# dh_installdeb will replace this with shell code automatically
# generated by other debhelper scripts.
--- kdevelop-2.1.2/debian/rules Tue Jul 2 21:41:32 2002
+++ kdevelop-2.1.2.old/debian/rules Sun Jun 30 01:42:37 2002
@@ -7,6 +7,17 @@
-include debian/debiandirs
+ARCH=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
+ifeq ($(ARCH),alpha)
+ COMPILER_FLAGS=CFLAGS="-O0 -mieee" CXXFLAGS="-O0 -mieee -ftemplate-depth-99"
+else
+ COMPILER_FLAGS=CXXFLAGS="-ftemplate-depth-99"
+endif
+
+build: build-stamp
+
+-include debian/debiandirs
+
debian/debiandirs: debian/debianrules
perl -w debian/debianrules echodirs > debian/debiandirs
@@ -16,50 +27,77 @@
if test ! -f configure; then \
$(MAKE) -f admin/Makefile.common ;\
fi
+ $(COMPILER_FLAGS) \
./configure $(configkdevelop)
touch configure-stamp
-build: configure-stamp build-stamp
-build-stamp:
- dh_testdir
+build: build-stamp
+build-stamp: configure
$(MAKE)
touch build-stamp
debian-clean:
dh_testdir
- rm -f build-stamp configure-stamp
- dh_clean
-
+ -rm -f build-stamp configure-stamp
+ -rm -f debian/debiandirs
+ -rm -f debian/files
+ dh_clean -k
+
clean: debian-clean
- -rm -f debian/debiandirs
- if test -d CVS; then \
- make -f admin/Makefile.common cvs-clean ;\
- fi
-make distclean
install: build
- dh_testdir
dh_testroot
- dh_clean -k
- dh_installdirs
- install -d debian/tmp/etc/kde2
+ dh_testdir
+ dh_clean -a
+ install -d debian/tmp/etc/kde3
$(MAKE) prefix=/usr DESTDIR=`pwd`/debian/tmp/ install
- -rm -rf debian/tmp/usr/bin/extractrc
- cp kdevelop/kdeveloprc debian/tmp/etc/kde2/
- #perl -w debian/debianrules cleanup
- #perl -w debian/debianrules docbase -a
-
-binary-indep:
+ -rm -rf debian/tmp/home debian/tmp/blah \
+ debian/tmp/usr/share/applnk/Development/designer.desktop \
+ debian/tmp/usr/share/applnk/Development/linguist.desktop \
+ debian/tmp/usr/share/mimelnk/application/x-designer.desktop \
+ debian/tmp/usr/share/mimelnk/application/x-linguist.desktop \
+ debian/tmp/usr/bin/extractrc
+ cp kdevelop/kdeveloprc debian/tmp/etc/kde3/
+ perl -w debian/debianrules cleanup
+ perl -w debian/debianrules docbase
+ perl -w debian/debianrules kdevelop_postinst
+ install -d debian/tmp/usr/share/doc/kdevelop/examples
+ install -g root -m 644 debian/htdig.conf \
+ debian/tmp/usr/share/doc/kdevelop/examples
+ install -g root -m 644 debian/README-htdig.Debian \
+ debian/tmp/usr/share/doc/kdevelop
+ install -d debian/tmp/usr/share/doc/kdevelop/updates
+ install -g root -m 644 admin/conf.change.pl \
+ debian/tmp/usr/share/doc/kdevelop/updates
+ install -g root -m 644 admin/config.pl \
+ debian/tmp/usr/share/doc/kdevelop/updates
+ install -g root -m 644 debian/README-automake1.5.Debian \
+ debian/tmp/usr/share/doc/kdevelop
+
+build-indep: install
+ chmod 755 debian/tmp/usr/share/apps/kdevelop/tools/*
dh_movefiles -i
dh_undocumented -i
dh_installmenu -i
dh_installdocs -i
dh_installchangelogs -i
dh_compress -X.database -i
+ dh_perl -i
+ dh_fixperms -i
+
+binary-indep: build-indep
+ -rm -f debian/files
+# dpkg-distaddfile kdevelop-doc doc optional
+# dpkg-distaddfile kdevelop-data devel optional
+ dh_installdeb -i
+ dh_gencontrol -i
+ dh_md5sums -i
+ dh_builddeb -i
-binary-arch:
+build-arch: install
dh_movefiles -a
dh_undocumented -a
dh_installmenu -a
@@ -67,20 +105,29 @@
dh_installchangelogs -a
dh_strip -a
dh_compress -X.database -a
-
+ dh_fixperms -a
+ dh_makeshlibs -a
+ dh_fixperms -a
+
+binary-arch: build-arch
+ -rm -f debian/files
+# dpkg-distaddfile kdevelop devel optional
+ dh_installdeb -a
+ dh_shlibdeps -a
+ dh_gencontrol -a
+ dh_md5sums -a
+ dh_builddeb -a
+
# Below here is fairly generic really
-binary: install binary-arch binary-indep
+binary: install build-indep build-arch
dh_fixperms
- #dh_makeshlibs
dh_installdeb
-# dh_perl
dh_shlibdeps
dh_gencontrol
dh_md5sums
dh_builddeb
-
# Install local without making a package
install-local:
@@ -88,5 +135,3 @@
sudo $(MAKE) prefix=/usr install
.PHONY: binary binary-arch binary-indep clean install install-local
-
-
More information about the KDevelop-devel
mailing list