[hipl-commit] [trunk] Rev 4474: Remove obsolete infrastructure for building MAEMO deb packages.

  • From: Diego Biurrun <diego@xxxxxxxxxx>
  • To: hipl-commit@xxxxxxxxxxxxx
  • Date: Sun, 9 May 2010 15:31:30 +0300

Committer: Diego Biurrun <diego@xxxxxxxxxx>
Date: 09/05/2010 at 15:31:30
Revision: 4474
Revision-id: diego@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
Branch nick: trunk

Log:
  Remove obsolete infrastructure for building MAEMO deb packages.
  Nowadays Debian packages for MAEMO are built with dpkg-buildpackage.

Modified:
  D  packaging/armel/
  D  packaging/armel/DEBIAN/
  D  packaging/armel/DEBIAN-FW/
  D  packaging/armel/DEBIAN-FW/changelog
  D  packaging/armel/DEBIAN-FW/control
  D  packaging/armel/DEBIAN-FW/control-src
  D  packaging/armel/DEBIAN-FW/copyright
  D  packaging/armel/DEBIAN-FW/postinst
  D  packaging/armel/DEBIAN-FW/postrm
  D  packaging/armel/DEBIAN-FW/preinst
  D  packaging/armel/DEBIAN-FW/prerm
  D  packaging/armel/DEBIAN-FW/rules
  D  packaging/armel/DEBIAN-dnsproxy/
  D  packaging/armel/DEBIAN-dnsproxy/changelog
  D  packaging/armel/DEBIAN-dnsproxy/control
  D  packaging/armel/DEBIAN-dnsproxy/control-src
  D  packaging/armel/DEBIAN-dnsproxy/copyright
  D  packaging/armel/DEBIAN-dnsproxy/postinst
  D  packaging/armel/DEBIAN-dnsproxy/postrm
  D  packaging/armel/DEBIAN-dnsproxy/preinst
  D  packaging/armel/DEBIAN-dnsproxy/prerm
  D  packaging/armel/DEBIAN-dnsproxy/rules
  D  packaging/armel/DEBIAN-gconf/
  D  packaging/armel/DEBIAN-gconf/changelog
  D  packaging/armel/DEBIAN-gconf/control
  D  packaging/armel/DEBIAN-gconf/copyright
  D  packaging/armel/DEBIAN-gconf/postinst
  D  packaging/armel/DEBIAN-gconf/postrm
  D  packaging/armel/DEBIAN/changelog
  D  packaging/armel/DEBIAN/control
  D  packaging/armel/DEBIAN/control-src
  D  packaging/armel/DEBIAN/copyright
  D  packaging/armel/DEBIAN/postinst
  D  packaging/armel/DEBIAN/postrm
  D  packaging/armel/DEBIAN/preinst
  D  packaging/armel/DEBIAN/prerm
  D  packaging/armel/DEBIAN/rules
  M  Makefile.am
  M  doc/HOWTO.xml
  M  packaging/create-package.sh

=== modified file 'Makefile.am'
--- Makefile.am 2010-05-09 12:29:03 +0000
+++ Makefile.am 2010-05-09 12:30:33 +0000
@@ -444,8 +444,7 @@
 clean-local:
        rm -rf doc/doxy
 
-# The olddeb target is for maemo builds only
-bin deb increl olddeb rpm syncrepo:
+bin deb increl rpm syncrepo:
        env PYEXECDIR=$(pyexecdir) @srcdir@/packaging/create-package.sh $@
 
 autotools-clean: maintainer-clean
@@ -477,4 +476,4 @@
 dist-hook:
        rm -f $(distdir)/doc/Doxyfile
 
-.PHONY: bin checkheaders deb doxygen increl olddeb rpm syncrepo
+.PHONY: bin checkheaders deb doxygen increl rpm syncrepo

=== modified file 'doc/HOWTO.xml'
--- doc/HOWTO.xml       2010-05-09 12:26:05 +0000
+++ doc/HOWTO.xml       2010-05-09 12:30:33 +0000
@@ -1570,18 +1570,6 @@
         make
       </programlisting></para>
 
-     <para>
-     The maemo packages are created with the 'olddeb' make target;
-      </para>
-
-      <para><programlisting>
-      make olddeb
-      </programlisting></para>
-
-      <para>
-      The packages will be created in packaging/
-      </para>
-
       </section>
 
   </section>

=== removed directory 'packaging/armel'
=== removed directory 'packaging/armel/DEBIAN'
=== removed directory 'packaging/armel/DEBIAN-FW'
=== removed directory 'packaging/armel/DEBIAN-dnsproxy'
=== removed directory 'packaging/armel/DEBIAN-gconf'
=== modified file 'packaging/create-package.sh'
--- packaging/create-package.sh 2010-05-04 20:58:15 +0000
+++ packaging/create-package.sh 2010-05-09 12:30:33 +0000
@@ -51,12 +51,6 @@
     exit 1
 }
 
-build_maemo_deb()
-{
-    env PYEXECDIR=$PYEXECDIR $PKGEXE/create-deb.sh
-    env PYEXECDIR=$PYEXECDIR $PKGEXE/create-deb.sh -s
-}
-
 build_rpm()
 {
     echo "Deleting old .rpmmacros"
@@ -128,11 +122,6 @@
 
 build_deb()
 {
-    if dpkg --print-architecture | grep -q armel; then
-        build_maemo_deb
-        exit 0
-    fi
-
     test -e ~/.debmacros && echo "Warning: ~/.debmacros found, could be a 
problem"
     if test -e ~/debbuild; then
         echo "Warning: ~/debbuild found, could be a problem"
@@ -212,9 +201,6 @@
     else
         die "Unknown distro"
     fi
-elif test x"$1" = x"olddeb"; then
-    build_maemo_deb
-    exit
 fi
 echo "Architecture: $ARCH"

Other related posts:

  • » [hipl-commit] [trunk] Rev 4474: Remove obsolete infrastructure for building MAEMO deb packages. - Diego Biurrun