[Pkg-symfony-commits] [SCM] Propel repository to pkg-symfony project branch, master, updated. 6e9169d56235513645497f3d669788e7a96f4c8d

[John Arevalo]

The following commit has been merged in the master branch:
commit 6e9169d56235513645497f3d669788e7a96f4c8d
Author: John Arevalo <johnarevalo at gmail.com>
Date:   Sun May 2 21:34:54 2010 -0500

    Deleted unused files, revert propel-gen script, removed unused quilt dependecies

diff --git a/debian/README.Debian b/debian/README.Debian
deleted file mode 100644
index 2b45b1b..0000000
--- a/debian/README.Debian
+++ /dev/null
@@ -1,6 +0,0 @@
-propel for Debian
------------------
-
-<possible notes regarding this package - if none, delete this file>
-
- -- John Arevalo <johnarevalo at gmail.com>  Thu, 01 Apr 2010 21:40:44 -0500
diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index daaa2d4..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,17 +0,0 @@
-propel for Debian
------------------
-
-<this file describes information about the source package, see Debian policy
-manual section 4.14. You WILL either need to modify or delete this file>
-
-This package uses quilt to manage all modifications to the upstream
-source.  Changes are stored in the source package as diffs in
-debian/patches and applied during the build.  Please see:
-
-	 /usr/share/doc/quilt/README.source
-
-for more information on how to apply the patches, modify patches, or
-remove a patch.
-
-
-
diff --git a/debian/changelog b/debian/changelog
index 66cbb74..06bcfd9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1 @@
-propel (1.4-1) unstable; urgency=low
-
-  * Initial release (Closes: #330203) 
-  * no changes made
-  * built with r1659
-
- -- John Arevalo <johnarevalo at gmail.com>  Thu, 01 Apr 2010 21:40:44 -0500
+* Initial release (Closes: #330203) 
diff --git a/debian/control b/debian/control
index 8fdf3ec..567e17b 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: php
 Priority: optional
 Maintainer: Debian Symfony Maintainers <pkg-symfony-maint at lists.alioth.debian.org>
 Uploaders: John Arevalo <johnarevalo at gmail.com>
-Build-Depends: quilt (>= 0.46-7~), debhelper (>= 7)
+Build-Depends: debhelper (>= 7)
 Standards-Version: 3.8.4
 Vcs-Git: git://git.debian.org/git/pkg-symfony/propel.git
 Vcs-Browser: http://git.debian.org/?p=pkg-symfony/propel.git
@@ -12,7 +12,7 @@ Homepage: http://propel.phpdb.org/
 Package: propel
 Architecture: all
 Depends: php5, php5-cli, php5-xsl, phing, ${misc:Depends}
-Description: open-source Object-Relational Mapping (ORM) library written in PHP5
+Description: Object-Relational Mapping (ORM) library written in PHP5
  allows access to database using a set of objects, 
  providing a simple API for storing and retrieving 
  data. Work with databases in the same way work 
diff --git a/debian/docs b/debian/docs
deleted file mode 100644
index e69de29..0000000
diff --git a/debian/files b/debian/files
deleted file mode 100644
index 3d4bf45..0000000
--- a/debian/files
+++ /dev/null
@@ -1 +0,0 @@
-propel_1.4-1_all.deb php optional
diff --git a/debian/propel.debhelper.log b/debian/propel.debhelper.log
deleted file mode 100644
index 012ac79..0000000
--- a/debian/propel.debhelper.log
+++ /dev/null
@@ -1,49 +0,0 @@
-dh_quilt_patch
-dh_auto_configure
-dh_auto_build
-dh_auto_test
-dh_prep
-dh_installdirs
-dh_auto_install
-dh_install
-dh_install
-dh_install
-dh_install
-dh_installdocs
-dh_installchangelogs
-dh_installexamples
-dh_installman
-dh_installcatalogs
-dh_installcron
-dh_installdebconf
-dh_installemacsen
-dh_installifupdown
-dh_installinfo
-dh_pysupport
-dh_installinit
-dh_installmenu
-dh_installmime
-dh_installmodules
-dh_installlogcheck
-dh_installlogrotate
-dh_installpam
-dh_installppp
-dh_installudev
-dh_installwm
-dh_installxfonts
-dh_bugfiles
-dh_lintian
-dh_gconf
-dh_icons
-dh_perl
-dh_usrlocal
-dh_link
-dh_compress
-dh_fixperms
-dh_strip
-dh_makeshlibs
-dh_shlibdeps
-dh_installdeb
-dh_gencontrol
-dh_md5sums
-dh_builddeb
diff --git a/debian/rules b/debian/rules
index 02d3f43..b00071e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,6 @@ INSTALL_DIR := usr/share/php/propel/
 DOCS_DIR := usr/share/doc/propel/
 #INSTALL_DIR := debian/usr/share/php/propel/
 %:
-	dh --with quilt  $@
 
 override_dh_install:
 	dh_install
diff --git a/generator/bin/propel-gen b/generator/bin/propel-gen
index 41bbfe7..11c929f 100755
--- a/generator/bin/propel-gen
+++ b/generator/bin/propel-gen
@@ -12,8 +12,21 @@ if [ -z "$PROPEL_GEN_HOME" ] ; then
 
   # echo "WARNING: PROPEL_GEN_HOME environment not set. Attempting to guess."
 
-  if [ -d "/usr/share/php/propel/generator" ] ; then 
-    PROPEL_GEN_HOME="/usr/share/php/propel/generator"
+  # try to find Propel
+  if [ -d /opt/propel/generator ] ; then 
+    PROPEL_GEN_HOME=/opt/propel/generator
+  fi
+
+  if [ -d "${HOME}/opt/propel/generator" ] ; then 
+    PROPEL_GEN_HOME="${HOME}/opt/propel/generator"
+  fi
+
+  if [ -d "/usr/local/propel/generator" ] ; then 
+    PROPEL_GEN_HOME="/usr/local/propel/generator"
+  fi
+
+  if [ -d "${HOME}/usr/propel/generator" ] ; then 
+    PROPEL_GEN_HOME="${HOME}/usr/propel/generator"
   fi
   
   ## resolve links - $0 may be a link to phing's home

-- 
Propel repository to pkg-symfony project