[Pkg-jed-commit] r257 - in trunk/packages/jed/debian: . patches

[Jörg Sommer]

Author: jo-guest
Date: 2006-04-11 20:00:58 +0000 (Tue, 11 Apr 2006)
New Revision: 257

Added:
   trunk/packages/jed/debian/patches/00options
Modified:
   trunk/packages/jed/debian/changelog
   trunk/packages/jed/debian/control
   trunk/packages/jed/debian/patches/00list
   trunk/packages/jed/debian/rules
Log:
* jed/debian/control:
  + removed the version from the build dependency of debhelper and
    libgpmg1-dev; both packages in oldstable are newer than this version

  + added !kfreebsd-i386 to the build dependency of libgpmg1-dev; closes:
    #345268

* jed/debian/patches/00list:
  + removed the .dpatch extension from all names; it is not needed and
    makes the file confusing

  + added CPP #if-conditions to exclude the xrenderfont and gpm patches
    on kfreebsd_i386 and hurd_i386

* jed/debian/patches/00options:
  + added this file with DPATCH_OPTION_CPP=1 to enable CPP evaluation of
    00list before it is parsed by dpatch

* jed/debian/changelog:
  + extended changelog

  + changed version of the newest entry to 0.99.18-1

* jed/debian/rules:
  + added the target "get-orig-source"


Modified: trunk/packages/jed/debian/changelog
===================================================================
--- trunk/packages/jed/debian/changelog	2006-04-07 21:26:24 UTC (rev 256)
+++ trunk/packages/jed/debian/changelog	2006-04-11 20:00:58 UTC (rev 257)
@@ -1,9 +1,40 @@
-jed (0.99.17.165-1) experimental; urgency=low
+jed (0.99.18-1) experimental; urgency=low
 
   * New upstream release
 
- -- Debian JED Group <pkg-jed-devel at lists.alioth.debian.org>  Thu, 6 Apr 2006 15:58:21 +0200
+  * debian/control:
+    + the kfreebsd-i386 architecture does not have the package
+      libgmpg1-dev; removed it from the Build-Depends list for this
+      architecture (closes: #345268) [JS]
 
+    + removed the version condition from debhelper and libgmpg1-dev
+      in Build-Depends, because the packages in stable are newer than
+      this version. [JS]
+
+    + added the Uploaders: field [RL]
+
+  * debian/patches/00list:
+    + disabled xrender extension and gpm support on hurd-i386 and
+      kfreebsd-i386 now uniformly by dpatch [JS]
+
+  * debian/patches/50_jed.tex.dpatch:
+    + fixed the hevea warning on package build [JS]
+
+  * debian/rules:
+    + added a get-orig-source target to [JS]
+
+  * /etc/jed.d/05jed-common.sl:
+    + <to be written>
+
+  * /usr/share/jed/lib/defaults.sl:
+    + <to be written>
+
+  [JS] Jörg Sommer <joerg at alea.gnuu.de>
+  [GM] Guenter Milde
+  [RL] Rafael Laboissiere
+
+ -- Debian JED Group <pkg-jed-devel at lists.alioth.debian.org>  Tue, 11 Apr 2006 21:25:39 +0200
+
 jed (0.99.17.135-1) experimental; urgency=low
 
   +++ Changes by Rafael Laboissiere

Modified: trunk/packages/jed/debian/control
===================================================================
--- trunk/packages/jed/debian/control	2006-04-07 21:26:24 UTC (rev 256)
+++ trunk/packages/jed/debian/control	2006-04-11 20:00:58 UTC (rev 257)
@@ -4,7 +4,7 @@
 Maintainer: Debian JED Group <pkg-jed-devel at lists.alioth.debian.org>
 Uploaders: Rafael Laboissiere <rafael at debian.org>
 Standards-Version: 3.6.2
-Build-Depends: debhelper (>= 4), hevea, libgpmg1-dev (>= 1.17.8-18) [!hurd-i386], libslang2-dev, libxft-dev, libxt-dev, x-dev, dpatch
+Build-Depends: debhelper, hevea, libgpmg1-dev [!hurd-i386 !kfreebsd-i386], libslang2-dev, libxft-dev, libxt-dev, x-dev, dpatch
 
 Package: jed
 Architecture: any

Modified: trunk/packages/jed/debian/patches/00list
===================================================================
--- trunk/packages/jed/debian/patches/00list	2006-04-07 21:26:24 UTC (rev 256)
+++ trunk/packages/jed/debian/patches/00list	2006-04-11 20:00:58 UTC (rev 257)
@@ -1,7 +1,12 @@
-40_freetype-include.dpatch
-50_README.dpatch
-50_enable-xrenderfont.dpatch
-50_jed-manpage.dpatch
-50_jed.tex.dpatch
-50_popups.sl.dpatch
-60_gpm-mouse-support.dpatch
+40_freetype-include
+50_README
+50_jed-manpage
+50_jed.tex
+50_popups.sl
+
+#if !defined(DEB_BUILD_ARCH_hurd_i386) && !defined(DEB_BUILD_ARCH_kfreebsd_i386)
+  /* The xrender extension and libgpm are not supported by these
+     architectures: #345268 #95843 */
+50_enable-xrenderfont
+60_gpm-mouse-support
+#endif

Added: trunk/packages/jed/debian/patches/00options
===================================================================
--- trunk/packages/jed/debian/patches/00options	2006-04-07 21:26:24 UTC (rev 256)
+++ trunk/packages/jed/debian/patches/00options	2006-04-11 20:00:58 UTC (rev 257)
@@ -0,0 +1 @@
+DPATCH_OPTION_CPP=1

Modified: trunk/packages/jed/debian/rules
===================================================================
--- trunk/packages/jed/debian/rules	2006-04-07 21:26:24 UTC (rev 256)
+++ trunk/packages/jed/debian/rules	2006-04-11 20:00:58 UTC (rev 257)
@@ -145,4 +145,9 @@
 	dh_builddeb -a
 
 binary: binary-arch binary-indep
-.PHONY: build clean binary binary-arch binary-indep
+
+get-orig-source:
+	wget ftp://space.mit.edu/pub/davis/jed/v0.99/jed-0.99-18.tar.gz
+	mv jed-0.99-18.tar.gz jed-0.99-18.orig.tar.gz
+
+.PHONY: build clean binary binary-arch binary-indep get-orig-source