Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
  • This project
    • Loading...
  • Sign in / Register
P
package-helpers
  • Project
    • Overview
    • Details
    • Activity
    • Cycle Analytics
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
  • Issues 5
    • Issues 5
    • List
    • Board
    • Labels
    • Milestones
  • Merge Requests 33
    • Merge Requests 33
  • Snippets
    • Snippets
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Commits
  • Issue Boards
  • trisquel
  • package-helpers
  • Merge Requests
  • !200

Open
Opened Apr 29, 2018 by Jorge@jorgesumle 1
  • Report abuse
Report abuse

Add Hexchat helper

Suggests connecting to #trisquel instead of #ubuntu

×

Check out, review, and merge locally

Step 1. Fetch and check out the branch for this merge request

git fetch https://devel.trisquel.info/jorgesumle/package-helpers.git flidas
git checkout -b jorgesumle/package-helpers-flidas FETCH_HEAD

Step 2. Review the changes locally

Step 3. Merge the branch and fix any conflicts that come up

git checkout flidas
git merge --no-ff jorgesumle/package-helpers-flidas

Step 4. Push the result of the merge to GitLab

git push origin flidas

Note that pushing to GitLab requires write access to this repository.

Tip: You can also checkout merge requests locally by following these guidelines.

  • Discussion 4
  • Commits 2
  • Changes 1
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Jorge @jorgesumle

    Added 1 commit:

    • 5e8e004a - Create make-hexchat
    May 02, 2018

    Added 1 commit:

    • 5e8e004a - Create make-hexchat
    Added 1 commit: * 5e8e004a - Create make-hexchat
    Toggle commit list
  • Ruben Rodriguez
    @ruben started a discussion on an old version of the diff May 05, 2018
    helpers/make-hexchat 0 → 100644
    Unable to load the diff.
    • Ruben Rodriguez @ruben commented May 05, 2018
      Owner

      Whenever you remove a patch you need to also unlist it from the series files it is listed in:

      sed '/ubuntu_defaults/d' -i debian/patches/ubuntu.series

      And in this case you also want to remove the debian defaults

      rm debian/patches/debian_defaults.patch
      sed '/debian_defaults/d' -i debian/patches/series
      Whenever you remove a patch you need to also unlist it from the series files it is listed in: sed '/ubuntu_defaults/d' -i debian/patches/ubuntu.series And in this case you also want to remove the debian defaults rm debian/patches/debian_defaults.patch sed '/debian_defaults/d' -i debian/patches/series
    Please register or sign in to reply
  • Ruben Rodriguez
    @ruben started a discussion on the diff May 05, 2018
    helpers/make-hexchat 0 → 100644
    9 # This program is distributed in the hope that it will be useful,
    10 # but WITHOUT ANY WARRANTY; without even the implied warranty of
    11 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
    12 # GNU General Public License for more details.
    13 #
    14 # You should have received a copy of the GNU General Public License
    15 # along with this program. If not, see <https://www.gnu.org/licenses/>.
    16
    17 VERSION=1
    18
    19 . ./config
    20
    21 rm debian/patches/ubuntu_defaults.patch
    22 sed -i 's/#hexchat/#trisquel/' src/fe-gtk/joind.c
    23
    24 changelog "Compiled for Trisquel"
    • Ruben Rodriguez @ruben commented May 05, 2018
      Owner

      This should be a bit more descriptive.

      This should be a bit more descriptive.
    Please register or sign in to reply
  • Jorge @jorgesumle

    added 1 commit

    • ed6409ee - Update make-hexchat helper

    Compare with previous version

    May 05, 2018

    added 1 commit

    • ed6409ee - Update make-hexchat helper

    Compare with previous version

    added 1 commit <ul><li>ed6409ee - Update make-hexchat helper</li></ul> [Compare with previous version](https://devel.trisquel.info/trisquel/package-helpers/merge_requests/200/diffs?diff_id=263&start_sha=5e8e004ac69f4d6bb5fdaaccd671d50e21cca1aa)
    Toggle commit list
  • jenkins @jenkins commented Sep 27, 2018
    Developer

    Build triggered.

    Build triggered.
  • jenkins @jenkins commented Sep 27, 2018
    Developer

    Build triggered.

    Build triggered.
  • Write
  • Preview
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment
Assignee
No assignee
Assign to
None
Milestone
None
Assign milestone
Time tracking
0
Labels
None
Assign labels
  • View project labels
Reference: trisquel/package-helpers!200