KDE_3_3_BRANCH: kdegames/debian

2004-12-18 Thread Daniel Schepler
CVS commit by schepler: 

kdegames 4:3.3.2-0pre1 packaging.


  M +0 -3  atlantik-dev.install   1.2.4.1
  M +7 -0  changelog   1.66.2.3
  M +1 -1  control   1.72.2.3
  M +0 -1  kolf-dev.install   1.2.2.1
  M +0 -1  libkdegames-dev.install   1.4.4.1
  M +1 -1  rules   1.57.2.3
  M +16 -3 patches/03_automake1.8.diff   1.1.2.2
  M +1 -1  patches/04_disable_static_la_final.diff   1.1.2.2


--- kdegames/debian/atlantik-dev.install  #1.2:1.2.4.1
@@ -1,7 +1,4 @@
 debian/tmp/usr/include/kde/atlantik
 debian/tmp/usr/include/kde/atlantic
-debian/tmp/usr/lib/libatlantic.a
-debian/tmp/usr/lib/libatlantikclient.a
-debian/tmp/usr/lib/libatlantikui.a
 debian/tmp/usr/lib/libatlantic.so
 debian/tmp/usr/lib/libatlantikclient.so

--- kdegames/debian/changelog  #1.66.2.2:1.66.2.3
@@ -1,2 +1,9 @@
+kdegames (4:3.3.2-0pre1) experimental; urgency=low
+
+  * New upstream release.
+  * Drop useless static libs.
+
+ -- Daniel Schepler [EMAIL PROTECTED]  Fri, 17 Dec 2004 21:55:40 -0800
+
 kdegames (4:3.3.1-1) unstable; urgency=low
 

--- kdegames/debian/control  #1.72.2.2:1.72.2.3
@@ -1,4 +1,4 @@
 Source: kdegames
-Build-Depends: cdbs, debhelper (= 4.2.21), autoconf (= 2.50), automake1.8, 
libtool, kdelibs4-dev (= 4:3.3.0), libarts1-dev, groff-base, doxygen, qt3-doc, 
kdelibs4-doc, sharutils
+Build-Depends: cdbs, debhelper (= 4.2.21), autoconf (= 2.50), automake1.9, 
libtool, kdelibs4-dev (= 4:3.3.2), libarts1-dev, groff-base, doxygen, qt3-doc, 
kdelibs4-doc, sharutils
 Section: games
 Priority: optional

--- kdegames/debian/kolf-dev.install  #1.2:1.2.2.1
@@ -1,3 +1,2 @@
 debian/tmp/usr/include/kde/kolf
-debian/tmp/usr/lib/libkolf.a
 debian/tmp/usr/lib/libkolf.so

--- kdegames/debian/libkdegames-dev.install  #1.4:1.4.4.1
@@ -1,5 +1,4 @@
 debian/tmp/usr/include/kde/*.h
 debian/tmp/usr/include/kde/kgame
-debian/tmp/usr/lib/libkdegames.a
 debian/tmp/usr/lib/libkdegames.so
 debian/tmp/usr/lib/libkdegames.la

--- kdegames/debian/rules  #1.57.2.2:1.57.2.3
@@ -12,5 +12,5 @@
 DEB_KDE_APIDOX := yes
 
-DEB_CONFIGURE_EXTRA_FLAGS := --enable-shared --enable-static
+DEB_CONFIGURE_EXTRA_FLAGS := --enable-shared --disable-static
 
 post-patches:: debian/stamp-libtool-update

--- kdegames/debian/patches/03_automake1.8.diff  #1.1.2.1:1.1.2.2
@@ -5,12 +5,25 @@
 diff -u -r1.13 detect-autoconf.sh
 --- admin/detect-autoconf.sh24 May 2004 11:36:58 -  1.13
-+++ admin/detect-autoconf.sh2 Aug 2004 23:04:15 -
-@@ -11,7 +11,7 @@
 admin/detect-autoconf.sh6 Nov 2004 20:05:20 -
+@@ -10,8 +10,8 @@
+ # Please add higher versions first. The last version number is the minimum
  # needed to compile KDE. Do not forget to include the name/version #
  # separator if one is present, e.g. -1.2 where - is the separator.
- KDE_AUTOCONF_VERS=-2.58 -2.57 257 -2.54 -2.53a -2.53 -2.52 -2.5x
+-KDE_AUTOCONF_VERS=-2.58 -2.57 257 -2.54 -2.53a -2.53 -2.52 -2.5x
 -KDE_AUTOMAKE_VERS=-1.7 17 -1.6
++KDE_AUTOCONF_VERS=-2.58 -2.57 257 -2.54 -2.53a -2.53 -2.52 -2.5x 2.50
 +KDE_AUTOMAKE_VERS=-1.9 -1.8 -1.7 17 -1.6
  
  # We don't use variable here for remembering the type ... strings. Local 
  # variables are not that portable, but we fear namespace issues with our
+@@ -22,7 +22,9 @@
+ if test -x `$WHICH $AUTOCONF$kde_autoconf_version 2/dev/null`; then
+   AUTOCONF=`$WHICH $AUTOCONF$kde_autoconf_version`
+   AUTOHEADER=`$WHICH $AUTOHEADER$kde_autoconf_version`
+-  AUTOM4TE=`$WHICH $AUTOM4TE$kde_autoconf_version`
++  if test -x `$WHICH $AUTOM4TE$kde_autoconf_version 2/dev/null`; then
++   AUTOM4TE=`$WHICH $AUTOM4TE$kde_autoconf_version`
++  fi
+   break
+   fi
+   done

--- kdegames/debian/patches/04_disable_static_la_final.diff  #1.1.2.1:1.1.2.2
@@ -24,5 +24,5 @@
 +  else
 +   KDE_USE_FINAL_LA_TRUE=
-+   KDE_USE_FINAL_LA_FALSE=
++   KDE_USE_FINAL_LA_FALSE=#
 +  fi
 else




KDE_3_3_BRANCH: kdegames/debian

2004-10-31 Thread Daniel Schepler
CVS commit by schepler: 

kdegames 3.3.1 packaging


  Apatches/03_automake1.8.diff   1.1.2.1
  Apatches/04_disable_static_la_final.diff   1.1.2.1
  M +13 -0 changelog   1.66.2.2
  M +1 -1  control   1.72.2.2
  M +3 -0  kde.mk   1.2.2.2
  M +2 -2  rules   1.57.2.2


--- kdegames/debian/changelog  #1.66.2.1:1.66.2.2
@@ -1,2 +1,15 @@
+kdegames (4:3.3.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * Rename 01_kdegames_branch.diff to 10_kdegames_branch.diff.
+  * New patch 04_disable_static_la_final.diff, to keep --enable-final
+from messing up the static libraries.
++ debian/rules: Reenable --enable-final.
+  * kde.mk: Add calls to dh_desktop.
++ debian/control: Build-Depends on debhelper (= 4.2.21) to ensure
+  dh_desktop is available.
+
+ -- Daniel Schepler [EMAIL PROTECTED]  Sun, 31 Oct 2004 12:29:16 -0800
+
 kdegames (4:3.3.0-1) unstable; urgency=low
 

--- kdegames/debian/control  #1.72.2.1:1.72.2.2
@@ -1,4 +1,4 @@
 Source: kdegames
-Build-Depends: cdbs, debhelper ( 4.1.0), autoconf (= 2.50), automake1.8, 
libtool, kdelibs4-dev (= 4:3.3.0), libarts1-dev, groff-base, doxygen, qt3-doc, 
kdelibs4-doc, sharutils
+Build-Depends: cdbs, debhelper (= 4.2.21), autoconf (= 2.50), automake1.8, 
libtool, kdelibs4-dev (= 4:3.3.0), libarts1-dev, groff-base, doxygen, qt3-doc, 
kdelibs4-doc, sharutils
 Section: games
 Priority: optional

--- kdegames/debian/kde.mk  #1.2.2.1:1.2.2.2
@@ -98,3 +98,6 @@
 done
 
+$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
+if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) 
$(DEB_DH_DESKTOP_ARGS); fi
+
 endif

--- kdegames/debian/rules  #1.57.2.1:1.57.2.2
@@ -1,6 +1,6 @@
 #! /usr/bin/make -f
 
-include debian/kde.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
+include debian/kde.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/rules/utils.mk
@@ -9,5 +9,5 @@
 
 DEB_KDE_CVS_MAKE := yes
-#DEB_KDE_ENABLE_FINAL := yes
+DEB_KDE_ENABLE_FINAL := yes
 DEB_KDE_APIDOX := yes
 




KDE_3_3_BRANCH: kdegames/debian

2004-08-28 Thread Daniel Schepler
CVS commit by schepler: 

Packaging for kdegames_3.3.0-1.


  Aatlantik.links   1.1.2.1
  Akasteroids.links   1.1.2.1
  Akatomic.links   1.1.2.1
  Akbackgammon.links   1.1.2.1
  Akbattleship.links   1.1.2.1
  Akblackbox.links   1.1.2.1
  Akbounce.links   1.1.2.1
  Akenolaba.links   1.1.2.1
  Akfouleggs.links   1.1.2.1
  Akgoldrunner.links   1.1.2.1
  Akjumpingcube.links   1.1.2.1
  Aklickety.links   1.1.2.1
  Aklines.links   1.1.2.1
  Akmines.links   1.1.2.1
  Akolf.links   1.1.2.1
  Akonquest.links   1.1.2.1
  Akpat.links   1.1.2.1
  Akpoker.links   1.1.2.1
  Akreversi.links   1.1.2.1
  Aksame.links   1.1.2.1
  Akshisen.links   1.1.2.1
  Aksirtet.links   1.1.2.1
  Aksnake.links   1.1.2.1
  Aksokoban.links   1.1.2.1
  Akspaceduel.links   1.1.2.1
  Aktron.links   1.1.2.1
  Aktuberling.links   1.1.2.1
  Akwin4.links   1.1.2.1
  Alskat.links   1.1.2.1
  M +2 -1  atlantik.install   1.5.4.1
  M +6 -0  changelog   1.66.2.1
  M +1 -1  control   1.72.2.1
  M +3 -6  kde.mk   1.2.2.1
  M +4 -9  rules   1.57.2.1


--- kdegames/debian/atlantik.install  #1.5:1.5.4.1
@@ -6,5 +6,6 @@
 debian/tmp/usr/lib/libatlantikui.la
 debian/tmp/usr/lib/libatlantikui.so.*
-debian/tmp/usr/lib/kde3/kio_atlantik.*
+debian/tmp/usr/lib/kde3/kio_atlantik.la
+debian/tmp/usr/lib/kde3/kio_atlantik.so
 debian/tmp/usr/share/services/atlantik.protocol
 debian/tmp/usr/share/doc/kde/HTML/en/atlantik/*

--- kdegames/debian/changelog  #1.66:1.66.2.1
@@ -1,2 +1,8 @@
+kdegames (4:3.3.0-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Daniel Schepler [EMAIL PROTECTED]  Wed, 25 Aug 2004 22:33:05 -0400
+
 kdegames (4:3.2.92-1) experimental; urgency=low
 

--- kdegames/debian/control  #1.72:1.72.2.1
@@ -1,4 +1,4 @@
 Source: kdegames
-Build-Depends: cdbs, debhelper ( 4.1.0), autoconf (= 2.50), automake1.8, 
libtool, kdelibs4-dev (= 4:3.2.92), libarts1-dev, groff-base, doxygen, 
qt3-doc, kdelibs4-doc, sharutils, libidn11-dev
+Build-Depends: cdbs, debhelper ( 4.1.0), autoconf (= 2.50), automake1.8, 
libtool, kdelibs4-dev (= 4:3.3.0), libarts1-dev, groff-base, doxygen, qt3-doc, 
kdelibs4-doc, sharutils
 Section: games
 Priority: optional

--- kdegames/debian/kde.mk  #1.2:1.2.2.1
@@ -59,5 +59,5 @@
 DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
 DEB_CONFIGURE_INCLUDEDIR = \$${prefix}/include/kde
-DEB_COMPRESS_EXCLUDE := .dcl .docbook -license
+DEB_COMPRESS_EXCLUDE := .dcl .docbook -license .tag
 
 common-build-arch common-build-indep:: debian/stamp-apidox
@@ -90,13 +90,10 @@
 binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 set -e; \
-for pkg in `cd debian/tmp/usr/share/doc/kde/HTML/en; echo *`; do \
-if test -f 
$(CURDIR)/debian/tmp/usr/share/doc/kde/HTML/en/$$pkg/index.docbook; then \
+for doc in `cd debian/tmp/usr/share/doc/kde/HTML/en; find . -name 
index.docbook`; do \
+  pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
   echo Building $$pkg HTML docs...; \
   mkdir -p 
$(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/usr/share/doc/kde/HTML/en/$$pkg;
 \
   cd 
$(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/usr/share/doc/kde/HTML/en/$$pkg;
 \
   meinproc 
$(CURDIR)/debian/tmp/usr/share/doc/kde/HTML/en/$$pkg/index.docbook; \
-  mkdir -p $(CURDIR)/debian/$$pkg/usr/share/doc/$$pkg; \
-  ln -s ../kde/HTML/en/$$pkg 
$(CURDIR)/debian/$$pkg/usr/share/doc/$$pkg/html; \
-fi; \
 done
 

--- kdegames/debian/rules  #1.57:1.57.2.1
@@ -14,9 +14,5 @@
 DEB_CONFIGURE_EXTRA_FLAGS := --enable-shared --enable-static
 
-post-patches:: debian/stamp-konquest-icons-uu debian/stamp-libtool-update
-
-debian/stamp-konquest-icons-uu:
-uudecode -o - debian/patches/konquest_icons.tar.gz.uu | tar xfz -
-touch debian/stamp-konquest-icons-uu
+post-patches:: debian/stamp-libtool-update
 
 debian/stamp-libtool-update:
@@ -50,8 +46,7 @@
 clean::
 rm -f debian/man/*.6
-rm -f `uudecode -o - debian/patches/konquest_icons.tar.gz.uu | tar tfz 
-`
-rm -f debian/stamp-konquest-icons-uu \
-debian/stamp-libtool-update debian/stamp-man-pages
+rm -f debian/stamp-libtool-update debian/stamp-man-pages
 rm -f admin/libtool.m4.in admin/ltmain.sh
+rm -f Makefile.cvs
 
 DEB_INSTALL_DOCS_ALL :=
@@ -61,5 +56,5 @@
 DEB_INSTALL_CHANGELOGS_kdegames := ChangeLog
 
-DEB_DH_MAKESHLIBS_ARGS_libkdegames1 := -V'libkdegames1 (= 4:3.2.92)'
+DEB_DH_MAKESHLIBS_ARGS_libkdegames1 := -V'libkdegames1 (= 4:3.3.0)'
 DEB_DH_MAKESHLIBS_ARGS_atlantik := -V
 DEB_DH_MAKESHLIBS_ARGS_kolf := -V