Changeset 399:f89a0033c4fd in SMSSender


Ignore:
Timestamp:
Apr 30, 2014 6:54:39 PM (5 years ago)
Author:
Sämy Zehnder <saemy.zehnder@…>
Branch:
default
Message:
  • Merges the different ubuntu package definitions into a single one which builds them all in one go.
  • Adjusts the deploy script to reflect the above change.
  • Adjusts the no_update patch to the new version of the source.
  • Updates the pbuilder howto to work with a per-user configuration.
Location:
deploy
Files:
5 added
48 deleted
9 edited
2 moved

Legend:

Unmodified
Added
Removed
  • deploy/howto_pbuilder.txt

    r252 r399  
    1414First setup
    1515-----------
    16 1) Add to /etc/pbuilderrc
     161) Add to ~/.pbuilderrc
    1717    COMPONENTS="main restricted universe multiverse"
    18     HOOKDIR="/etc/pbuilder/hook.d"
     18    HOOKDIR="$HOME/.pbuilder/hook.d"
    1919
    2020    # Find packages of other pdebuilds
     
    5050    fi
    5151
    52 2) Create /etc/pbuilder/hook.d/D10pdebuild-result-repo
     522) Create ~/.pbuilder/hook.d/D10pdebuild-result-repo
    5353    #!/bin/sh
    5454
     
    6262    apt-get update
    6363
    64 3) Chmod +x /etc/pbuilder/hook.d/D10pdebuild-result-repo
     643) chmod +x ~/.pbuilder/hook.d/D10pdebuild-result-repo
    65654) pbuilder create
  • deploy/ubuntu/deploy

    r314 r399  
    7272        pkg=$1
    7373
    74         lower_case=`echo $pkg | sed -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
     74        lower_case=`echo $pkg | tr "[[:upper:]]" "[[:lower:]]"`
    7575        if [ "$lower_case" = "smssender" ]; then
    76                 pro="smssender-app.pro"
     76                pro="smssender.pri"
    7777        else
    7878                get_data_dir $pkg
     
    103103data_dir=""
    104104get_data_dir() {
    105         pkg=`echo $1 | sed -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
     105        pkg=`echo $1 | tr "[[:upper:]]" "[[:lower:]]"`
    106106        case $pkg in
    107107                smssender) data_dir="" ;;
     
    132132                echo -n "  - Reading version... "
    133133                get_base_version $pkg
    134                 pkg_with_version=${pkg_long}_$base_version.$development_version$version_revision
     134        if [ "$development_version" == "rev" ]; then
     135            if [ "$version_revision" -ne "0" ]; then
     136                echo "failed."
     137                echo "When building a revision, the development version has to be 0!"
     138                return
     139            fi
     140            version_suffix=""
     141        else
     142            version_suffix="~$development_version$version_revision"
     143        fi
     144        pkg_with_version=${pkg_long}_$base_version$version_suffix
    135145                echo "$pkg_with_version."
    136146               
     
    146156                tar_name=$pkg_with_version.orig.tar.gz
    147157                tar --create --dereference --hard-dereference \
    148                         --exclude "gateways/*" --exclude "gateways" --exclude "deploy*" --exclude "priv*" \
     158            --exclude "deploy*" --exclude "priv*" \
    149159                        --exclude "\.*" --exclude-vcs --exclude-caches-all \
    150160                        --exclude-backups --gzip \
     
    164174                echo -n "  - Updating dependencies in debian/... "
    165175                get_base_version "smssender"
    166                 minVersion=$base_version.$development_version$version_revision
    167                 maxVersion=$base_version.$development_version$(( $version_revision + 1 ))
     176
     177        req_version=$base_version$version_revision
     178        if [ "$development_version" == "rev" ]; then
     179            minVersion=$base_version
     180            # 3.1 -> 3.2
     181            maxVersion=$(echo $base_version | awk -F. -v OFS=. 'NF==1{print ++$NF}; NF>1{$NF=sprintf("%0*d", length($NF), $NF+1); print}')
     182        else
     183            minVersion=$base_version~$development_version$version_revision
     184            maxVersion=$base_version~$development_version$(( $version_revision + 1 ))
     185        fi
    168186                sed -r -i -e 's/smssender(-dev)?[[:space:]]?\(>= [^)]+\)/smssender\1 (>= '$minVersion')/g' \
    169187                        $deploy_dir/$pkg_long/debian/control
     
    232250echo ""
    233251echo "***** Processing the packages *****"
    234 which_packages
     252#which_packages
     253packages=smssender
    235254for pkg in $packages ; do
    236255        create_tarball $pkg
     
    301320}
    302321
    303 #check_differences() {
    304322#       d="$tmp_deploy_dir/*"
    305323#       for f in $d ; do
  • deploy/ubuntu/smssender/debian/changelog

    r312 r399  
     1smssender (3.1-0ubuntu1) saucy; urgency=low
     2
     3  * New upstream version.
     4
     5 -- Sämy Zehnder <saemy.zehnder@gorrion.ch>  Wed, 26 Mar 2014 15:08:05 +0100
     6
    17smssender (3.0.beta5-0ubuntu1) raring; urgency=low
    28
  • deploy/ubuntu/smssender/debian/control

    • Property exe set to *
    r254 r399  
    88    libqt4-sql-sqlite,
    99    libcrypto++-dev,
     10    libqrencode-dev,
    1011    rsync
    1112Standards-Version: 3.9.3
     
    1415Package: smssender
    1516Architecture: any
    16 Depends: ${shlibs:Depends}, ${misc:Depends},
    17     libqt4-sql-sqlite
     17Depends: smssender-gui | smssender-cli
    1818Description: Fast and easy-to-use client for sending sms over internet gateways
    1919 This application simplifies the procedure of sending sms via websites as of
    20  your mobile phone company. It manages the login process for you and stores
    21  your address book localy on your computer. So you can reuse it for multiple
    22  gateways. Contact groups and alias names for your contacts gives more
    23  flexibility and makes you sending a message even faster.
     20 your carrier. It manages the login process for you and stores your address book
     21 localy on your computer. So you can reuse it for multiple gateways. Contact
     22 groups and alias names for your contacts gives more flexibility and makes you
     23 sending a message even faster.
    2424 The sms length as well as the recipient count are not limited. Splitting the
    2525 message in several sms is the work for the program.
     
    3333Section: devel
    3434Architecture: any
    35 Depends: ${shlibs:Depends}, ${misc:Depends}
    36 Description: Fast and easy-to-use client for sending sms over internet gateways
    37  This application simplifies the procedure of sending sms via websites as of
    38  your mobile phone company. It manages the login process for you and stores
    39  your address book localy on your computer. So you can reuse it for multiple
    40  gateways. Contact groups and alias names for your contacts gives more
    41  flexibility and makes you sending a message even faster.
    42  The sms length as well as the recipient count are not limited. Splitting the
    43  message in several sms is the work for the program.
    44  .
    45  Once set up, you are able to send sms within seconds and without the need of
    46  tons of clicks on a website. Enjoy.
    47  .
    48  This package contains the development files.
     35Depends: ${shlibs:Depends}, ${misc:Depends},
     36    libqt4-dev,
     37    libqt4-sql-sqlite,
     38    libcrypto++-dev,
     39    libqrencode-dev
     40Description: Development files for smssender.
     41
     42
     43Package: smssender-gui
     44Architecture: any
     45Depends: ${shlibs:Depends}, ${misc:Depends},
     46    libqt4-sql-sqlite
     47Description: GUI frontend for smssender.
    4948 .
    5049 smssender is still beta. Please use it with care.
     50
     51
     52Package: smssender-gateway-ethz
     53Architecture: any
     54Depends: ${shlibs:Depends}, ${misc:Depends},
     55    smssender (>= 3.1), smssender (<< 3.2)
     56Enhances: smssender
     57Description: The ETHZ gateway plugin for smssender.
     58 See http://www.sms.ethz.ch
     59 .
     60 smssender is still beta. Please use it with care.
     61
     62Package: smssender-gateway-post
     63Architecture: any
     64Depends: ${shlibs:Depends}, ${misc:Depends},
     65    smssender (>= 3.1), smssender (<< 3.2)
     66Enhances: smssender
     67Description: The swiss post gateway plugin for smssender.
     68 See https://organizer.sso.post.ch
     69 .
     70 smssender is still beta. Please use it with care.
     71
     72Package: smssender-gateway-schoolnet
     73Architecture: any
     74Depends: ${shlibs:Depends}, ${misc:Depends},
     75    smssender (>= 3.1), smssender (<< 3.2)
     76Enhances: smssender
     77Description: The Schoolnet gateway plugin for smssender.
     78 See http://www.schoolnet.ch
     79 .
     80 smssender is still beta. Please use it with care.
     81
     82Package: smssender-gateway-smartphone
     83Architecture: any
     84Depends: ${shlibs:Depends}, ${misc:Depends},
     85    smssender (>= 3.1), smssender (<< 3.2)
     86Enhances: smssender
     87Description: The smartphone plugin for smssender that allows using smssender
     88 for sending sms via your smartphone.
     89 .
     90 smssender is still beta. Please use it with care.
     91
     92Package: smssender-gateway-sunrise
     93Architecture: any
     94Depends: ${shlibs:Depends}, ${misc:Depends},
     95    smssender (>= 3.1), smssender (<< 3.2)
     96Enhances: smssender
     97Description: The Sunrise gateway plugin for smssender.
     98 See http://www.sunrise.ch
     99 .
     100 smssender is still beta. Please use it with care.
  • deploy/ubuntu/smssender/debian/copyright

    r150 r399  
    1 This is the official smssender  package by gorrión.
     1This is the official smssender package by gorrión.
    22
    33Author: gorrión.
    44
    5 Copyright: <Copyright (C) 2011 gorrion.ch>
     5Copyright: <Copyright (C) 2011-2014 gorrion.ch>
    66
    77License:
  • deploy/ubuntu/smssender/debian/menu

    r92 r399  
    1 ?package(smssender):needs="X11"\
     1?package(smssender-gui):needs="X11"\
    22  section="Applications/Network/Communication"\
    33  title="SMSSender"\
    4   command="smssender"\
     4  command="/usr/bin/smssender"\
    55  icon="/usr/share/pixmaps/smssender.xpm"
  • deploy/ubuntu/smssender/debian/patches/no_update.patch

    r289 r399  
    44Author: Sämy Zehnder <saemy.zehnder@gorrion.ch>
    55
    6 --- a/src/ui/vcsettings/vcsettings.cpp
    7 +++ b/src/ui/vcsettings/vcsettings.cpp
    8 @@ -46,6 +46,10 @@ VCSettings::VCSettings(QWidget* parent)
     6--- a/frontend/business/updatemanager.cpp
     7+++ b/frontend/business/updatemanager.cpp
     8@@ -29,6 +29,9 @@
     9 }
     10 
     11 void UpdateManager::checkForUpdates() {
     12+    // Do not check for updates on Ubuntu (done by apt)
     13+    return;
     14+
     15     SearchForUpdateTask *task = new SearchForUpdateTask;
     16 
     17     connect(task, SIGNAL(newestVersionFound(const SVersion&, UpdateManager::UpdateType)),
     18diff -r d433806d8a7f frontend/gui/ui/settingsdialog.cpp
     19--- a/frontend/gui/ui/settingsdialog.cpp
     20+++ b/frontend/gui/ui/settingsdialog.cpp
     21@@ -52,6 +52,10 @@
    922        // Default start page
    1023        ui.lstSettingGroups->setCurrentRow(PAGE_INDEX_GENERAL);
     
    1528+       ui.btnSearchForUpdate->setVisible(false);
    1629 }
    17  VCSettings::~VCSettings() {
    18      foreach (QComboBox* chr, shortcutSelects_) {
    19 --- a/src/business/bcupdatemanager.cpp
    20 +++ b/src/business/bcupdatemanager.cpp
    21 @@ -30,6 +30,9 @@ BCUpdateManager::BCUpdateManager() {
    22  }
    2330 
    24  void BCUpdateManager::checkForUpdates() {
    25 +    // Do not check for updates on Ubuntu (done by apt)
    26 +    return;
    27 +
    28      BCSearchForUpdateTask* task = new BCSearchForUpdateTask;
    29  
    30      connect(task, SIGNAL(newestVersionFound(const SVersion&, BCUpdateManager::UpdateType)),
     31 void SettingsDialog::closeEvent(QCloseEvent *e){
  • deploy/ubuntu/smssender/debian/rules

    • Property exe deleted
    r188 r399  
    44
    55DEB_DH_INSTALL_SOURCEDIR=debian/tmp
    6 DEB_QMAKE_ARGS=-recursive smssender.pro
     6DEB_QMAKE_ARGS=-recursive CONFIG+="install-dev-files build-frontend-gui" smssender.pro
    77
    88include /usr/share/cdbs/1/class/qmake.mk
    99include /usr/share/cdbs/1/rules/debhelper.mk
    1010
    11 build/smssender::
     11build/smssender-gui::
    1212        mkdir -p $(DEB_DH_INSTALL_SOURCEDIR)/usr/share/pixmaps
    13         cp $(DEB_SRCDIR)/lib/smssender.xpm $(DEB_DH_INSTALL_SOURCEDIR)/usr/share/pixmaps/
     13        cp $(DEB_SRCDIR)/frontend/gui/lib/smssender.xpm $(DEB_DH_INSTALL_SOURCEDIR)/usr/share/pixmaps/
    1414        mkdir -p $(DEB_DH_INSTALL_SOURCEDIR)/usr/share/applications
    15         cp $(DEB_SRCDIR)/debian/smssender.desktop $(DEB_DH_INSTALL_SOURCEDIR)/usr/share/applications/
    16 
    17 build/smssender-dev::
    18         mkdir -p $(DEB_DH_INSTALL_SOURCEDIR)/usr/include/smssender
    19         cp $(DEB_SRCDIR)/lib/datatypes/datatypes.inc $(DEB_DH_INSTALL_SOURCEDIR)/usr/include/smssender
    20         cp $(DEB_SRCDIR)/gateways.pri $(DEB_DH_INSTALL_SOURCEDIR)/usr/include/smssender
    21         cp $(DEB_SRCDIR)/smssender.pri $(DEB_DH_INSTALL_SOURCEDIR)/usr/include/smssender
    22         rsync -r --include='**.h' --exclude='**.*' $(DEB_SRCDIR)/lib/datatypes/src/ $(DEB_DH_INSTALL_SOURCEDIR)/usr/include/smssender
     15        cp $(DEB_SRCDIR)/debian/smssender-gui.desktop $(DEB_DH_INSTALL_SOURCEDIR)/usr/share/applications/
  • deploy/ubuntu/smssender/debian/smssender-dev.install

    r254 r399  
    11usr/include/smssender
     2#usr/lib/smssender/**/*.a*
  • deploy/ubuntu/smssender/debian/smssender-gui.desktop

    r188 r399  
    44Comment=Send your sms faster!
    55Comment[de]=SMS schneller versenden!
    6 Exec=smssender
    7 Icon=smssender
     6Exec=/usr/bin/smssender
     7Icon=/usr/share/pixmaps/smssender.xpm
    88Terminal=false
    99Categories=Network;WebBrowser;Qt;
  • deploy/ubuntu/smssender/debian/smssender-gui.install

    r254 r399  
    11usr/bin/smssender
    2 usr/lib/smssender/*.so*
     2usr/lib/smssender/*-gui.so*
     3usr/lib/smssender/libgateways-common-gui.so*
     4usr/share/applications/smssender-gui.desktop
    35usr/share/pixmaps/smssender.xpm
    4 usr/share/applications/smssender.desktop
Note: See TracChangeset for help on using the changeset viewer.