Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

We’re showing branches in this repository, but you can also compare across forks.

base fork: eserte/bbbike
base: 4c8da578a8
...
head fork: eserte/bbbike
compare: f7ff964a1e
  • 8 commits
  • 24 files changed
  • 0 commit comments
  • 1 contributor
Commits on Mar 21, 2013
Slaven Rezić * Makefile: new target install-using-eui (will be used in Debian
  package building), refactored makefile code into
  do--symlink-bbbikeexe
4e35b73
Slaven Rezić * moved debian build stuff into old-debian directory 1a7ed47
Slaven Rezić * new debian build stuff e40bd27
Slaven Rezić * new 48x48 transparent version of bbbike logo
  Created using

    inkscape -f images/srtbike_logo.svg --export-png=/tmp/srtbike38a.png --export-area-page -w 38 -h 38
    convert -bordercolor none -border 5x5 /tmp/srtbike38a.png images/srtbike48a.png
75b09d3
Slaven Rezić * fixed Makefile targets for debian install
  * use REAL_BBBIKE_DEST_DIR
  * check for /etc/debian_version, too
e62aae7
Slaven Rezić * install-freedesktop Makefile target 8d8e8aa
Slaven Rezić * update MANIFEST for new desktop/icon stuff 2b36da0
Commits on Mar 22, 2013
Slaven Rezić * data update (minor) f7ff964
3  MANIFEST
View
@@ -846,9 +846,11 @@ images/srtbike16_mask.xbm
images/srtbike32.gif
images/srtbike32.xpm
images/srtbike32_mask.xbm
+images/srtbike48a.png
images/srtbike57.png
images/srtbike72.png
images/srtbike114.png
+images/srtbike_logo.svg
images/srtbike_mini.xpm
images/srtbike_solid.gif
images/srtbike_solid.xpm
@@ -960,6 +962,7 @@ install.bat
install.pl
install.sh
kde/BBBike.desktop.tmpl
+kde/bbbike.desktop.tst
kde/BBBikeDoc.desktop.tmpl
kde/BBBikeWWW.desktop.tmpl
kde/Cartography.directory.tmpl
7 MANIFEST.SKIP
View
@@ -196,13 +196,6 @@ images/route.gif
images/route.xpm
images/search_text.gif
images/search_text.xpm
-images/srtbike_mini.fig
-images/srtbike_logo.svg
-images/srtbike_logo16.png
-images/srtbike_logo24.png
-images/srtbike_logo32.png
-images/srtbike_logo48.png
-images/srtbike_logo64.png
images/trackroute.gif
images/trackroute.xpm
images/up.gif
47 Makefile.PL
View
@@ -553,7 +553,7 @@ install:
EOF
my($INSTALL_PREFIX, $BBBIKE_DEST_DIR);
- if (-f "/etc/debian-release") {
+ if (-f "/etc/debian-release" || -f "/etc/debian_version") {
print STDERR "Choosing Debian layout (/usr/lib/BBBike, executable in /usr/bin)...\n";
$INSTALL_PREFIX = "/usr";
$BBBIKE_DEST_DIR = "/usr/lib/BBBike";
@@ -590,21 +590,52 @@ EOF
$out .= <<EOF;
INSTALL_PREFIX?= $INSTALL_PREFIX
BBBIKE_DEST_DIR?= $BBBIKE_DEST_DIR
+REAL_BBBIKE_DEST_DIR?= \$(BBBIKE_DEST_DIR)
+do--symlink-bbbikeexe:
+ [ -d \${INSTALL_PREFIX}/bin ] || mkdir -p \${INSTALL_PREFIX}/bin
EOF
+ for my $f (@bbbikeexe) {
+ $out .= <<EOF;
+ -rm -f \${INSTALL_PREFIX}/bin/$f
+ ln -s \${REAL_BBBIKE_DEST_DIR}/$f \${INSTALL_PREFIX}/bin/$f
+EOF
+ }
+
$out .= <<'EOF';
-install-to-usr-local:
+
+install-to-usr-local: do--install-to-usr-local do--symlink-bbbikeexe
+
+do--install-to-usr-local:
-rm -rf ${BBBIKE_DEST_DIR}
cp -R . ${BBBIKE_DEST_DIR}
find ${BBBIKE_DEST_DIR} | xargs chmod ugo+r
find ${BBBIKE_DEST_DIR} -perm -u=x | xargs chmod go+x
+
+install-using-eui: distdir do--install-using-eui do--symlink-bbbikeexe
+
+do--install-using-eui:
+ -rm -rf ${BBBIKE_DEST_DIR}
+ [ -d ${BBBIKE_DEST_DIR} ] || mkdir -p ${BBBIKE_DEST_DIR}
+ $(PERL) -MExtUtils::Install -e 'install({ "$(DISTVNAME)" => "$(BBBIKE_DEST_DIR)" }, $(VERBINST), 0, 0, ["/debian/.*"], 1)'
+
+install-freedesktop:
+ [ -d ${INSTALL_PREFIX}/share/applications ] || mkdir -p ${INSTALL_PREFIX}/share/applications
+ for size in 128x128 72x72 64x64 48x48 32x32 16x16 scalable; do \
+ [ -d ${INSTALL_PREFIX}/share/icons/hicolor/$$size/apps ] || mkdir -p ${INSTALL_PREFIX}/share/icons/hicolor/$$size/apps; \
+ done
+ perl -Ilib -MText::ScriptTemplate -e '$$t=Text::ScriptTemplate->new; $$t->setq(BBBIKE_ROOTDIR => "$(REAL_BBBIKE_DEST_DIR)"); print $$t->load("kde/bbbike.desktop.tst")->fill' > ${INSTALL_PREFIX}/share/applications/bbbike.desktop~
+ mv ${INSTALL_PREFIX}/share/applications/bbbike.desktop~ ${INSTALL_PREFIX}/share/applications/bbbike.desktop
+ install -m644 images/srtbike114.png ${INSTALL_PREFIX}/share/icons/hicolor/128x128/apps/bbbike.png
+ install -m644 images/srtbike72.png ${INSTALL_PREFIX}/share/icons/hicolor/72x72/apps/bbbike.png
+ install -m644 images/srtbike57.png ${INSTALL_PREFIX}/share/icons/hicolor/64x64/apps/bbbike.png
+ install -m644 images/srtbike48a.png ${INSTALL_PREFIX}/share/icons/hicolor/48x48/apps/bbbike.png
+ install -m644 images/srtbike32.xpm ${INSTALL_PREFIX}/share/icons/hicolor/32x32/apps/bbbike.xpm
+ install -m644 images/srtbike16.xpm ${INSTALL_PREFIX}/share/icons/hicolor/16x16/apps/bbbike.xpm
+ install -m644 images/srtbike_logo.svg ${INSTALL_PREFIX}/share/icons/hicolor/scalable/apps/bbbike.svg
+
EOF
- for my $f (@bbbikeexe) {
- $out .= <<EOF;
- -rm -f \${INSTALL_PREFIX}/bin/$f
- ln -s \${BBBIKE_DEST_DIR}/$f \${INSTALL_PREFIX}/bin/$f
-EOF
- }
+
return $out;
# XXX disabled for now --- the installer does not work with newer
6 data/fragezeichen-orig
View
@@ -89,7 +89,7 @@ M
Skalitzer/Gitschiner Str.: werden hier Radspuren markiert? ?::projected 11335,10375 11316,10372 11130,10326 11117,10326 10975,10334 10871,10322 10708,10312 10605,10312 10363,10303 10122,10294 9948,10280
#
#: XXX Bauma�nahme 2.23 (Realisierung nach 2011) vvv
-#: last_checked: 2013-03-16 vvv
+#: last_checked: 2013-03-22 vvv
Stra�e der Pariser Kommune: werden hier die fehlenden Radspuren noch markiert? ?::projected; 12758,11915 12726,11851 12681,11741 12645,11673
Stra�e der Pariser Kommune: werden hier die fehlenden Radspuren noch markiert? ?::projected; 12551,11515 12497,11459
Stra�e der Pariser Kommune: werden hier die fehlenden Radspuren noch markiert? ?::projected 12833,12154 12850,12286 12869,12425 12891,12549
@@ -757,6 +757,10 @@ Mittenwalde - Telz: Radweg in Bau ?::inwork 19835,-16307 19263,-16584 17784,-171
# - Fragen nach genauen Routenverl�ufen
# - XXX_prog- und XXX_indoor-Eintr�ge
#
+#: by: http://www.berlin.de/ba-treptow-koepenick/bvv-online/vo020.asp?VOLFDNR=4458
+#: next_check: 2013-08-23
+Brandenburgplatz: wird hier eine Fu�g�ngerampel eingerichtet? ? 23363,5714 23309,5704
+#
#: XXX ebenfalls pr�fen: wo l�sst sich die Landsberger am besten �berqueren? Nur an der Fu�g�ngerampel leicht westlich davon? routing_helper verwenden?
Genslerstr. - Landsberger Allee: anscheinend existiert hier eine Verbindung f�r Radfahrer/Fu�g�nger: Qualit�t? Gibt es Dr�ngelgitter an der Tramquerung? ? 16669,14438 16630,14403
#
4 data/handicap_s-orig
View
@@ -12,7 +12,7 @@
#
# REMOVED --- #: last_checked: 2013-02-15 --- #: next_check: 2013-02-21 --- #: source_id: INKO_113418 --- Oberbaumbr�cke: Umfahrung wegen Baustelle, etwas Zeitverlust q3::inwork; 13332,10832 13305,10789
#
-#: last_checked: 2013-03-20 vvv
+#: last_checked: 2013-03-22 vvv
#: next_check: 2013-06-30 vvv
#: source_id: IM_019640
Modersohnstr.: Bauarbeiten, Einbahnstra�enregelung q3::inwork; 14134,11272 14181,11434
@@ -34,7 +34,7 @@ Helmerdingstr.: Bauarbeiten q2::inwork 14465,11195 14442,11101
Helsingforser Platz: Bauarbeiten, Fahrbahn gesperrt, Ausweichen auf Gehweg q4::inwork 13473,11456 13427,11431
#: last_checked ^^^
#
-#: last_checked: 2013-03-20
+#: last_checked: 2013-03-22
Marchlewskistr.: Bauarbeiten, Einbahnstra�e q2::inwork; 13366,11651 13295,11792
#
# REMOVED (fast keine Einschr�nkungen mehr) --- #: source_id: LMS_3261840849 --- #: last_checked: 2013-03-03 --- G�rtnerstr.: Baustelle, Einbahnstra�enregelung q3::inwork; 14247,11681 14272,11775
5 data/radwege-orig
View
@@ -3891,9 +3891,10 @@ Fu
RW1;RW1 13455,2465 13498,2411
#: XXX ein Radstreifen wird auch in Richtung Westen angelegt
#: by: http://www.berlin.de/ba-treptow-koepenick/presse/archiv/20120912.1600.375133.html
-#: last_checked: 2013-03-09 (H�he Britzer Str.)
-#: next_check: 2013-05-09
#: XXX Bauma�nahme 9.12 (Realisierung in 2011)
+#: by: http://www.berlin.de/ba-treptow-koepenick/bvv-online/___tmp/tmp/45081036558175193/558175193/00067926/26-Anlagen/06/B1298ZB3.pdf
+#: last_checked: 2013-03-09 (H�he Britzer Str.)
+#: next_check: 2013-05-22
RW3; 18245,5551 18370,5511 18680,5413 18984,5318 19031,5316 19328,5304
RW6;RW6 11797,20601 11828,20625 11874,20656 11915,20686 11919,20745 11923,20781
RW6;RW6 11874,20656 11826,20722
5 data/strassen-orig
View
@@ -13112,11 +13112,12 @@ Simpsonweg N 10092,-669 9937,-693 9913,-705 9899,-732 9907,-812 9884,-860
Rosenheimer Str. N 6851,9365 6717,9339 6446,9328 6357,9322 6239,9344
Rosenheimer Str. NN 6239,9344 6164,9329
Rosenheimer Str. N 6164,9329 6070,9322
-#: XXX wird am 21. November 2012 zu Silvio-Meier-Str. umbenannt --- wegen Klage verschoben
+#: XXX wird am 21. November 2012 zu Silvio-Meier-Str. umbenannt --- wegen Klage verschoben (April 2013?)
#: by: http://www.kulturbuch-verlag.de/Service/amtsblatt-fur-berlin/kostenloser-lese-service/pdfl/33re.pdf/file?y=2012
#: by: http://www.xhain.net/pm/2012/klage-gegen-umbenennung-der-gabelsbergerstrasse-in-silvio-meier-strasse
#: by: http://www.kulturbuch-verlag.de/Service/amtsblatt-fur-berlin/kostenloser-lese-service/pdfl/50re.pdf/file?y=2012
-#: last_checked: 2013-02-19
+#: last_checked: 2013-03-22
+#: next_check: 2013-04-12
Gabelsbergerstr. N 14381,12205 14451,12396
Heidenfeldstr. N 13609,13427 13433,13346
Heidenfeldstr. NN 13433,13346 13393,13326
6 doc/watchsites.org
View
@@ -3,9 +3,9 @@ Watch Sites for BBBike -*- org -*-
URLs, die immer wieder neue Informationen enthalten k�nnen.
* Berlin
-** <2013-03-19 Di> <2013-03-19 Di> [[http://www.berlin.de/pressemitteilungen/archiv/index/search?institutions%5B%5D=Bezirksamt+Charlottenburg-Wilmersdorf&institutions%5B%5D=Bezirksamt+Friedrichshain-Kreuzberg&institutions%5B%5D=Bezirksamt+Lichtenberg&institutions%5B%5D=Bezirksamt+Marzahn-Hellersdorf&institutions%5B%5D=Bezirksamt+Mitte&institutions%5B%5D=Bezirksamt+Neuk%C3%B6lln&institutions%5B%5D=Bezirksamt+Pankow&institutions%5B%5D=Bezirksamt+Reinickendorf&institutions%5B%5D=Bezirksamt+Spandau&institutions%5B%5D=Bezirksamt+Steglitz-Zehlendorf&institutions%5B%5D=Bezirksamt+Tempelhof-Sch%C3%B6neberg&institutions%5B%5D=Bezirksamt+Treptow-K%C3%B6penick&institutions%5B%5D=Senatsverwaltung+f%C3%BCr+Stadtentwicklung]]
+** <2013-03-22 Fr> <2013-03-22 Fr> [[http://www.berlin.de/pressemitteilungen/archiv/index/search?institutions%5B%5D=Bezirksamt+Charlottenburg-Wilmersdorf&institutions%5B%5D=Bezirksamt+Friedrichshain-Kreuzberg&institutions%5B%5D=Bezirksamt+Lichtenberg&institutions%5B%5D=Bezirksamt+Marzahn-Hellersdorf&institutions%5B%5D=Bezirksamt+Mitte&institutions%5B%5D=Bezirksamt+Neuk%C3%B6lln&institutions%5B%5D=Bezirksamt+Pankow&institutions%5B%5D=Bezirksamt+Reinickendorf&institutions%5B%5D=Bezirksamt+Spandau&institutions%5B%5D=Bezirksamt+Steglitz-Zehlendorf&institutions%5B%5D=Bezirksamt+Tempelhof-Sch%C3%B6neberg&institutions%5B%5D=Bezirksamt+Treptow-K%C3%B6penick&institutions%5B%5D=Senatsverwaltung+f%C3%BCr+Stadtentwicklung]]
Sammelsuche mit allen Berliner Bezirken + Stadtentwicklung Berlin
-** <2013-03-15 Fr> <2013-03-15 Fr> http://www.kulturbuch-verlag.de/Service/amtsblatt-fur-berlin/kostenloser-lese-service
+** <2013-03-22 Fr> <2013-03-22 Fr> http://www.kulturbuch-verlag.de/Service/amtsblatt-fur-berlin/kostenloser-lese-service
|--------------------------------------|
| IMPORTANT!!! Use the ?y=2013 hack!!! |
@@ -15,7 +15,7 @@ URLs, die immer wieder neue Informationen enthalten k
bereits �berpr�ft:
* in 2013:
- * 1..11
+ * 1..12
* in 2012:
* 1..54 (alles)
(23 enth�lt ein Verzeichnis der Krankenh�user)
BIN  images/srtbike48a.png
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 kde/bbbike.desktop.tst
View
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Name=BBBike
+Comment=Search routes for cyclists in Berlin and Brandenburg
+Comment[de]=Routenplaner für Radfahrer in Berlin und Brandenburg
+Encoding=UTF-8
+Exec=perl <%= $BBBIKE_ROOTDIR %>/bbbike %f
+Icon=bbbike
+MimeType=application/x-bbbike-route;application/x-gpstrack;application/x-bbbike-data;
+Terminal=false
+StartupNotify=true
+Type=Application
5 port/debian/changelog
View
@@ -0,0 +1,5 @@
+bbbike (3.18-1) unstable; urgency=low
+
+ * Initial release
+
+ -- Slaven Rezic <slaven@rezic.de> Sun, 17 Mar 2013 21:47:30 +0100
2  port/debian/compat
View
@@ -1 +1 @@
-4
+8
30 port/debian/control
View
@@ -0,0 +1,30 @@
+Source: bbbike
+Section: misc
+Priority: optional
+Maintainer: Slaven Rezic <slaven@rezic.de>
+Build-Depends: debhelper (>= 8.0.0), perl
+Standards-Version: 3.9.3
+Homepage: http://bbbike.sourceforge.net
+Vcs-Git: git://github.com/eserte/bbbike.git
+Vcs-Browser: http://github.com/eserte/bbbike
+
+Package: bbbike
+Architecture: all
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}, perl-tk (>= 800)
+Suggests: netpbm | imagemagick, gv | ghostview | gs | ggv, libmailtools-perl, libtk-pod-perl, libwww-perl, libxml-libxml-perl, libclass-accessor-perl
+Description: A route planner for cyclists in Berlin-Brandenburg
+ BBBike is an information system for cyclists in Berlin and
+ Brandenburg (Germany). The application has the following
+ features:
+ .
+ * Display a map with streets, railways, rivers, parks,
+ altitude and other features
+ .
+ * Find and show routes between two points. The route-finder
+ can be customized to match the cyclists preferences
+ (fastest or nicest route, keep wind direction and hills
+ into account etc.)
+ .
+ * A bike power calculator
+ .
+ * Automatically fetch current Berlin weather data
7 port/debian/copyright
View
@@ -0,0 +1,7 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: bbbike
+Source: http://sourceforge.net/projects/bbbike/files/
+
+Files: *
+Copyright: 1995-2013 Slaven Rezic <slaven@rezic.de>
+License: GPL-1+ or Artistic, and GPL-2+, and BSD
3  port/debian/docs
View
@@ -0,0 +1,3 @@
+README
+README.english
+CHANGES
0  port/debian/bbbike.menu → port/debian/menu
View
File renamed without changes
16 port/debian/rules
View
@@ -0,0 +1,16 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+
+# Uncomment this to turn on verbose mode.
+export DH_VERBOSE=1
+
+%:
+ dh $@
+
+override_dh_auto_configure:
+ perl Makefile.PL
+
+override_dh_auto_install:
+ make install-using-eui install-freedesktop BBBIKE_DEST_DIR=$$(pwd)/debian/bbbike/usr/lib/BBBike REAL_BBBIKE_DEST_DIR=/usr/lib/BBBike INSTALL_PREFIX=$$(pwd)/debian/bbbike/usr
+
+override_dh_auto_test:
1  port/debian/source/format
View
@@ -0,0 +1 @@
+3.0 (quilt)
0  port/debian/Makefile → port/old-debian/Makefile
View
File renamed without changes
5 port/old-debian/bbbike.menu
View
@@ -0,0 +1,5 @@
+?package(bbbike):needs="X11" section="Applications/Science/Geoscience"\
+ title="BBBike"\
+ icon32x32="/usr/lib/BBBike/images/srtbike32.xpm"\
+ icon16x16="/usr/lib/BBBike/images/srtbike16.xpm"\
+ command="/usr/bin/bbbike"
0  port/debian/bbbike.mime → port/old-debian/bbbike.mime
View
File renamed without changes
0  port/debian/changelog.Debian → port/old-debian/changelog.Debian
View
File renamed without changes
1  port/old-debian/compat
View
@@ -0,0 +1 @@
+4
0  port/debian/control.tpl → port/old-debian/control.tpl
View
File renamed without changes

No commit comments for this range

Something went wrong with that request. Please try again.