Where is the latest source of kschoolmenu?
The version of kschoolmenu in Skolelinux CVS was 0.04-1, while the
version on the CD is 0.05-2. Where is the source of the version on
the CD, and why isn't it in Skolelinux CVS?
I have some patches, and have commited them to CVS, and discovered
just now that I was obviously patching an old version.
Anyone know what is going on?
This is my patch:
Index: Xsession.d/25kschoolmenu-kdedirs
===================================================================
RCS file: /var/lib/cvs/skolelinux/src/kschoolmenu/Xsession.d/25kschoolmenu-kdedirs,v
retrieving revision 1.1
retrieving revision 1.3
diff -u -3 -p -u -r1.1 -r1.3
--- Xsession.d/25kschoolmenu-kdedirs 22 Apr 2003 01:01:59 -0000 1.1
+++ Xsession.d/25kschoolmenu-kdedirs 15 Feb 2004 20:55:16 -0000 1.3
@@ -1,4 +1,3 @@
-#!/bin/bash
KDEDIRS_ORG="$KDEDIRS"
KDEDIRS=""
@@ -10,5 +9,7 @@ for GROUP in $(groups) ; do
done
if [ -n "$KDEDIRS" ] ; then
- export KDEDIRS=$KDEDIRS:$KDEDIRS_ORG
+ export KDEDIRS="$KDEDIRS:$KDEDIRS_ORG"
+else
+ export KDEDIRS="$KDEDIRS_ORG"
fi
Index: debian/changelog
===================================================================
RCS file: /var/lib/cvs/skolelinux/src/kschoolmenu/debian/changelog,v
retrieving revision 1.4
retrieving revision 1.7
diff -u -3 -p -u -r1.4 -r1.7
--- debian/changelog 29 Apr 2003 19:40:02 -0000 1.4
+++ debian/changelog 15 Feb 2004 21:18:34 -0000 1.7
@@ -1,3 +1,22 @@
+kschoolmenu (0.05) UNRELEASED; urgency=low
+
+ * Get rid of some warnings and errors from lintian.
+ * Change section from 'unknown' to 'x11'.
+ * Fix typo in copyright file.
+ * Add some build-depends. I'm guessing on libjpeg-dev and libqt-dev.
+ * Use chrpath to remove rpath setting in libkcm_kschoolmenu.so.
+ Add build-depend on chrpath to make sure it is available.
+
+ -- Petter Reinholdtsen <pere@debian.org> Sun, 15 Feb 2004 21:52:58 +0100
+
+kschoolmenu (0.04-2) woody; urgency=low
+
+ * Make sure 25kschoolmenu-kdedirs restore KDEDIRS if the user
+ isn't member of any of the groups with their own KDE
+ configuration.
+
+ -- Petter Reinholdtsen <pere@debian.org> Sun, 15 Feb 2004 21:38:55 +0100
+
kschoolmenu (0.04-1) unstable; urgency=low
* Hidden menus are no longer displayed in the current menu
Index: debian/control
===================================================================
RCS file: /var/lib/cvs/skolelinux/src/kschoolmenu/debian/control,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -p -u -r1.2 -r1.3
--- debian/control 20 Apr 2003 21:24:07 -0000 1.2
+++ debian/control 15 Feb 2004 20:55:16 -0000 1.3
@@ -1,8 +1,8 @@
Source: kschoolmenu
-Section: unknown
+Section: x11
Priority: optional
Maintainer: Finn-Arne Johansen <finnarne@skolelinux.no>
-Build-Depends: debhelper (>> 3.0.0)
+Build-Depends: debhelper (>> 3.0.0), libjpeg-dev, libqt-dev, chrpath
Standards-Version: 3.5.2
Package: kschoolmenu
Index: debian/copyright
===================================================================
RCS file: /var/lib/cvs/skolelinux/src/kschoolmenu/debian/copyright,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -p -u -r1.2 -r1.3
--- debian/copyright 20 Apr 2003 21:24:07 -0000 1.2
+++ debian/copyright 15 Feb 2004 20:55:16 -0000 1.3
@@ -7,4 +7,4 @@ Upstream Author(s): Morten Hustveit <mor
Copyright:
-Dont know - Ask Morten
+Don't know - Ask Morten
Index: debian/rules
===================================================================
RCS file: /var/lib/cvs/skolelinux/src/kschoolmenu/debian/rules,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -p -u -r1.3 -r1.4
--- debian/rules 24 Apr 2003 02:38:38 -0000 1.3
+++ debian/rules 15 Feb 2004 20:55:16 -0000 1.4
@@ -62,6 +62,8 @@ install: build
# Add here commands to install the package into debian/kschoolmenu.
$(MAKE) install prefix=$(CURDIR)/debian/kschoolmenu/usr sysconfdir=$(CURDIR)/debian/kschoolmenu/etc
+ # Avoid lintian error, make sure no rpath is in the module.
+ chrpath -d $(CURDIR)/debian/kschoolmenu/usr/lib/kde2/libkcm_kschoolmenu.so
# Build architecture-independent files here.
binary-indep: build install
Index: kschoolmenu/Makefile.am
===================================================================
RCS file: /var/lib/cvs/skolelinux/src/kschoolmenu/kschoolmenu/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -p -u -r1.2 -r1.3
--- kschoolmenu/Makefile.am 22 Apr 2003 01:18:50 -0000 1.2
+++ kschoolmenu/Makefile.am 15 Feb 2004 21:27:37 -0000 1.3
@@ -11,7 +11,13 @@ libkcm_kschoolmenu_la_LIBADD = $(LIB_QT
libkcm_kschoolmenu_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
-EXTRA_DIST = kschoolmenu.cpp kschoolmenu.h
+EXTRA_DIST = kschoolmenu.cpp kschoolmenu.h
+
+# Make sure the .moc file is generated. Not sure why this isn't generated
+# as it should. [pere 2004-02-15]
+kschoolmenu.cpp: kschoolmenu.moc
+kschoolmenu.moc: kschoolmenu.h
+ moc $^ > $@
# These paths are KDE specific. Use them:
# kde_appsdir Where your application's menu entry (.desktop) should go
to.
Index: kschoolmenu/Makefile.in
===================================================================
RCS file: /var/lib/cvs/skolelinux/src/kschoolmenu/kschoolmenu/Makefile.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -p -u -r1.2 -r1.3
--- kschoolmenu/Makefile.in 22 Apr 2003 06:42:20 -0000 1.2
+++ kschoolmenu/Makefile.in 15 Feb 2004 21:27:37 -0000 1.3
@@ -233,6 +233,12 @@ libkcm_kschoolmenu_la_LDFLAGS = $(all_li
EXTRA_DIST = kschoolmenu.cpp kschoolmenu.h
+# Make sure the .moc file is generated. Not sure why this isn't generated
+# as it should. [pere 2004-02-15]
+kschoolmenu.cpp: kschoolmenu.moc
+kschoolmenu.moc: kschoolmenu.h
+ moc $^ > $@
+
data_DATA = kschoolmenu.desktop
datadir = $(kde_appsdir)/Settings/System
mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
Reply to: