[Pkg-electronics-commits] [SCM] Packaging for gEDA branch, master, updated. 56791475902de1fb36d035642b973d343a31b217

[أحمد المحمودي (Ahmed El-Mahmoudy)]

The following commit has been merged in the master branch:
commit 56791475902de1fb36d035642b973d343a31b217
Author: أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at users.sourceforge.net>
Date:   Sat Nov 21 23:20:12 2009 +0200

    * debian/control: Build-Depend on debhelper >= 7.4.7~ as it fixes a
      problem regarding dh_auto_* with Makefiles in */po
    * debian/rules:
      + override_dh_auto_test not needed anymore
      + Use dh_auto_install in override_dh_auto_install

diff --git a/debian/changelog b/debian/changelog
index 91752cf..d86cd8e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
-geda-gaf (1:1.6.0-1~18.gbpef3232) UNRELEASED; urgency=low
+geda-gaf (1:1.6.0-1~19.gbp0752af) UNRELEASED; urgency=low
 
-  ** SNAPSHOT build @ef32322d8d9c59360a92bd8f92557f6ee58fc844 **
+  ** SNAPSHOT build @0752afac552e5ecd97513f0b07fbf207812dc382 **
 
   [ Peter Clifton ]
   * gEDA 1.6.0 upstream release (Closes: #552152)
@@ -10,13 +10,12 @@ geda-gaf (1:1.6.0-1~18.gbpef3232) UNRELEASED; urgency=low
   * Bumped compat level to 7
   * debian/control:
     + Bumped Standards-Version to 3.8.3
-    + Build-Depend on 7.0.50~
     + Added ${shlib:Depends} to libgeda-dev Depends.
     + Depend on mawk instead of gawk in geda-gnetlist
     + Put geda-doc in Section: doc
     + Fix typo in geda description.
     + Add ${misc:Depends} to Depends of all packages.
-    + Build-Depend on debhelper >= 7.4.3~ for dh_installdocs --linkdoc support
+    + Build-Depend on debhelper >= 7.4.7~
     + Set Debian Electronics Team as Maintainer.
     + Add myself to Uploaders.
     + Add Vcs-* fields.
@@ -44,7 +43,7 @@ geda-gaf (1:1.6.0-1~18.gbpef3232) UNRELEASED; urgency=low
   * Added patch manpages.diff to remove undefined `l' macro.
   * Added patch desktop.diff to remove Encoding field and escape "-".
 
- -- أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at users.sourceforge.net>  Sat, 21 Nov 2009 09:55:48 +0200
+ -- أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at users.sourceforge.net>  Sat, 21 Nov 2009 22:51:03 +0200
 
 geda-gaf (1:1.5.4-0~pcjc2.1) jaunty; urgency=low
 
diff --git a/debian/control b/debian/control
index f2fcf01..48f40eb 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian Electronics Team <pkg-electronics-devel at lists.alioth.debian.org>
 Uploaders: Peter Clifton <pcjc2 at cam.ac.uk>, أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at users.sourceforge.net>
 Standards-Version: 3.8.3
-Build-Depends: debhelper (>= 7.4.3~), libgtk2.0-dev, guile-1.8-dev [!ia64], guile-1.6-dev [ia64], libgd2-xpm-dev | libgd2-dev, libxml-parser-perl, gs-common, transfig, libstroke0-dev, groff, libxml-parser-perl, libglib2.0-dev, flex, intltool
+Build-Depends: debhelper (>= 7.4.7~), libgtk2.0-dev, guile-1.8-dev [!ia64], guile-1.6-dev [ia64], libgd2-xpm-dev | libgd2-dev, libxml-parser-perl, gs-common, transfig, libstroke0-dev, groff, libxml-parser-perl, libglib2.0-dev, flex, intltool
 Homepage: http://geda.seul.org/
 Vcs-Git: git://git.debian.org/git/pkg-electronics/geda-gaf.git
 Vcs-Browser: http://git.debian.org/?p=pkg-electronics/geda-gaf.git
diff --git a/debian/rules b/debian/rules
index 8c36f05..39fd005 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,23 +16,20 @@ override_dh_auto_configure:
 override_dh_auto_build:
 	dh_auto_build
 
-override_dh_auto_test:
-	make check
-
 LIBPKG=libgeda38
 DEVPKG=libgeda-dev
 COMMONPKG=libgeda-common
 
 override_dh_auto_install:
-	cd libgeda   && $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
-	cd gschem    && $(MAKE) install DESTDIR=$(CURDIR)/debian/geda-gschem
-	cd gattrib   && $(MAKE) install DESTDIR=$(CURDIR)/debian/geda-gattrib
-	cd gnetlist  && $(MAKE) install DESTDIR=$(CURDIR)/debian/geda-gnetlist
-	cd gsymcheck && $(MAKE) install DESTDIR=$(CURDIR)/debian/geda-gsymcheck
-	cd utils     && $(MAKE) install DESTDIR=$(CURDIR)/debian/geda-utils
-	cd symbols   && $(MAKE) install DESTDIR=$(CURDIR)/debian/geda-symbols
-	cd docs      && $(MAKE) install DESTDIR=$(CURDIR)/debian/geda-doc
-	cd examples  && $(MAKE) install DESTDIR=$(CURDIR)/debian/geda-examples
+	dh_auto_install --sourcedirectory=libgeda    -- DESTDIR=$(CURDIR)/debian/tmp
+	dh_auto_install --sourcedirectory=gschem     -- DESTDIR=$(CURDIR)/debian/geda-gschem
+	dh_auto_install --sourcedirectory=gattrib    -- DESTDIR=$(CURDIR)/debian/geda-gattrib
+	dh_auto_install --sourcedirectory=gnetlist   -- DESTDIR=$(CURDIR)/debian/geda-gnetlist
+	dh_auto_install --sourcedirectory=gsymcheck  -- DESTDIR=$(CURDIR)/debian/geda-gsymcheck
+	dh_auto_install --sourcedirectory=utils      -- DESTDIR=$(CURDIR)/debian/geda-utils
+	dh_auto_install --sourcedirectory=symbols    -- DESTDIR=$(CURDIR)/debian/geda-symbols
+	dh_auto_install --sourcedirectory=docs       -- DESTDIR=$(CURDIR)/debian/geda-doc
+	dh_auto_install --sourcedirectory=examples   -- DESTDIR=$(CURDIR)/debian/geda-examples
 
 override_dh_install:
 	dh_install

-- 
Packaging for gEDA