rename proj name to 'pkghelper'

diff --git a/Makefile b/Makefile
index 1c21410..0a22ac7 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -18,12 +18,12 @@ tag:
        git tag $(VERSION)
 
 dist-bz2:
-       git archive --format=tar --prefix=tizenpkg-$(TAGVER)/ $(TAG) | \
-               bzip2  > tizenpkg-$(TAGVER).tar.bz2
+       git archive --format=tar --prefix=pkghelper-$(TAGVER)/ $(TAG) | \
+               bzip2  > pkghelper-$(TAGVER).tar.bz2
 
 dist-gz:
-       git archive --format=tar --prefix=tizenpkg-$(TAGVER)/ $(TAG) | \
-               gzip  > tizenpkg-$(TAGVER).tar.gz
+       git archive --format=tar --prefix=pkghelper-$(TAGVER)/ $(TAG) | \
+               gzip  > pkghelper-$(TAGVER).tar.gz
 
 install: all
        python setup.py install --prefix=${PREFIX}

diff --git a/README.rst b/README.rst
index 1db3181..0fbd256 100644 (file)
--- a/README.rst
+++ b/README.rst
@@ -1,6 +1,6 @@
-========
-tizenpkg
-========
+=========
+pkghelper
+=========
 ---------------------------------------------------
 The command line tools for Tizen package developers
 ---------------------------------------------------

diff --git a/data/build.sh b/data/build.sh
index dcb8a92..e0c4052 100644 (file)
--- a/data/build.sh
+++ b/data/build.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 USAGE="usage:
-    tizenpkg build [target OBS project]
+    pkghelper build [target OBS project]
 
 Build package at remote build server, the default target OBS project
 is home:<user_id>:branches:Trunk
@@ -45,11 +45,11 @@ prj_name=`basename $git_url`
 # tar the local changes
 tar jcf package.tar.bz2 `git ls-files`
 
-# get user name/passwd from tizenpkg.conf
-user=$(tizenpkg cfg user)
-passwd=$(tizenpkg cfg passwd)
-HUDSON_SERVER=$(tizenpkg cfg src_server)
-passwdx=$(tizenpkg cfg passwdx)
+# get user name/passwd from pkghelper.conf
+user=$(pkghelper cfg user)
+passwd=$(pkghelper cfg passwd)
+HUDSON_SERVER=$(pkghelper cfg src_server)
+passwdx=$(pkghelper cfg passwdx)
 echo "Submiting your changes to build server"
 
 curl -s -u$user:$passwd -Fname=package.tar.bz2 -Ffile0=@package.tar.bz2 -Fjson='{"parameter": [{"name": "package.tar.bz2", "file": "file0"},{"name":"pkg", "value":"'$prj_name'"},{"name":"parameters","value":"obsproject='$target_obsproject';passwdx='$passwdx'"}]}' -FSubmit=Build "$HUDSON_SERVER/job/build/build" 

diff --git a/data/packaging.sh b/data/packaging.sh
index c04951f..ab8192a 100644 (file)
--- a/data/packaging.sh
+++ b/data/packaging.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 USAGE="usage:
-    tizenpkg packaging [git tag/commit id] [-s] [-t tag] [-f spec file]
+    pkghelper packaging [git tag/commit id] [-s] [-t tag] [-f spec file]
 
 Packaging master branch, convert the files to release branch
 from the given tag or commit id, by default it's the HEAD.
@@ -309,9 +309,9 @@ if [ -z "$tag" ];then
     tag=$(git describe $git_obj --abbrev=0 --tags)
 fi
 
-user=$(tizenpkg cfg user)
-passwd=$(tizenpkg cfg passwd)
-HUDSON_SERVER=$(tizenpkg cfg src_server)
+user=$(pkghelper cfg user)
+passwd=$(pkghelper cfg passwd)
+HUDSON_SERVER=$(pkghelper cfg src_server)
 
 git_url=`git config remote.origin.url`
 project=`basename $git_url`

diff --git a/distfiles/debian/control b/distfiles/debian/control
index 2d82102..8f2aacd 100644 (file)
--- a/distfiles/debian/control
+++ b/distfiles/debian/control
@@ -1,12 +1,12 @@
-Source: tizenpkg
+Source: pkghelper
 Section: devel
 Priority: extra
 Maintainer: Jian-feng Ding <jian-feng.ding@intel.com>
-Build-Depends: debhelper (>= 7.0.15), cdbs, python-dev, python-support
+Build-Depends: debhelper (>= 7.0.15), python-dev
 Standards-Version: 3.8.0
 Homepage: http://www.tizen.org
 
-Package: tizenpkg
+Package: pkghelper
 Architecture: all
 Depends: ${misc:Depends}, ${python:Depends},
  git-core,

diff --git a/distfiles/debian/copyright b/distfiles/debian/copyright
index e116bcd..996836d 100644 (file)
--- a/distfiles/debian/copyright
+++ b/distfiles/debian/copyright
@@ -14,7 +14,7 @@ Copyright:
 
     Copyright (C) 2011 Intel Inc.
 
-Copyright for tizenpkg/cmdln.py:
+Copyright for pkghelper/cmdln.py:
 
     Copyright (C) 2002-2005 ActiveState Corp.
     Copyright (C) Trent Mick <trentm@activestate.com>

diff --git a/distfiles/debian/rules b/distfiles/debian/rules
index 4eea2fa..18c017f 100755 (executable)
--- a/distfiles/debian/rules
+++ b/distfiles/debian/rules
@@ -6,14 +6,12 @@
 build: build-stamp
 build-stamp:
        dh_testdir
-
        python setup.py build
 
 clean:
        dh_testdir
        dh_testroot
        rm -f build-stamp
-
        dh_clean
 
 install: build
@@ -21,13 +19,12 @@ install: build
        dh_testroot
        dh_clean -k
        dh_installdirs
-
        # Installing package
-       mkdir -p $(CURDIR)/debian/tizenpkg /usr/bin
-       #make DESTDIR=$(CURDIR)/debian/tizenpkg installman
-       #make DESTDIR=$(CURDIR)/debian/tizenpkg installconf
-       #make DESTDIR=$(CURDIR)/debian/tizenpkg installsymlinks
-       python setup.py install --root=$(CURDIR)/debian/tizenpkg --prefix=/usr
+       mkdir -p $(CURDIR)/debian/pkghelper /usr/bin
+       #make DESTDIR=$(CURDIR)/debian/pkghelper installman
+       #make DESTDIR=$(CURDIR)/debian/pkghelper installconf
+       #make DESTDIR=$(CURDIR)/debian/pkghelper installsymlinks
+       python setup.py install --root=$(CURDIR)/debian/pkghelper --prefix=/usr --install-layout=deb
 
 binary-indep: build install
        dh_testdir
@@ -40,7 +37,6 @@ binary-indep: build install
        dh_strip
        dh_compress
        dh_fixperms
-       dh_pysupport
        dh_installdeb
        dh_shlibdeps
        dh_gencontrol

diff --git a/distfiles/tizenpkg.conf b/distfiles/pkghelper.conf
similarity index 100%
rename from distfiles/tizenpkg.conf
rename to distfiles/pkghelper.conf

diff --git a/distfiles/tizenpkg.spec b/distfiles/pkghelper.spec
similarity index 94%
rename from distfiles/tizenpkg.spec
rename to distfiles/pkghelper.spec
index 810069b..f2e0748 100644 (file)
--- a/distfiles/tizenpkg.spec
+++ b/distfiles/pkghelper.spec
@@ -6,7 +6,7 @@
 # << macros
 
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-Name:       tizenpkg
+Name:       pkghelper
 Summary:    The command line tools for Tizen package developers
 Version:    0.1
 Release:    1
@@ -15,7 +15,7 @@ License:    GPLv2
 BuildArch:  noarch
 URL:        http://www.tizen.org
 Source0:    %{name}-%{version}.tar.gz
-Source100:  tizenpkg.yaml
+Source100:  pkghelper.yaml
 Requires:   python >= 2.5
 Requires:   git-core
 Requires:   curl
@@ -67,6 +67,7 @@ rm -rf $RPM_BUILD_ROOT
 # >> files
 %doc README.rst
 %{python_sitelib}/*
+%dir %{_datadir}/%{name}
 %{_datadir}/%{name}/*
 %{_bindir}/*
 # << files

diff --git a/distfiles/tizenpkg.yaml b/distfiles/pkghelper.yaml
similarity index 96%
rename from distfiles/tizenpkg.yaml
rename to distfiles/pkghelper.yaml
index ee04947..b7fa26e 100644 (file)
--- a/distfiles/tizenpkg.yaml
+++ b/distfiles/pkghelper.yaml
@@ -1,4 +1,4 @@
-Name: tizenpkg
+Name: pkghelper
 Summary: The command line tools for Tizen package developers
 Version: 0.1
 Release: 1

diff --git a/tizenpkg/__init__.py b/pkghelper/__init__.py
similarity index 96%
rename from tizenpkg/__init__.py
rename to pkghelper/__init__.py
index 4e3bbfa..58f68a1 100644 (file)
--- a/tizenpkg/__init__.py
+++ b/pkghelper/__init__.py
@@ -17,6 +17,6 @@
 # Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 """
-module for tizenpkg tool
+module for pkghelper tool
 """
 

diff --git a/tizenpkg/cmd_build.py b/pkghelper/cmd_build.py
similarity index 100%
rename from tizenpkg/cmd_build.py
rename to pkghelper/cmd_build.py

diff --git a/tizenpkg/cmdln.py b/pkghelper/cmdln.py
similarity index 100%
rename from tizenpkg/cmdln.py
rename to pkghelper/cmdln.py

diff --git a/tizenpkg/conf.py b/pkghelper/conf.py
similarity index 99%
rename from tizenpkg/conf.py
rename to pkghelper/conf.py
index 5f1e3ac..cc5fae9 100644 (file)
--- a/tizenpkg/conf.py
+++ b/pkghelper/conf.py
@@ -242,7 +242,7 @@ passwdx = $passwdx
 
         if not fpath:
             # use the default path
-            fpath = os.path.expanduser('~/.tizenpkg.conf')
+            fpath = os.path.expanduser('~/.pkghelper.conf')
 
         if not os.path.exists(fpath):
             if not self._new_conf(fpath):

diff --git a/tizenpkg/errors.py b/pkghelper/errors.py
similarity index 100%
rename from tizenpkg/errors.py
rename to pkghelper/errors.py

diff --git a/tizenpkg/git.py b/pkghelper/git.py
similarity index 100%
rename from tizenpkg/git.py
rename to pkghelper/git.py

diff --git a/tizenpkg/msger.py b/pkghelper/msger.py
similarity index 100%
rename from tizenpkg/msger.py
rename to pkghelper/msger.py

diff --git a/tizenpkg/runner.py b/pkghelper/runner.py
similarity index 100%
rename from tizenpkg/runner.py
rename to pkghelper/runner.py

diff --git a/tizenpkg/srcserver.py b/pkghelper/srcserver.py
similarity index 100%
rename from tizenpkg/srcserver.py
rename to pkghelper/srcserver.py

diff --git a/tizenpkg/utils.py b/pkghelper/utils.py
similarity index 97%
rename from tizenpkg/utils.py
rename to pkghelper/utils.py
index 662e49e..ac1888e 100644 (file)
--- a/tizenpkg/utils.py
+++ b/pkghelper/utils.py
@@ -48,4 +48,4 @@ def strip_end(text, suffix):
 
 def get_share_dir():
     # TODO need to be better
-    return '/usr/share/tizenpkg/'
+    return '/usr/share/pkghelper/'

diff --git a/setup.py b/setup.py
index f8e4e79..5b78c82 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -9,7 +9,7 @@ try:
 except ImportError:
     pass
 
-MOD_NAME = 'tizenpkg'
+MOD_NAME = 'pkghelper'
 
 version_path = 'VERSION'
 if not os.path.isfile(version_path):
@@ -43,14 +43,14 @@ if sys.version_info[:2] > (2, 5):
         except:
             pass
 
-setup(name='tizenpkg',
+setup(name='pkghelper',
       version = version,
       description='The command line tools for Tizen package developers',
       author='Jian-feng Ding, Huaxu Wan',
       author_email='jian-feng.ding@intel.com, huaxu.wan@intel.com',
       url='http://git.tizen.org/',
-      scripts=['tools/tizenpkg'],
-      packages=['tizenpkg'],
-      data_files = [('/usr/share/tizenpkg', glob.glob('data/*'))],
+      scripts=['tools/pkghelper'],
+      packages=['pkghelper'],
+      data_files = [('/usr/share/pkghelper', glob.glob('data/*'))],
      )
 

diff --git a/tools/tizenpkg b/tools/pkghelper
similarity index 85%
rename from tools/tizenpkg
rename to tools/pkghelper
index c274da4..15b5659 100755 (executable)
--- a/tools/tizenpkg
+++ b/tools/pkghelper
@@ -20,9 +20,9 @@ import os, sys
 import io
 import ConfigParser
 
-from tizenpkg.__version__ import VERSION
-from tizenpkg import msger, cmdln, errors, utils, runner
-from tizenpkg.conf import configmgr
+from pkghelper.__version__ import VERSION
+from pkghelper import msger, cmdln, errors, utils, runner
+from pkghelper.conf import configmgr
 
 def _fall_to_shell(cmdname):
     def raw_wrapper(f):
@@ -35,7 +35,7 @@ def _fall_to_shell(cmdname):
             runner.embed(['bash', shpath] + list(argv)[1:])
         return _run_embed_sh
 
-    cmdmod = 'tizenpkg.cmd_' + cmdname
+    cmdmod = 'pkghelper.cmd_' + cmdname
     try:
         __import__(cmdmod)
         return raw_wrapper
@@ -44,17 +44,17 @@ def _fall_to_shell(cmdname):
 
 class TizenPkg(cmdln.Cmdln):
     """
-    Usage: tizenpkg [GLOBAL-OPTS] SUBCOMMAND [OPTS] [ARGS...]
+    Usage: pkghelper [GLOBAL-OPTS] SUBCOMMAND [OPTS] [ARGS...]
 
-    tizenpkg - the command line tool for Tizen package developers
-    Try 'tizenpkg help SUBCOMAND' for help on a specific subcommand.
+    pkghelper - the command line tool for Tizen package developers
+    Try 'pkghelper help SUBCOMAND' for help on a specific subcommand.
 
     ${command_list}
     global ${option_list}
     ${help_list}
     """
 
-    name = 'tizenpkg'
+    name = 'pkghelper'
     version = VERSION
 
     def get_optparser(self):
@@ -80,12 +80,12 @@ class TizenPkg(cmdln.Cmdln):
         """${cmd_name}: test building for current pkg
 
         Usage:
-            tizenpkg build [OBS_project]
+            pkghelper build [OBS_project]
 
         ${cmd_option_list}
         """
 
-        from tizenpkg import cmd_build as cmd
+        from pkghelper import cmd_build as cmd
         cmd.do(opts, args)
 
     @cmdln.alias("pk")
@@ -96,12 +96,12 @@ class TizenPkg(cmdln.Cmdln):
         """${cmd_name}: prepare packaging files for current pkg
 
         Usage:
-            tizenpkg packaging
+            pkghelper packaging
 
         ${cmd_option_list}
         """
 
-        from tizenpkg import cmd_packaging as cmd
+        from pkghelper import cmd_packaging as cmd
         cmd.do(opts, args)
 
     @_fall_to_shell('import')
@@ -109,12 +109,12 @@ class TizenPkg(cmdln.Cmdln):
         """${cmd_name}: import new tarballs for current pkg
 
         Usage:
-            tizenpkg import
+            pkghelper import
 
         ${cmd_option_list}
         """
 
-        from tizenpkg import cmd_import as cmd
+        from pkghelper import cmd_import as cmd
         cmd.do(opts, args)
 
     @cmdln.alias("cfg")
@@ -124,7 +124,7 @@ class TizenPkg(cmdln.Cmdln):
         """${cmd_name}: query values of config file
 
         Usage:
-            tizenpkg getconfig <opt1> [<opt2> ...]
+            pkghelper getconfig <opt1> [<opt2> ...]
 
         ${cmd_option_list}
         """