KDE_3_4_BRANCH: kdesdk/debian

2005-03-07 Thread Ben Burton
CVS commit by benb: 

Bring patches up to date.


  M +1 -1  rules   1.57.4.2
  M +2 -2  patches/kde-buildrc.diff   1.1.4.2
  M +2 -2  patches/kmtrace.diff   1.1.4.2
  M +6 -6  patches/pod2man.diff   1.3.4.2
  Rpatches/poxml.diff   1.1.6.1


--- kdesdk/debian/rules  #1.57.4.1:1.57.4.2
@@ -48,5 +48,5 @@
 # Make absolutely sure these aren't left around from the .orig.tar.gz.
 -rm -f kmtrace.shlibs kmtrace.override kmtrace.README.Debian
--rm -f patches/python.diff
+-rm -f patches/python.diff patches/poxml.diff
 
 # Apply Debian specific patches

--- kdesdk/debian/patches/kde-buildrc.diff  #1.1.4.1:1.1.4.2
@@ -1,5 +1,5 @@
 --- kdesdk/scripts/kde-build17 Mar 2004 01:54:37 -  1.107
 +++ kdesdk/scripts/kde-build15 Oct 2004 06:56:51 -
-@@ -869,6 +869,9 @@ The following error codes are returned b
+@@ -953,6 +953,9 @@ The following error codes are returned b
  
  cd ~/scripts/; vi ./kde-buildrc; ./kde-build
@@ -10,3 +10,3 @@
  =head1 BUGS
  
- Lots, mostly that the script wasn't written with portability in mind
+ Probably.

--- kdesdk/debian/patches/kmtrace.diff  #1.1.4.1:1.1.4.2
@@ -11,6 +11,6 @@
  libktrace_s_a_SOURCES = ktrace_s.c
  
- ktrace_s.c: ktrace.c
-$(LN_S) $< $@
+ ktrace_s.c: $(srcdir)/ktrace.c
+$(LN_S) $(srcdir)/ktrace.c $@
  
 -lib_LTLIBRARIES = libktrace.la

--- kdesdk/debian/patches/pod2man.diff  #1.3.4.1:1.3.4.2
@@ -8,19 +8,19 @@
 +
  kde-build.1: kde-build
--   pod2man $< > $@
+-   pod2man $(srcdir)/kde-build > $@
 +   pod2man $(pod2man_options) $< > $@
  cvsversion.1: cvsversion
--   pod2man $< > $@
+-   pod2man $(srcdir)/cvsversion > $@
 +   pod2man $(pod2man_options) $< > $@
  cvscheck.1: cvscheck
--   pod2man $< > $@
+-   pod2man $(srcdir)/cvscheck > $@
 +   pod2man $(pod2man_options) $< > $@
  noncvslist.1: noncvslist
--   pod2man $< > $@
+-   pod2man $(srcdir)/noncvslist > $@
 +   pod2man $(pod2man_options) $< > $@
  cvsblame.1: cvsblame
--   pod2man $< > $@
+-   pod2man $(srcdir)/cvsblame > $@
 +   pod2man $(pod2man_options) $< > $@
  includemocs.1: includemocs
--   pod2man $< > $@
+-   pod2man $(srcdir)/includemocs > $@
 +   pod2man $(pod2man_options) $< > $@



-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]



KDE_3_4_BRANCH: kdeaddons/debian

2005-03-07 Thread Ben Burton
CVS commit by benb: 

Remove patch that is no longer necessary.


  M +3 -0  rules   1.20.4.2
  Rpatches/db++.diff   1.2


--- kdeaddons/debian/rules  #1.20.4.1:1.20.4.2
@@ -45,4 +45,7 @@
 dh_testdir
 
+# Make absolutely sure these aren't left around from the .orig.tar.gz.
+-rm -f debian/patches/db++.diff
+
 # Apply Debian specific patches
 if test ! -f patch-stamp; then \



-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]