Skip to content

Commit

Permalink
- added debian source format file
Browse files Browse the repository at this point in the history 
- the "clean" rule clean debian/piwik too
- prevent some files to be included in the source package
- properly package the sources into the .tar.gz file
  • Loading branch information
@aureq
aureq committed Jan 15, 2014
1 parent 7213ef9 commit b42576f
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 1 deletion.
3 changes: 2 additions & 1 deletion Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ endif
# creates the .deb package and other related files
# all files are placed in ../
builddeb: checkenv checkversions
dpkg-buildpackage -i -I -rfakeroot -ai386
dpkg-buildpackage -i '-Itmp' -I.git -I$(ARCHIVE) -rfakeroot -ai386

# check the generated .deb for consistency
# the filename is determines by the 1st line of debian/changelog
Expand Down Expand Up @@ -113,6 +113,7 @@ history:
clean:
rm -rf piwik
rm -f piwik-*.tar.gz
rm -rf debian/piwik

upload:
mv ../piwik_$(CURRENT_FULLV)_all.deb $(CURDIR)/tmp
Expand Down
2 changes: 2 additions & 0 deletions debian/rules
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ clean:
dh_testdir
dh_testroot
dh_prep
$(MAKE) clean
$(MAKE) checkfetch DESTDIR=$(CURDIR)/$d

install: build
dh_testdir
Expand Down
1 change: 1 addition & 0 deletions debian/source/format
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
1.0

5 comments on commit b42576f

@danielhjames
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi Aurélien, I found it was not necessary to specify -ai386 on line 88 of the Makefile, it builds fine for me on an amd64 system without this option.

@aureq
Copy link
Contributor Author

@aureq aureq commented on b42576f Feb 3, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi Daniel. Thank you for your comment and my apologise for the late reply. I double checked and you're correct, so created issue #7 for that.

Thanks.

@danielhjames
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No worries, glad to help. We have used your scripts to make Piwik available to our users via http://apt.sourcefabric.org/pool/main/p/piwik/ and documented our use case at http://sourcefabric.booktype.pro/airtime-25-for-broadcasters/icecast-statistics-with-piwik/

Cheers!

@aureq
Copy link
Contributor Author

@aureq aureq commented on b42576f Feb 4, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Daniel, maybe you should have a look at http://debian.piwik.org instead ;-) It hasn't been made official just yet, but it's already available. And it's documented.

@danielhjames
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks! We maintain our own secure apt repo so that we can QA packages before they are deployed for our users, i.e. we know about any issues before they do.

We are specifically interested in using Piwik with Icecast, a use case for which most of the alternatives are either very old or proprietary. So our own documentation is focused on that use case. There was a request for information about this at http://forum.piwik.org/read.php?2,105096 which I have now been able to answer.

Please sign in to comment.